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/2] 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 e12cb3c3a02568ea4fc65a832b41e75e8f113a9c Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:12:58 -0400 Subject: [PATCH 2/2] uncapped --- code/modules/shuttle/shuttles/escape_shuttle.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/escape_shuttle.dm index 859aa45aceb3..daf91034036f 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/escape_shuttle.dm @@ -8,9 +8,12 @@ rechargeTime = SHUTTLE_RECHARGE ignitionTime = 8 SECONDS ignition_sound = 'sound/effects/escape_pod_warmup.ogg' - /// The % chance of the escape pod crashing into the groundmap + /// The % chance of the escape pod crashing into the groundmap before lifeboats leaving var/early_crash_land_chance = 75 + /// The % chance of the escape pod crashing into the groundmap var/crash_land_chance = 25 + /// How many people can be in the escape pod before it crashes + var/max_capacity = 3 var/datum/door_controller/single/door_handler = new() var/launched = FALSE @@ -71,7 +74,7 @@ occupant_count++ for(var/obj/structure/machinery/cryopod/evacuation/cryotube in interior_area) cryos += list(cryotube) - if (occupant_count > 3) + if (occupant_count > max_capacity) playsound(src,'sound/effects/escape_pod_warmup.ogg', 50, 1) sleep(31) var/turf/sploded = return_center_turf()