From c4caddf12e3c58ef10a73cf8d996e695b01a25bd Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Tue, 20 Jun 2023 14:40:12 -0400 Subject: [PATCH 1/3] Automatic changelog for PR #3470 [ci skip] --- html/changelogs/AutoChangeLog-pr-3470.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3470.yml diff --git a/html/changelogs/AutoChangeLog-pr-3470.yml b/html/changelogs/AutoChangeLog-pr-3470.yml new file mode 100644 index 000000000000..3d4a4ce22710 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3470.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - rscadd: "Re-added the nuke that you can buy via intel at tier 4. Only purchasable past 120 minutes. Requires holding both groundside comms towers for authorization decryption before being able to be armed." \ No newline at end of file From bc953f54940208f5a487da57a3e1367287c03a32 Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:08:37 -0400 Subject: [PATCH 2/3] lights --- code/controllers/subsystem/ticker.dm | 4 ++++ code/modules/power/apc.dm | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0e23b99a9cc2..b6a6df7b36c4 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -264,6 +264,10 @@ SUBSYSTEM_DEF(ticker) INVOKE_ASYNC(C, TYPE_PROC_REF(/obj/structure/closet, select_gamemode_equipment), mode.type) for(var/obj/structure/machinery/vending/V in machines) INVOKE_ASYNC(V, TYPE_PROC_REF(/obj/structure/machinery/vending, select_gamemode_equipment), mode.type) + for(var/obj/structure/machinery/power/apc/apc in machines) + if(!is_mainship_level(apc.z)) + continue + addtimer(CALLBACK(apc, TYPE_PROC_REF(/obj/structure/machinery/power/apc, late_activation)), rand(4 SECONDS, 15 SECONDS)) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_POST_SETUP) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e7a160095705..97a32ba864c1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -156,11 +156,18 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( update_icon() addtimer(CALLBACK(src, PROC_REF(update)), 5) + if(is_mainship_level(z) && !(SSticker.current_state == GAME_STATE_PLAYING || SSticker.current_state == GAME_STATE_FINISHED)) + operating = 0 + start_processing() if(!start_charge && is_ground_level(z) && prob(10)) set_broken() +/obj/structure/machinery/power/apc/proc/late_activation() + operating = 1 + update() + /obj/structure/machinery/power/apc/set_pixel_location() tdir = dir //To fix Vars bug setDir(SOUTH) From 4226380f0dbe90d70c19ee1dbe6fb07564f8ab41 Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:15:42 -0400 Subject: [PATCH 3/3] tab --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index b6a6df7b36c4..6387fb037cd7 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -267,7 +267,7 @@ SUBSYSTEM_DEF(ticker) for(var/obj/structure/machinery/power/apc/apc in machines) if(!is_mainship_level(apc.z)) continue - addtimer(CALLBACK(apc, TYPE_PROC_REF(/obj/structure/machinery/power/apc, late_activation)), rand(4 SECONDS, 15 SECONDS)) + addtimer(CALLBACK(apc, TYPE_PROC_REF(/obj/structure/machinery/power/apc, late_activation)), rand(4 SECONDS, 15 SECONDS)) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_POST_SETUP)