Merge branch 'master' into mapsyncs43293845982

This commit is contained in:
deathride58
2018-01-05 02:44:52 +00:00
committed by GitHub
2 changed files with 12 additions and 3 deletions
+8 -3
View File
@@ -564,12 +564,17 @@ This is here to make the tiles around the station mininuke change when it's arme
user.death(0)
/obj/item/disk/fakenucleardisk
name = "cheap plastic imitation of the nuclear authentication disk"
desc = "Broken dreams and a faint odor of cheese."
name = "nuclear authentication disk"
desc = "Better keep this safe."
icon_state = "nucleardisk"
/obj/item/disk/fakenucleardisk/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is pretending to go delta! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1)
addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
return MANUAL_SUICIDE
return MANUAL_SUICIDE
/obj/item/disk/fakenucleardisk/examine(mob/user)
..()
if(Adjacent(user))
to_chat(user, "<span class='warning'>Wait, this is a fake!</span>")