(Finished) Assembly System #12264

Esoudiere · 2016-02-23T07:12:35Z

Adds in a new version of the assembly system, as detailed in the following links:
https://wiki.baystation12.net/Assembly_System
https://baystation12.net/forums/threads/suggestion-assembly-remake.977/

Needs review, as I've updated it from a very old rendition of bay, where lots of things were considered efficient that are no longer considered as such now. Logic Circuits needs to be redone entirely, I'm yet to come up with a way to do them as of yet however and as they are atleast functional, can still be included (hopefully) until something is done with them.

Everything is being added in smaller commits, unlike the last two times. Sorry about that.

…-for-hos.829/ - Kind of forgot to add it in earlier, woopsies. Assembly System - https://baystation12.net/forums/threads/suggestion-assembly-remake.977/ - Logic circuits & modular 'upgrading' will hopefully be done eventually. -Both updated from ~5 month old codebase, I tested them briefly, seemed to work. Might still need a bit of updating though. -Kinda new at coding in general, I imagine there being alot of optimisation errors that could be fixed.

Removed /new dir Replaced \blue \red etc with <span class> Fixed a couple of things pointed out by Comma

…to intelligun

-Replaces old assembly system with an improved version. -Allows for modular addition of further assembly devices. -Allows users to combine assemblies in any way they want. -Adds new icons to support new assembly system.

-Replaces /obj/item/assembly/ type paths with /obj/item/device/assembly/

-Vending.dm : Replaces assist-o-mat with spare parts machine for assemblies. -airlock.dm : Allows assemblies to be attached to doors, and triggered on the door opening. -material_recipes.dm : Adds in required material recipe to make an assembly frame. -reagent_dispenser.dm : Updated to support attaching new assemblies. -disposal.dm : Allows assemblies to be attached to disposal pipes and triggered when transfer() is called

-Replaces all /obj/item/weapon/grenade type paths with /obj/item/device/assembly_holder/grenade -Replaces all /obj/item/device/assembly type paths with /obj/item/device/assembly -Some things needed their code changed, such as grenade_launcher.dm to support new assembly system -Fixed /proc/RadioChat()

Esoudiere · 2016-02-23T07:35:28Z

Merged from all previous PRs. Not exactly 'atomic' commits, but more categorised. I assume that'll be easier to review. Again, sorry for the trouble.

-Adds all individual assemblies -Adds remaining icons -Adds nanoUI templates -Adds assembly wiring -Will hopefully compile now

PsiOmegaDelta · 2016-02-23T07:48:11Z

Rather than a mass-type change you could've used the new-ish Expansion system, see expansions/expansion.dm and the multitool example.
With an appropriate implementation anything that is of type /obj could be used as an assembly.

-Fixed a rogue typo -Added in remaining Z levels. -Added mental note to stop forgetting to add Z levels.

-Fixed id being identical to another.

Esoudiere · 2016-02-23T08:21:24Z

Whaat? I'm not even going to guess how the mechanics of that would work. But I assume relying entirely off of the expansion system rather than manual changes over a long term would cause some adverse effects.

Esoudiere · 2016-02-24T00:04:43Z

