cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Machines now store their components in their contents. (#966)

Browse Source 
* Machines now store their components in their contents. (#52970)

Machine parts are now located in the machine instead of nullspace.

* Machines now store their components in their contents.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
This commit is contained in:
SkyratBot
2020-09-24 20:33:40 +02:00
committed by GitHub
parent 7c4299cdb9
commit ef28f115cc
25 changed files with 213 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/cola.dm
+3 -1
View File
@@ -36,7 +36,9 @@
desc = "Uh oh!"
/obj/machinery/vending/cola/random/Initialize()
..()
// No need to call parent, we're not doing anything with this machine. Just picking a new type of machine to use, spawning it and deleting ourselves.
SHOULD_CALL_PARENT(FALSE)
var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
new T(loc)
return INITIALIZE_HINT_QDEL
code/modules/vending/snack.dm
+3 -1
View File
@@ -32,7 +32,9 @@
desc = "Uh oh!"
/obj/machinery/vending/snack/random/Initialize()
..()
// No need to call parent, we're not doing anything with this machine. Just picking a new type of machine to use, spawning it and deleting ourselves.
SHOULD_CALL_PARENT(FALSE)
var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
new T(loc)
return INITIALIZE_HINT_QDEL