shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nuclearbomb.dm

Browse Source
This commit is contained in:
deathride58
2018-01-04 20:56:53 -05:00
committed by GitHub
parent 8a176e126e
commit 1bfba8fd50
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclearbomb.dm
-3
View File
@@ -573,11 +573,8 @@ This is here to make the tiles around the station mininuke change when it's arme
playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1) playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1)
addtimer(CALLBACK(src, .proc/manual_suicide, user), 101) addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
return MANUAL_SUICIDE return MANUAL_SUICIDE
<<<<<<< HEAD
=======
/obj/item/disk/fakenucleardisk/examine(mob/user) /obj/item/disk/fakenucleardisk/examine(mob/user)
..() ..()
if(Adjacent(user)) if(Adjacent(user))
to_chat(user, "<span class='warning'>Wait, this is a fake!</span>") to_chat(user, "<span class='warning'>Wait, this is a fake!</span>")
>>>>>>> 32a205b... You now have to stand next to the decoy nuke disk and examine it to know it's fake (#34059)