From 7ca5bfc061539c540746adc60b0825b03b433679 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 9 Mar 2017 18:03:54 +0100 Subject: [PATCH 1/4] Firelock force change, airlock jaws of life force change, station goal typo fix --- code/game/machinery/doors/airlock.dm | 6 +++++- code/game/machinery/doors/firedoor.dm | 17 +++++++++-------- code/modules/station_goals/bsa.dm | 2 +- code/modules/station_goals/shield.dm | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3c2c13254cf..c8359fd98d9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -891,8 +891,12 @@ About the new airlock wires panel: if(arePowerSystemsOn()) var/obj/item/weapon/crowbar/power/P = C - playsound(src, 'sound/machines/airlock_alien_prying.ogg',100,1) //is it aliens or just the CE being a dick? + playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1) //is it aliens or just the CE being a dick? + user.visible_message("[user] starts forcing \the [src] with \the [P]...", \ + "You begin forcing \the [src] with \the [P]...") if(do_after(user, P.airlock_open_time, target = src)) + user.visible_message("[user] forces \the [src] with \the [P].", \ + "You force \the [src] with \the [P].") open(2) if(density && !open(2)) to_chat(user, "Despite your attempts, the [src] refuses to open.") diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 63fed84088a..4e1f46a1cb1 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -93,7 +93,6 @@ user.visible_message("[user] forces \the [src] with [C].", "You force \the [src] with [C].") if(density) - autoclose = TRUE open() else close() @@ -110,7 +109,6 @@ if(do_after(user, force_open_time, target = src)) user.visible_message("[user] forces \the [src].", \ "You force \the [src].") - autoclose = TRUE open() else if(glass) user.changeNext_move(CLICK_CD_MELEE) @@ -160,9 +158,12 @@ active_alarm = FALSE update_icon() -/obj/machinery/door/firedoor/open() +/obj/machinery/door/firedoor/open(auto_close = TRUE) . = ..() - latetoggle() + latetoggle(auto_close) + + if(auto_close) + autoclose = TRUE /obj/machinery/door/firedoor/close() . = ..() @@ -174,22 +175,22 @@ if(active_alarm) . = ..() -/obj/machinery/door/firedoor/proc/latetoggle() +/obj/machinery/door/firedoor/proc/latetoggle(auto_close = TRUE) if(operating || stat & NOPOWER || !nextstate) return switch(nextstate) if(OPEN) nextstate = null - open() + open(auto_close) if(CLOSED) nextstate = null close() -/obj/machinery/door/firedoor/proc/forcetoggle(magic = FALSE) +/obj/machinery/door/firedoor/proc/forcetoggle(magic = FALSE, auto_close = TRUE) if(!magic && (operating || stat & NOPOWER)) return if(density) - open() + open(auto_close) else close() diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index a2f3a047dae..38d04b527db 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -7,7 +7,7 @@ /datum/station_goal/bluespace_cannon/get_report() return {"Bluespace Artillery position construction
- Our military presence is inadequate in your sector. We need you to construct BSA-[rand(1,99)] Artillery position aboard your station. + Our military presence is inadequate in your sector. We need you to construct a BSA-[rand(1,99)] Artillery position aboard your station.

Its base parts should be available for shipping by your cargo shuttle.
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index 8a7484626be..5a19fcb67cc 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -9,7 +9,7 @@ return {"Station Shield construction
The station is located in a zone full of space debris. We have a prototype shielding system you will deploy to reduce collision related accidents.

- You can order the satellites and control systems through cargo shuttle."} + You can order the satellites and control systems through the cargo shuttle."} /datum/station_goal/station_shield/on_report() //Unlock From 4a0f548cfe9e7dcf4a65e49a6bce73bfc94f55fb Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 9 Mar 2017 18:12:57 +0100 Subject: [PATCH 2/4] More sensible message --- code/game/machinery/doors/airlock.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c8359fd98d9..9f75213f0bc 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -892,11 +892,11 @@ About the new airlock wires panel: if(arePowerSystemsOn()) var/obj/item/weapon/crowbar/power/P = C playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1) //is it aliens or just the CE being a dick? - user.visible_message("[user] starts forcing \the [src] with \the [P]...", \ - "You begin forcing \the [src] with \the [P]...") + user.visible_message("[user] starts forcing [src] with \the [P]...", \ + "You begin forcing [src] with \the [P]...") if(do_after(user, P.airlock_open_time, target = src)) - user.visible_message("[user] forces \the [src] with \the [P].", \ - "You force \the [src] with \the [P].") + user.visible_message("[user] forces [src] with \the [P].", \ + "You force [src] with \the [P].") open(2) if(density && !open(2)) to_chat(user, "Despite your attempts, the [src] refuses to open.") From 9cd0d490f99dce68225e4f16b70bc44c90c2daaf Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 9 Mar 2017 18:49:15 +0100 Subject: [PATCH 3/4] Add explosion damage to regular firelocks --- code/game/machinery/doors/firedoor.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4e1f46a1cb1..b7d989ab406 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -36,6 +36,17 @@ if(!density) return ..() return 0 + +/obj/machinery/door/firedoor/ex_act(severity) + switch(severity) + if(1.0) + qdel(src) + if(2.0) + if(prob(50)) + qdel(src) + if(3.0) + if(prob(5)) + qdel(src) /obj/machinery/door/firedoor/power_change() if(powered(power_channel)) From 2b83c08e29add5148327b48dfb6159f3e7550096 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 9 Mar 2017 18:50:52 +0100 Subject: [PATCH 4/4] Remove severity 3 damage --- code/game/machinery/doors/firedoor.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b7d989ab406..194d5655eb1 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -44,9 +44,6 @@ if(2.0) if(prob(50)) qdel(src) - if(3.0) - if(prob(5)) - qdel(src) /obj/machinery/door/firedoor/power_change() if(powered(power_channel))