diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm
index 4f97968a86a..e60778542a8 100644
--- a/code/game/machinery/gulag_item_reclaimer.dm
+++ b/code/game/machinery/gulag_item_reclaimer.dm
@@ -2,18 +2,28 @@
name = "equipment reclaimer station"
desc = "Used to reclaim your items after you finish your sentence at the labor camp."
icon = 'icons/obj/terminals.dmi'
- icon_state = "dorm_taken"
+ icon_state = "gulag_off"
req_access = list(ACCESS_BRIG) //REQACCESS TO ACCESS ALL STORED ITEMS
density = FALSE
var/list/stored_items = list()
var/obj/machinery/gulag_teleporter/linked_teleporter = null
+ ///Icon of the current screen status
+ var/screen_icon = "gulag_on"
/obj/machinery/gulag_item_reclaimer/handle_atom_del(atom/deleting_atom)
for(var/person in stored_items)
stored_items[person] -= deleting_atom
return ..()
+/obj/machinery/gulag_item_reclaimer/update_overlays()
+ . = ..()
+ if(machine_stat & (NOPOWER|BROKEN))
+ return
+
+ . += mutable_appearance(icon, screen_icon)
+ . += emissive_appearance(icon, screen_icon, src)
+
/obj/machinery/gulag_item_reclaimer/Destroy()
for(var/i in contents)
var/obj/item/I = i
@@ -27,6 +37,8 @@
return
req_access = list()
obj_flags |= EMAGGED
+ screen_icon = "emagged_general"
+ update_appearance()
/obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 11c4463b4ed..2298cd76158 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
/obj/machinery/requests_console
name = "requests console"
desc = "A console intended to send requests to different departments on the station."
- icon = 'icons/obj/terminals.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
+ icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp_off"
base_icon_state = "req_comp"
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.15
@@ -108,16 +108,22 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
return
set_light(1.5, 0.7, "#34D352")//green light
-/obj/machinery/requests_console/update_icon_state()
- if(open)
- icon_state = "[base_icon_state]_[hackState ? "rewired" : "open"]"
- return ..()
- icon_state = "[base_icon_state]_off"
- return ..()
+/obj/machinery/requests_console/examine(mob/user)
+ . = ..()
+ if(!open)
+ . += span_notice("It looks like you can pry open the panel with a crowbar.")
+ else
+ . += span_warning("The panel was pried open, you can close it with a crowbar.")
+
+ if(hackState)
+ . += span_warning("The console seems to have been tampered with!")
/obj/machinery/requests_console/update_overlays()
. = ..()
+ if(open)
+ . += mutable_appearance(icon, "req_comp_open")
+
if(open || (machine_stat & NOPOWER))
return
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 93f588347dc..380198832c9 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -16,9 +16,9 @@
desc = "Allows a deployable expedition base to be dropped from the station to a designated mining location. It can also \
interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
icon = 'icons/obj/terminals.dmi'
- icon_state = "dorm_available"
+ icon_state = "pod_off"
icon_keyboard = null
- icon_screen = null
+ icon_screen = "pod_on"
req_one_access = list(ACCESS_AUX_BASE, ACCESS_COMMAND)
circuit = /obj/item/circuitboard/computer/auxiliary_base
/// Shuttle ID of the base
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index f502cecc84e..32e2720e9cc 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -598,13 +598,14 @@
locked = TRUE
possible_destinations = "pod_asteroid"
icon = 'icons/obj/terminals.dmi'
- icon_state = "dorm_available"
+ icon_state = "pod_off"
circuit = /obj/item/circuitboard/computer/emergency_pod
light_color = LIGHT_COLOR_BLUE
density = FALSE
+ icon_keyboard = null
+ icon_screen = "pod_on"
/obj/machinery/computer/shuttle/pod/Initialize(mapload)
- AddElement(/datum/element/update_icon_blocker)
. = ..()
RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_lock))
@@ -614,6 +615,8 @@
obj_flags |= EMAGGED
locked = FALSE
to_chat(user, span_warning("You fry the pod's alert level checking system."))
+ icon_screen = "emagged_general"
+ update_appearance()
/obj/machinery/computer/shuttle/pod/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
. = ..()
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index aaff7346096..9ba2452afe7 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -33,9 +33,9 @@
name = "syndicate assault pod control"
desc = "Controls the drop pod's launch system."
icon = 'icons/obj/terminals.dmi'
- icon_state = "dorm_available"
+ icon_state = "pod_off"
icon_keyboard = null
- icon_screen = null
+ icon_screen = "pod_on"
light_color = LIGHT_COLOR_BLUE
req_access = list(ACCESS_SYNDICATE)
shuttleId = "steel_rain"
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index 7909abe0fa8..961b6885115 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ
diff --git a/modular_skyrat/modules/advanced_shuttles/code/computer.dm b/modular_skyrat/modules/advanced_shuttles/code/computer.dm
index ad08aef531c..4e810026fff 100644
--- a/modular_skyrat/modules/advanced_shuttles/code/computer.dm
+++ b/modular_skyrat/modules/advanced_shuttles/code/computer.dm
@@ -1,10 +1,18 @@
/obj/machinery/computer/shuttle/pod/advanced
icon = 'modular_skyrat/modules/advanced_shuttles/icons/computer.dmi'
icon_state = "intercom"
+ icon_screen = "null"
layer = ABOVE_OBJ_LAYER
connectable = FALSE //connecting_computer change: since icon_state is not a typical console, it cannot be connectable.
+/obj/machinery/computer/shuttle/pod/advanced/emag_act(mob/user)
+ if(obj_flags & EMAGGED)
+ return
+ obj_flags |= EMAGGED
+ locked = FALSE
+ to_chat(user, span_warning("You fry the pod's alert level checking system."))
+
/obj/machinery/computer/emergency_shuttle/advanced
icon = 'modular_skyrat/modules/advanced_shuttles/icons/computer.dmi'
icon_state = "computer"
diff --git a/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi b/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi
index 809f934d746..189ac9d9501 100644
Binary files a/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi and b/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm b/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm
deleted file mode 100644
index fff14fb4ed0..00000000000
--- a/modular_skyrat/modules/aesthetics/requests/code/requests_console.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/obj/machinery/requests_console
- icon = 'modular_skyrat/modules/aesthetics/requests/icons/requests.dmi'
-
diff --git a/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi b/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi
deleted file mode 100644
index d676e1960c2..00000000000
Binary files a/modular_skyrat/modules/aesthetics/requests/icons/requests.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index b3dff1891af..e284f447279 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5562,7 +5562,6 @@
#include "modular_skyrat\modules\aesthetics\plasticflaps\code\plasticflaps.dm"
#include "modular_skyrat\modules\aesthetics\posters\posters.dm"
#include "modular_skyrat\modules\aesthetics\rack\code\rack.dm"
-#include "modular_skyrat\modules\aesthetics\requests\code\requests_console.dm"
#include "modular_skyrat\modules\aesthetics\rollerbed\code\rollerbed.dm"
#include "modular_skyrat\modules\aesthetics\shieldgen\code\shieldgen.dm"
#include "modular_skyrat\modules\aesthetics\spaceship_navigation_beacon\spaceship_navigation_beacon.dm"