Merge pull request #30906

This commit is contained in:
Cyberboss
2017-09-23 12:11:05 -04:00
+4 -4
View File
@@ -1048,7 +1048,7 @@
log_admin("[key_name(usr)] has wizard'ed [current].")
SSticker.mode.update_wiz_icons_added(src)
if("lair")
current.loc = pick(GLOB.wizardstart)
current.forceMove(pick(GLOB.wizardstart))
if("dressup")
SSticker.mode.equip_wizard(current)
if("name")
@@ -1110,7 +1110,7 @@
message_admins("[key_name_admin(usr)] has nuke op'ed [current].")
log_admin("[key_name(usr)] has nuke op'ed [current].")
if("lair")
current.loc = get_turf(locate("landmark*Syndicate-Spawn"))
current.forceMove(get_turf(locate("landmark*Syndicate-Spawn")))
if("dressup")
var/mob/living/carbon/human/H = current
qdel(H.belt)
@@ -1391,7 +1391,7 @@
current.faction |= "syndicate"
if(spawnloc)
current.loc = spawnloc
current.forceMove(spawnloc)
if(ishuman(current))
var/mob/living/carbon/human/H = current
@@ -1441,7 +1441,7 @@
SSjob.SendToLateJoin(current)
to_chat(current, "HOT INSERTION, GO GO GO")
else
current.loc = pick(GLOB.wizardstart)
current.forceMove(pick(GLOB.wizardstart))
SSticker.mode.equip_wizard(current)
SSticker.mode.name_wizard(current)