From 1b710997e29fd2b4a4c787a43476897f4f16a1b7 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 15:04:12 +0200 Subject: [PATCH 01/17] something wong --- code/game/objects/structures/blocker.dm | 12 ++++++++++++ code/modules/shuttles/marine_ferry.dm | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 33f79d7e9d32..ffdc7b47127d 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -61,6 +61,18 @@ attack_hand(M) return XENO_NONCOMBAT_ACTION +GLOBAL_LIST_INIT(landing_zone_fog, list()) +/obj/structure/blocker/landing_zone_fog + name = "dense fog" + desc = "It looks way too dangerous to traverse. Best wait until it has cleared up." + icon = 'icons/effects/effects.dmi' + icon_state = "smoke" + opacity = TRUE + +/obj/structure/blocker/landing_zone_fog/Initialize() + GLOB.landing_zone_fog += src + . = ..() + /obj/structure/blocker/forcefield name = "forcefield" diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 14787fccb388..9548eda83984 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -297,6 +297,13 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() + for(var/fog in GLOB.landing_zone_fog) + var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog + landing_zone_fog -= fog + QDEL_IN(landing_zone_fog, rand(2,4)) + + + moving_status = SHUTTLE_IDLE @@ -500,6 +507,10 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() + for(var/fog in GLOB.landing_zone_fog) + var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog + landing_zone_fog -= fog + QDEL_IN(landing_zone_fog, rand(2,4)) open_doors_crashed(turfs_trg) //And now open the doors @@ -573,6 +584,10 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() + for(var/fog in GLOB.landing_zone_fog) + var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog + landing_zone_fog -= fog + QDEL_IN(landing_zone_fog, rand(2,4)) moving_status = SHUTTLE_IDLE From 094205c85807a474ef020050d1cd10d18cf4c5d1 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 16:25:43 +0200 Subject: [PATCH 02/17] fixies the call not where it is called --- code/game/objects/structures/blocker.dm | 5 +++++ code/modules/shuttles/marine_ferry.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index ffdc7b47127d..4b7e80bb88d8 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -73,6 +73,11 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) GLOB.landing_zone_fog += src . = ..() +/obj/structure/blocker/landing_zone_fog/proc/Clear() + for(var/fog in GLOB.landing_zone_fog) + var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog + GLOB.landing_zone_fog -= landing_zone_fog + QDEL_IN(landing_zone_fog, rand(2 SECONDS,4 SECONDS)) /obj/structure/blocker/forcefield name = "forcefield" diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 9548eda83984..64768becca8b 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -587,7 +587,7 @@ for(var/fog in GLOB.landing_zone_fog) var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog landing_zone_fog -= fog - QDEL_IN(landing_zone_fog, rand(2,4)) + QDEL_IN(landing_zone_fog, rand(2 SECONDS,4 SECONDS)) moving_status = SHUTTLE_IDLE From bb2af730a40770c57c0187c1e11c066e5ef27ce6 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:11:09 +0200 Subject: [PATCH 03/17] almoust done --- code/game/objects/structures/blocker.dm | 11 +++-------- code/modules/shuttle/shuttles/dropship.dm | 4 ++++ code/modules/shuttles/marine_ferry.dm | 14 +++----------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 4b7e80bb88d8..d63605ce506e 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -74,10 +74,8 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) . = ..() /obj/structure/blocker/landing_zone_fog/proc/Clear() - for(var/fog in GLOB.landing_zone_fog) - var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - GLOB.landing_zone_fog -= landing_zone_fog - QDEL_IN(landing_zone_fog, rand(2 SECONDS,4 SECONDS)) + GLOB.landing_zone_fog -= src + QDEL_IN(src, rand(2 SECONDS,4 SECONDS)) /obj/structure/blocker/forcefield name = "forcefield" @@ -132,10 +130,7 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) types = list(/obj/vehicle/multitile/) -/obj/structure/blocker/forcefield/multitile_vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) - if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) - return TRUE - return FALSE + /obj/structure/blocker/forcefield/human types = list(/mob/living/carbon/human) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 86e869b3361e..2d1ae117e9e7 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -261,6 +261,10 @@ xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE + for(var/fog in GLOB.landing_zone_fog) + var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog + landing_zone_fog.Clear() + /obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) . = ..() turn_on_landing_lights() diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 64768becca8b..2bb784e0ab9a 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -297,13 +297,10 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() + for(var/fog in GLOB.landing_zone_fog) var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog -= fog - QDEL_IN(landing_zone_fog, rand(2,4)) - - - + landing_zone_fog.Clear() moving_status = SHUTTLE_IDLE @@ -507,10 +504,6 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() - for(var/fog in GLOB.landing_zone_fog) - var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog -= fog - QDEL_IN(landing_zone_fog, rand(2,4)) open_doors_crashed(turfs_trg) //And now open the doors @@ -586,8 +579,7 @@ E.on_arrival() for(var/fog in GLOB.landing_zone_fog) var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog -= fog - QDEL_IN(landing_zone_fog, rand(2 SECONDS,4 SECONDS)) + landing_zone_fog.Clear() moving_status = SHUTTLE_IDLE From ceecd4ec78c5f6765863a6aa5f15b5313ff0513a Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:14:40 +0200 Subject: [PATCH 04/17] ignore --- code/game/objects/structures/blocker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index d63605ce506e..308798484085 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) /obj/structure/blocker/forcefield/vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) return TRUE - return FALSE + return FALSE aaa /obj/structure/blocker/forcefield/multitile_vehicles types = list(/obj/vehicle/multitile/) From 7576a1495204a392f323747ef4e3c0b732c41d9f Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:15:28 +0200 Subject: [PATCH 05/17] this --- code/game/objects/structures/blocker.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 308798484085..ea778595ca69 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -124,8 +124,7 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) /obj/structure/blocker/forcefield/vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) return TRUE - return FALSE aaa - + return FALSE /obj/structure/blocker/forcefield/multitile_vehicles types = list(/obj/vehicle/multitile/) From 28f9672cd1482b71ff9af747a337aa0027eb645f Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:16:04 +0200 Subject: [PATCH 06/17] eh --- code/game/objects/structures/blocker.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index ea778595ca69..39221e5e6451 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -128,6 +128,11 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) /obj/structure/blocker/forcefield/multitile_vehicles types = list(/obj/vehicle/multitile/) +/obj/structure/blocker/forcefield/multitile_vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) + if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) + return TRUE + return FALSE + From d4acddeb3cce20a68901e13e7669dee1308968f2 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:16:46 +0200 Subject: [PATCH 07/17] newlines --- code/game/objects/structures/blocker.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 39221e5e6451..1e7aac57683e 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -115,12 +115,9 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) if(!visible) invisibility = 101 - - /obj/structure/blocker/forcefield/vehicles types = list(/obj/vehicle/) - /obj/structure/blocker/forcefield/vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) return TRUE @@ -133,9 +130,6 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) return TRUE return FALSE - - - /obj/structure/blocker/forcefield/human types = list(/mob/living/carbon/human) icon_state = "purple_line" From 49c2fbd34e41fb467345d02ed97dc1733c193b84 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:18:33 +0200 Subject: [PATCH 08/17] removes unused stuff --- code/modules/shuttles/marine_ferry.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 2bb784e0ab9a..14787fccb388 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -298,10 +298,6 @@ var/obj/structure/dropship_equipment/E = X E.on_arrival() - for(var/fog in GLOB.landing_zone_fog) - var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog.Clear() - moving_status = SHUTTLE_IDLE if(!transit_gun_mission) //we're back where we started, no location change. @@ -577,9 +573,6 @@ for(var/X in equipments) var/obj/structure/dropship_equipment/E = X E.on_arrival() - for(var/fog in GLOB.landing_zone_fog) - var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog.Clear() moving_status = SHUTTLE_IDLE From aaa16493a256127e8683f35b53c78e1fca65e025 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 18:40:38 +0200 Subject: [PATCH 09/17] updates Destroy --- code/game/objects/structures/blocker.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 1e7aac57683e..90ed2f5d501a 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -77,6 +77,11 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) GLOB.landing_zone_fog -= src QDEL_IN(src, rand(2 SECONDS,4 SECONDS)) +/obj/structure/blocker/landing_zone_fog/Destroy() + GLOB.landing_zone_fog -= src + . = ..() + + /obj/structure/blocker/forcefield name = "forcefield" From 5569d9fb8e073bd2502d9443757ec3915bed6a98 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 19:20:06 +0200 Subject: [PATCH 10/17] eh --- code/game/objects/structures/blocker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 90ed2f5d501a..2eec55afabf7 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) /obj/structure/blocker/landing_zone_fog/proc/Clear() GLOB.landing_zone_fog -= src - QDEL_IN(src, rand(2 SECONDS,4 SECONDS)) + QDEL_IN(src, rand(3 SECONDS,5 SECONDS)) /obj/structure/blocker/landing_zone_fog/Destroy() GLOB.landing_zone_fog -= src From 25b6ba502c85b70c13a4d48134e037ac93283656 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 19:32:11 +0200 Subject: [PATCH 11/17] beagle fix --- code/game/objects/structures/blocker.dm | 2 +- code/modules/shuttle/shuttles/dropship.dm | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 2eec55afabf7..d980beb5fe8e 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(landing_zone_fog, list()) GLOB.landing_zone_fog += src . = ..() -/obj/structure/blocker/landing_zone_fog/proc/Clear() +/obj/structure/blocker/landing_zone_fog/proc/clear() GLOB.landing_zone_fog -= src QDEL_IN(src, rand(3 SECONDS,5 SECONDS)) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 2d1ae117e9e7..494a93e3f206 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -261,9 +261,8 @@ xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE - for(var/fog in GLOB.landing_zone_fog) - var/obj/structure/blocker/landing_zone_fog/landing_zone_fog = fog - landing_zone_fog.Clear() + for(var/obj/structure/blocker/landing_zone_fog/fog as anything in GLOB.landing_zone_fog) + fog.clear() /obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) . = ..() From c8898423cccfba581c82c7dd568ed280c9e8bb6e Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 20:55:39 +0200 Subject: [PATCH 12/17] baseground for LZ omnisentyguns --- code/modules/defenses/sentry.dm | 24 +++++++++++++++++++++++ code/modules/shuttle/shuttles/dropship.dm | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 954e6adca7ec..4560afeadf9d 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -467,6 +467,28 @@ fire(target) +GLOBAL_LIST_INIT(landing_zone_sentryguns, list()) +/obj/structure/machinery/defenses/sentry/landing_zone + name = "UA-577 Gauss Turret spaceborn" + fire_delay = 2 + omni_directional = TRUE + immobile = TRUE + turned_on = TRUE + icon_state = "premade" //for the map editor only + faction_group = FACTION_LIST_MARINE + placed = 1 + +/obj/structure/machinery/defenses/sentry/landing_zone/Initialize() + GLOB.landing_zone_sentryguns += src + . = ..() + +/obj/structure/machinery/defenses/sentry/landing_zone/Destroy() + GLOB.landing_zone_sentryguns -= src + . = ..() +/obj/structure/machinery/defenses/sentry/landing_zone/proc/on_landing() + GLOB.landing_zone_sentryguns -= src + QDEL_IN(src, 10 MINUTES) + /obj/structure/machinery/defenses/sentry/premade name = "UA-577 Gauss Turret" immobile = TRUE @@ -530,6 +552,8 @@ fire_delay = 4 omni_directional = TRUE + + //the turret inside the shuttle sentry deployment system /obj/structure/machinery/defenses/sentry/premade/dropship density = TRUE diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 494a93e3f206..cb3aaf4c703c 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -261,8 +261,8 @@ xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE - for(var/obj/structure/blocker/landing_zone_fog/fog as anything in GLOB.landing_zone_fog) - fog.clear() + for(var/obj/structure/machinery/defenses/sentry/landing_zone/sentrygun as anything in GLOB.landing_zone_sentryguns) + sentrygun.on_landing() /obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) . = ..() From 0d75bbf22998400b9796034126fe0d3b76a40309 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 20:57:05 +0200 Subject: [PATCH 13/17] should not have deleted --- code/modules/shuttle/shuttles/dropship.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index cb3aaf4c703c..dbaa34aafa93 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -261,6 +261,9 @@ xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE + for(var/obj/structure/blocker/landing_zone_fog/fog as anything in GLOB.landing_zone_fog) + fog.Clear() + for(var/obj/structure/machinery/defenses/sentry/landing_zone/sentrygun as anything in GLOB.landing_zone_sentryguns) sentrygun.on_landing() From 7d92ed4aa9cfce1bf3ec1e842039d1d51f155991 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 16 May 2024 21:10:12 +0200 Subject: [PATCH 14/17] messed up --- code/modules/shuttle/shuttles/dropship.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index dbaa34aafa93..d8fb316615cb 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -262,7 +262,7 @@ xeno_announce = FALSE for(var/obj/structure/blocker/landing_zone_fog/fog as anything in GLOB.landing_zone_fog) - fog.Clear() + fog.clear() for(var/obj/structure/machinery/defenses/sentry/landing_zone/sentrygun as anything in GLOB.landing_zone_sentryguns) sentrygun.on_landing() From 1293299fdbf2b42fce4260930146e64cf6efafb2 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 17 May 2024 07:54:19 +0200 Subject: [PATCH 15/17] added chat and sound as sentry power goes low --- code/modules/defenses/sentry.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 4560afeadf9d..8607c9b79de0 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -477,6 +477,9 @@ GLOBAL_LIST_INIT(landing_zone_sentryguns, list()) icon_state = "premade" //for the map editor only faction_group = FACTION_LIST_MARINE placed = 1 + var/first_warning = 9 MINUTES + var/second_warning = 9 MINUTES + 30 SECONDS + var/third_warning = 9 MINUTES + 57 SECONDS /obj/structure/machinery/defenses/sentry/landing_zone/Initialize() GLOB.landing_zone_sentryguns += src @@ -487,8 +490,25 @@ GLOBAL_LIST_INIT(landing_zone_sentryguns, list()) . = ..() /obj/structure/machinery/defenses/sentry/landing_zone/proc/on_landing() GLOB.landing_zone_sentryguns -= src + addtimer(CALLBACK(src,PROC_REF(time_left), 1), first_warning) + addtimer(CALLBACK(src,PROC_REF(time_left), 2), second_warning) + addtimer(CALLBACK(src,PROC_REF(time_left), 3), third_warning) QDEL_IN(src, 10 MINUTES) +/obj/structure/machinery/defenses/sentry/landing_zone/proc/time_left(counter) + var/volume = 15 + switch(counter) + if(1) + volume = 15 + visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery gets low.")) + if(2) + volume = 20 + visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery gets criticly low.")) + if(3) + visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery goes out! It deconstructs itself!")) + volume = 25 + playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', volume, 1) + /obj/structure/machinery/defenses/sentry/premade name = "UA-577 Gauss Turret" immobile = TRUE From 8706251842413b8e80a7331c8d802acea1d5ee19 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 17 May 2024 07:59:39 +0200 Subject: [PATCH 16/17] diferent sounds --- code/modules/defenses/sentry.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 8607c9b79de0..f5b4a30ad26a 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -496,18 +496,16 @@ GLOBAL_LIST_INIT(landing_zone_sentryguns, list()) QDEL_IN(src, 10 MINUTES) /obj/structure/machinery/defenses/sentry/landing_zone/proc/time_left(counter) - var/volume = 15 switch(counter) if(1) - volume = 15 + playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 15, 1) visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery gets low.")) if(2) - volume = 20 + playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 20, 1) visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery gets criticly low.")) if(3) - visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery goes out! It deconstructs itself!")) - volume = 25 - playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', volume, 1) + playsound(loc, 'sound/mecha/critdestrsyndi.ogg', 25, 1) + visible_message(SPAN_WARNING("\The [name] deconstructs itself as its battery goes out!)) /obj/structure/machinery/defenses/sentry/premade name = "UA-577 Gauss Turret" From b3d463982796c17f911a5569632af259e67ca435 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 17 May 2024 08:05:18 +0200 Subject: [PATCH 17/17] unintended deletion --- code/modules/defenses/sentry.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index f5b4a30ad26a..cf34f8bf655a 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -505,7 +505,8 @@ GLOBAL_LIST_INIT(landing_zone_sentryguns, list()) visible_message(SPAN_WARNING("\The [name] beeps steadily as its battery gets criticly low.")) if(3) playsound(loc, 'sound/mecha/critdestrsyndi.ogg', 25, 1) - visible_message(SPAN_WARNING("\The [name] deconstructs itself as its battery goes out!)) + visible_message(SPAN_WARNING("\The [name] deconstructs itself as its battery goes out!")) + /obj/structure/machinery/defenses/sentry/premade name = "UA-577 Gauss Turret"