From 08abcd3f3319ba141d4c479138bebce1e60e9a7c Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Tue, 27 Jun 2023 22:13:47 -0500 Subject: [PATCH] modernizes the nuke code --- code/game/machinery/nuclear_bomb.dm | 10 ++++++++-- modular_chomp/icons/obj/stationobjs.dmi | Bin 0 -> 708 bytes sound/items/timer.ogg | Bin 0 -> 5888 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 modular_chomp/icons/obj/stationobjs.dmi create mode 100644 sound/items/timer.ogg diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index b9646235c0..a89da3290e 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -3,7 +3,7 @@ var/bomb_set /obj/machinery/nuclearbomb name = "\improper Nuclear Fission Explosive" desc = "Uh oh. RUN!!!!" - icon = 'icons/obj/stationobjs.dmi' + icon = 'modular_chomp/icons/obj/stationobjs.dmi' //chompedit, use the better one icon_state = "nuclearbomb0" density = TRUE var/deployable = 0.0 @@ -47,6 +47,7 @@ var/bomb_set if(timing) bomb_set = 1 //So long as there is one nuke timing, it means one nuke is armed. timeleft-- + playsound(src, 'sound/items/timer.ogg',50) //chompedit... beep :) if(timeleft <= 0) explode() for(var/mob/M in viewers(1, src)) @@ -275,6 +276,7 @@ var/bomb_set icon_state = "nuclearbomb1" timing = 0 bomb_set = 0 + set_security_level("blue") //chompedit if(light_wire == temp_wire) lighthack = !lighthack @@ -322,10 +324,13 @@ var/bomb_set icon_state = "nuclearbomb2" if(!safety) bomb_set = 1//There can still be issues with this reseting when there are multiple bombs. Not a big deal tho for Nuke/N + set_security_level("delta")//chompedit else bomb_set = 0 + set_security_level("blue") else bomb_set = 0 + set_security_level("blue") //chompedit if(!lighthack) icon_state = "nuclearbomb1" if(href_list["safety"]) @@ -333,6 +338,7 @@ var/bomb_set if(safety) timing = 0 bomb_set = 0 + set_security_level("blue") //chompedit if(href_list["anchor"]) if(removal_stage == 5) @@ -370,7 +376,7 @@ var/bomb_set safety = 1 if(!lighthack) icon_state = "nuclearbomb3" - playsound(src,'sound/machines/Alarm.ogg',100,0,5) + world << sound('sound/machines/Alarm.ogg')//chompedit, nuke is big event, make it global if(ticker && ticker.mode) ticker.mode.explosion_in_progress = 1 sleep(100) diff --git a/modular_chomp/icons/obj/stationobjs.dmi b/modular_chomp/icons/obj/stationobjs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7edeaf2cb53b550dbabfab6d8329d5fe220e342f GIT binary patch literal 708 zcmV;#0z3VQP)fFDZ*Bkpc$`yKaB_9` z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+uQWL) zHL)luKR3xhiHkEOv#1y-Y{NF;( z(@@8dOIg9y&jsv#0QbgAH=N3UeEO5lc;|g&7+m1$aL+)MQu9s>{Oz{xk@54< z`<*Ch3mOa_?lJ8|7Vgw2Prw*yP#Q2kU=Ui@bR$ndYpG>0fp#qahOwUD&jS)bpWrx2 z@Q|&%TO;_`tfqH1^Z1%PvaQc#GMP*=azDuZVB>yZllKFgx*yoo{lF&f2R3y-u&Mij qP2CS{>V9CgP23M`?gyF7ALR?!?RETYR7{uv00007 literal 0 HcmV?d00001 diff --git a/sound/items/timer.ogg b/sound/items/timer.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a13db015be33ed47b05455a3cb295f376d7f19fa GIT binary patch literal 5888 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 literal 0 HcmV?d00001