From e5b424850d55e42bb627648514101e1939c425c2 Mon Sep 17 00:00:00 2001 From: Afya212 <54920261+Afya212@users.noreply.github.com> Date: Mon, 1 Jun 2020 13:17:57 -0400 Subject: [PATCH] Fire Alarms (#8978) Fire alarms now show the alert level on examine --- code/game/machinery/alarm.dm | 2 +- code/game/machinery/firealarm.dm | 7 ++++++ html/changelogs/Afya_Alarm.yml | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Afya_Alarm.yml diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 6c016f213b8..e0c1107e9e8 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -842,4 +842,4 @@ Just a object used in constructing air alarms w_class = 2.0 matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50) -// Fire Alarms moved to firealarm.dm \ No newline at end of file +// Fire Alarms moved to firealarm.dm diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index b0e46c004a5..8c5e1af9316 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -20,6 +20,13 @@ var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone var/seclevel +/obj/machinery/firealarm/examine(mob/user) + . = ..() + if((stat & (NOPOWER|BROKEN)) || buildstage != 2) + return + + to_chat(user, "The current alert level is [get_security_level()].") + /obj/machinery/firealarm/update_icon() cut_overlays() diff --git a/html/changelogs/Afya_Alarm.yml b/html/changelogs/Afya_Alarm.yml new file mode 100644 index 00000000000..dbdc7bc62d0 --- /dev/null +++ b/html/changelogs/Afya_Alarm.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Afya + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Fire alarms now show alert level on examine"