Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314

[MIRROR] Datum var cleanup
This commit is contained in:
LetterJay
2018-01-21 23:14:18 -06:00
committed by GitHub
15 changed files with 40 additions and 60 deletions
+2 -1
View File
@@ -26,13 +26,14 @@
var/datum/proximity_monitor/proximity_monitor
var/buckle_message_cooldown = 0
var/fingerprintslast
/atom/New(loc, ...)
//atom creation method that preloads variables at creation
if(GLOB.use_preloader && (src.type == GLOB._preloader.target_path))//in case the instanciated atom is creating other atoms in New()
GLOB._preloader.load(src)
if(use_tag)
if(datum_flags & DF_USE_TAG)
GenerateTag()
var/do_initialize = SSatoms.initialized
+2 -2
View File
@@ -79,14 +79,14 @@
anchored = TRUE //stops it being moved
/obj/machinery/nuclearbomb/syndicate
use_tag = TRUE
datum_flags = DF_USE_TAG
//ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb
/obj/machinery/nuclearbomb/syndicate/GenerateTag()
var/obj/machinery/nuclearbomb/existing = locate("syndienuke") in GLOB.nuke_list
if(existing)
stack_trace("Attempted to spawn a syndicate nuke while one already exists at [COORD(existing.loc)]")
use_tag = FALSE
datum_flags &= ~DF_USE_TAG
return
tag = "syndienuke"