Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546

[MIRROR] Refactor of base machinery a tiny bit more. DONE
2017-11-13 11:44:46 -06:00
parent eabdcdb169 02b7295ae6
commit 228aed8b35
7 changed files with 17 additions and 14 deletions
@@ -63,6 +63,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
 	icon_state = "darkmatter_shard"
 	density = TRUE
 	anchored = FALSE
+	var/uid = 1
+	var/static/gl_uid = 1
 	light_range = 4
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF

@@ -137,6 +139,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)

 /obj/machinery/power/supermatter_shard/Initialize()
 	. = ..()
+	uid = gl_uid++
 	SSair.atmos_machinery += src
 	countdown = new(src)
 	countdown.start()