Replaces /atom.initialized and .admin_spawned with flags (#37981)

kill .initialized and .admin_spawned from /atom
This commit is contained in:
vuonojenmustaturska
2018-05-24 02:20:50 -07:00
committed by Tad Hardesty
parent cb13207df6
commit 4f0b0b7ec1
29 changed files with 55 additions and 51 deletions
+1 -1
View File
@@ -643,7 +643,7 @@
T.ChangeTurf(chosen)
else
var/atom/A = new chosen(usr.loc)
A.admin_spawned = TRUE
A.flags_1 |= ADMIN_SPAWNED_1
log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+1 -1
View File
@@ -2059,7 +2059,7 @@
else
var/atom/O = new path(target)
if(O)
O.admin_spawned = TRUE
O.flags_1 |= ADMIN_SPAWNED_1
O.setDir(obj_dir)
if(obj_name)
O.name = obj_name
@@ -65,7 +65,7 @@
sword = new(H)
if(!GLOB.highlander)
sword.admin_spawned = TRUE //To prevent announcing
sword.flags_1 |= ADMIN_SPAWNED_1 //To prevent announcing
sword.pickup(H) //For the stun shielding
H.put_in_hands(sword)
+1 -1
View File
@@ -32,7 +32,7 @@
if (admin_spawned)
for(var/item in contains)
var/atom/A = new item(C)
A.admin_spawned = TRUE
A.flags_1 |= ADMIN_SPAWNED_1
else
for(var/item in contains)
new item(C)
+3 -3
View File
@@ -6,9 +6,9 @@ INITIALIZE_IMMEDIATE(/mob/dead)
sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
/mob/dead/Initialize()
if(initialized)
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
flags_1 |= INITIALIZED_1
tag = "mob_[next_mob_id++]"
GLOB.mob_list += src
@@ -72,7 +72,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
if(!pick)
return
var/addr = csa[pick]
if(alert(src, "Jump to server [pick] ([addr])?", "Server Hop", "Yes", "No") != "Yes")
@@ -60,6 +60,6 @@
var/hat_type = pick(possible_seasonal_hats)
var/obj/item/new_hat = new hat_type(D)
D.equip_to_slot_or_del(new_hat, SLOT_HEAD)
D.admin_spawned = admin_spawned
D.flags_1 |= (flags_1 & ADMIN_SPAWNED_1)
D.key = user.key
qdel(src)
@@ -671,7 +671,7 @@ Difficulty: Very Hard
for(var/i in T)
if(isitem(i) && !is_type_in_typecache(i, banned_items_typecache))
var/obj/item/W = i
if(!W.admin_spawned && !(W.flags_1 & HOLOGRAM_1) && !(W.flags_1 & ABSTRACT_1))
if(!(W.flags_1 & ADMIN_SPAWNED_1) && !(W.flags_1 & HOLOGRAM_1) && !(W.flags_1 & ABSTRACT_1))
L += W
if(L.len)
var/obj/item/CHOSEN = pick(L)
@@ -50,7 +50,7 @@
if(C && crusher_loot && C.total_damage >= maxHealth * 0.6)
spawn_crusher_loot()
crusher_kill = TRUE
if(!admin_spawned)
if(!(flags_1 & ADMIN_SPAWNED_1))
var/tab = "megafauna_kills"
if(crusher_kill)
tab = "megafauna_kills_crusher"
@@ -111,7 +111,7 @@
recovery_time = world.time + buffer_time
/mob/living/simple_animal/hostile/megafauna/proc/grant_achievement(medaltype, scoretype, crusher_kill)
if(!medal_type || admin_spawned || !SSmedals.hub_enabled) //Don't award medals if the medal type isn't set
if(!medal_type || (flags_1 & ADMIN_SPAWNED_1) || !SSmedals.hub_enabled) //Don't award medals if the medal type isn't set
return FALSE
for(var/mob/living/L in view(7,src))
@@ -36,7 +36,8 @@
/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target)
if(world.time >= ranged_cooldown)
var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new brood_type(src.loc)
A.admin_spawned = admin_spawned
A.flags_1 |= (flags_1 & ADMIN_SPAWNED_1)
A.GiveTarget(target)
A.friends = friends
A.faction = faction.Copy()
@@ -53,7 +53,7 @@
if(other != src)
last_tendril = FALSE
break
if(last_tendril && !admin_spawned)
if(last_tendril && !(flags_1 & ADMIN_SPAWNED_1))
if(SSmedals.hub_enabled)
for(var/mob/living/L in view(7,src))
if(L.stat || !L.client)
@@ -44,7 +44,7 @@
spawn_delay = world.time + spawn_time
var/chosen_mob_type = pick(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(src.loc)
L.admin_spawned = admin_spawned //If we were admin spawned, lets have our children count as that as well.
L.flags_1 |= (flags_1 & ADMIN_SPAWNED_1) //If we were admin spawned, lets have our children count as that as well.
spawned_mobs += L
L.nest = src
L.faction = src.faction
+1 -1
View File
@@ -38,7 +38,7 @@
for(var/varName in newVars)
if(varName in newVars)
summoned_object.vv_edit_var(varName, newVars[varName])
summoned_object.admin_spawned = TRUE
summoned_object.flags_1 |= ADMIN_SPAWNED_1
if(summon_lifespan)
QDEL_IN(summoned_object, summon_lifespan)