From 1104407ffc7c3282ec8b8ba2a7b4c70274450808 Mon Sep 17 00:00:00 2001 From: woodratt Date: Fri, 4 Dec 2015 17:12:57 -0800 Subject: [PATCH] Woodrat, Intercoms and rollerbed tweaks - Departmental intercoms should have --- .../objects/items/devices/radio/intercom.dm | 4 +++- icons/obj/rollerbed.dmi | Bin 1508 -> 1522 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 9d7bcf88127..ed8cf4ce0bc 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -33,10 +33,12 @@ /obj/item/device/radio/intercom/department/medbay name = "station intercom (Medbay)" + icon_state = "secintercom" frequency = MED_I_FREQ /obj/item/device/radio/intercom/department/security name = "station intercom (Security)" + icon_state = "medintercom" frequency = SEC_I_FREQ /obj/item/device/radio/intercom/New() @@ -110,7 +112,7 @@ if(!on) icon_state = "intercom-p" else - icon_state = "intercom" + icon_state = initial(icon_state) /obj/item/device/radio/intercom/locked var/locked_frequency diff --git a/icons/obj/rollerbed.dmi b/icons/obj/rollerbed.dmi index b7e451273620d4275d0100772731226deb30577b..6924cfddd0e48a7615c159c3e4c50595bbe65675 100644 GIT binary patch delta 1360 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