Ah, I see what you mean now. But would this still apply to things that are pretty much completely scrapped and re-coded? Like, grenades are entirely dependent on the /assembly_holder/ inheritance, not just minor changes like adding or changing one or two procs. It would probably make alot of sense to not use inheritance for things like the eftpos machine & electronic syringe, though. (What I'm imagining is stacks and stacks of datums eventually completely overriding a ton of objects, and the obsolete code never being altered. Or is that not 'how it works')

-And added comment to assembly.dm in hope someone can find a better method.

-Replaced "get_holder_linked_devices()" with "get_connected_devices()" -Replaced "get_holder_linked_devices_reversed()" with "get_devices_connected_to"

…to AssemblySystem

Esoudiere · 2016-03-05T02:19:17Z

I guess I've done all that I could possibly see and nothing else is being pointed out to me..So I'll name it finished, in hope people will be more critical and point out everythin' else out to me.

Techhead0 · 2016-03-05T02:20:40Z

For the record, it's been found that obj/item/weapon changes very little from obj/item.
See: https://github.com/Baystation12/Baystation12/blob/dev/code/game/objects/weapons.dm
And as far as I can tell, nothing at all is changed at the obj/item/device level.

Esoudiere · 2016-03-05T22:34:44Z

Well, I personally put it under /device/ so that I could add /device/ to the Quick Create Object tool and easily spawn assemblies. Just a matter of categorisation. Plus future-proofin' and all that.

Esoudiere · 2016-03-06T21:26:30Z

It cannot merge? :s

…to AssemblySystem

Esoudiere · 2016-03-06T21:41:57Z

Apparently not, sorry about that. I'll have to fix it this afternoon.

-Commented out health analyzer for now.

-I copy pasted from the other scanners.dm without noticing it, but even so, how does the other one pass?

Esoudiere · 2016-03-07T05:32:00Z

Fixed. I'll try to remember to pull every second day or so until this is either closed (which I assume is going to happen) or merged.

GinjaNinja32 · 2016-03-07T07:04:38Z

You're still hitting the "Sorry, we could not display the entire diff because it was too big." limit.

This PR is too big to effectively review; in its current state it is very unlikely to be merged. If you can split it into separate PRs that don't have cyclic dependencies it'd be far more likely to happen.

PsiOmegaDelta · 2016-03-07T07:08:55Z

I might just lay some groundwork with an assembly/extension datum to make things easier.

Esoudiere · 2016-03-07T07:57:26Z

I did split it into multiple PRs earlier, which is why the commit count is so high. But as I'm inexperienced with git, it was just a horrible experience I do not wish to repeat. In the final four (non-merge/bugfix) commits, you should be able to review everything hopefully? (Split into categories of Base Logic, Map Changes, Files not in the modules/assembly dir, Extras. The commit message should hopefully have enough detail to get the gist of the categories.) Everything before those four commits are from previous PRs.

I still don't fully understand how 'toying' with BYOND code to disinherit inheritance (I had to) is beneficial, I just thought it was a quicker way to do stuff not a more efficient way. But if you can indeed lay out some foundation, I'd be happy to try to add everything to it if you think it'd be better.

mwerezak · 2016-03-07T17:20:11Z

In the future, use git pull --rebase upstream/dev so that you don't end up with all of these merge nodes that complicate squashing old commits.

Esoudiere · 2016-03-09T04:27:43Z

Should I just close this PR & /try/ making two different ones again? (Using the rebase feature to get rid of past commit nodes, thanks mwerezak) Or are the commits small enough, Ginja?

GinjaNinja32 · 2016-03-09T09:29:14Z

splitting it into commits doesn't make it any easier to review, it's still a seven-thousand-line PR even if it is in 37 commits.

I'm still not entirely sure how you got to 7000 lines.

mwerezak · 2016-03-10T09:27:23Z

I'm not sure where you should start but perhaps consider making a PR with all new items removed, for example, and then creating a second PR for just new items. Or any other way you can split this PR.

Esoudiere · 2016-03-12T05:32:16Z

~~7000 of the line changes are for new items, across about 32 files. Would that be too big for a single PR? (Also, my computer has broken down most unfortunately..So, might have to wait a while ;~~;)

…to AssemblySystem

Esoudiere · 2016-03-15T12:22:04Z

Closing to split

Esoudiere added 23 commits February 18, 2016 00:13

Fixed some travis errors..

4587aeb

Fixed type errors in map

0a8ab80

Assumed .dme wasn't needed. Apparently it is?

94b2135

Renamed .dme (this is fun)

cde2725

Attempt to fix travis explosion

f94af65

Trying yet again to find out the cause of travis errors

1b3229a

Removed /new dir Replaced \blue \red etc with <span class> Fixed a couple of things pointed out by Comma

Fixed indentation error

8994d90

Added in missing z-levels.

b1c9cb2

Fixed broken html tags

c25c5a6

Fixed runtime.

cb470cd

-Fixed to use attach_container proc

9bd333c

Type fix, forgot to compile to check.

c1bfb89

-Fixed various errors, courtesy of TechHead &

cf82809

-Fixed relative pathing issues

0796237

-Removed a colon I missed

bea858e

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…

bd82de5

…to intelligun

Other files.

53dcb5b

Merging

57886c2

Base Implementation(Will Not Compile)

bc860fe

-Replaces old assembly system with an improved version. -Allows for modular addition of further assembly devices. -Allows users to combine assemblies in any way they want. -Adds new icons to support new assembly system.

Map Changes(Will Not Compile)

13bdc38

-Replaces /obj/item/assembly/ type paths with /obj/item/device/assembly/

Esoudiere added 2 commits February 23, 2016 18:45

Finishing Implementation

4de60a2

-Adds all individual assemblies -Adds remaining icons -Adds nanoUI templates -Adds assembly wiring -Will hopefully compile now

Merge branch 'dev' into AssemblySystem

1649f4a

Esoudiere added 2 commits February 23, 2016 19:03

Bug Bash

3d9ae09

-Fixed a rogue typo -Added in remaining Z levels. -Added mental note to stop forgetting to add Z levels.

Research Design Error

7926ce8

-Fixed id being identical to another.

Esoudiere added 3 commits March 1, 2016 18:06

Made NanoUI much prettier

e4e4c36

-And added comment to assembly.dm in hope someone can find a better method.

General Optimisations

33e32cf

-Replaced "get_holder_linked_devices()" with "get_connected_devices()" -Replaced "get_holder_linked_devices_reversed()" with "get_devices_connected_to"

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…

d1489ab

…to AssemblySystem

Esoudiere changed the title ~~(Needs Review) Assembly System~~ (Finished) Assembly System Mar 5, 2016

Removed legacy grenades

1ab2212

comma added the cannot merge label Mar 6, 2016

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…

1c1879a

…to AssemblySystem

Esoudiere added 3 commits March 7, 2016 08:43

Fixing merge conflicts

ad2e8e2

-Commented out health analyzer for now.

Updating health analyzer.

8fbd57a

Fixed extra HTML tag

278df95

-I copy pasted from the other scanners.dm without noticing it, but even so, how does the other one pass?

comma removed the cannot merge label Mar 7, 2016

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 in…

4d8d16c

…to AssemblySystem

Esoudiere closed this Mar 15, 2016

mwerezak mentioned this pull request Mar 30, 2016

AssemblySystem(Base) #12451

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Finished) Assembly System #12264

