From b295b9e3c6585acf9eebb4b02d2bf4d8b8246e65 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 18 Apr 2015 20:13:25 +0200 Subject: [PATCH 1/3] Another emergency shutter fix. I goofed, and dropped the distance check. --- code/game/machinery/doors/firedoor.dm | 2 +- html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 91bfe669271..7b5b57cb9c0 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -77,7 +77,7 @@ /obj/machinery/door/firedoor/examine(mob/user) - . = ..() + . = ..(user, 1) if(!. || !density) return diff --git a/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml b/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml new file mode 100644 index 00000000000..da189fb8c1e --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "Emergency shutters can again be examined, and from the proper distance." From 7f6b908af242f896854856aa92b99925338b8a3b Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 20 Apr 2015 10:03:54 +0200 Subject: [PATCH 2/3] Fixes #8917. Makes it possible to scan for new sensors as necessary. Useful if the ability to remove/change/create new sensors is added. --- code/modules/nano/modules/power_monitor.dm | 2 ++ nano/templates/power_monitor.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/nano/modules/power_monitor.dm b/code/modules/nano/modules/power_monitor.dm index 03d9263a802..7df3cb7c89a 100644 --- a/code/modules/nano/modules/power_monitor.dm +++ b/code/modules/nano/modules/power_monitor.dm @@ -54,5 +54,7 @@ return if( href_list["clear"] ) active_sensor = null + if( href_list["refresh"] ) + refresh_sensors() else if( href_list["setsensor"] ) active_sensor = href_list["setsensor"] diff --git a/nano/templates/power_monitor.tmpl b/nano/templates/power_monitor.tmpl index 607115aec0e..bf07238784f 100644 --- a/nano/templates/power_monitor.tmpl +++ b/nano/templates/power_monitor.tmpl @@ -77,8 +77,8 @@ {{/if}} {{else}} -
- No active sensor. Printing sensor list. +
+ {{:helper.link('Scan For Sensors', 'refresh', { 'refresh' : 1})}} No active sensor. Printing sensor list.

{{for data.all_sensors}} {{if value.alarm}} From 446efb380935147f9d631753a7f3b3b9b1ab9329 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Tue, 21 Apr 2015 19:57:45 +0300 Subject: [PATCH 3/3] Fixed attacking blob breaking logs --- code/game/gamemodes/blob/theblob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index f6351c84809..93fb84ddcbd 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -158,7 +158,7 @@ attackby(var/obj/item/weapon/W, var/mob/user) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - src.visible_message("\red The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = 0 switch(W.damtype) if("fire")