(Finished) Assembly System #12264

Esoudiere commented Feb 23, 2016

Esoudiere commented Feb 23, 2016

PsiOmegaDelta commented Feb 23, 2016

Esoudiere commented Feb 23, 2016

Esoudiere commented Feb 24, 2016

Esoudiere commented Mar 5, 2016

Techhead0 commented Mar 5, 2016

Esoudiere commented Mar 5, 2016

Esoudiere commented Mar 6, 2016

Esoudiere commented Mar 6, 2016

Esoudiere commented Mar 7, 2016

GinjaNinja32 commented Mar 7, 2016

PsiOmegaDelta commented Mar 7, 2016

Esoudiere commented Mar 7, 2016

mwerezak commented Mar 7, 2016

Esoudiere commented Mar 9, 2016

GinjaNinja32 commented Mar 9, 2016

mwerezak commented Mar 10, 2016

Esoudiere commented Mar 12, 2016

Esoudiere commented Mar 15, 2016

(Finished) Assembly System #12264

(Finished) Assembly System #12264

Conversation

Esoudiere commented Feb 23, 2016

Esoudiere commented Feb 23, 2016

PsiOmegaDelta commented Feb 23, 2016

Esoudiere commented Feb 23, 2016

Esoudiere commented Feb 24, 2016

Esoudiere commented Mar 5, 2016

Techhead0 commented Mar 5, 2016

Esoudiere commented Mar 5, 2016

Esoudiere commented Mar 6, 2016

Esoudiere commented Mar 6, 2016

Esoudiere commented Mar 7, 2016

GinjaNinja32 commented Mar 7, 2016

PsiOmegaDelta commented Mar 7, 2016

Esoudiere commented Mar 7, 2016

mwerezak commented Mar 7, 2016

Esoudiere commented Mar 9, 2016

GinjaNinja32 commented Mar 9, 2016

mwerezak commented Mar 10, 2016

Esoudiere commented Mar 12, 2016

Esoudiere commented Mar 15, 2016