diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index e12f35c753e..99bbb494d7e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -8,7 +8,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co name = "newscaster" desc = "A standard newsfeed handler for use on commercial space stations. All the news you absolutely have no use for, in one place!" icon = 'icons/obj/terminals.dmi' - icon_state = "newscaster_normal" + icon_state = "newscaster" var/isbroken = 0 //1 if someone banged it with something heavy var/ispowered = 1 //starts powered, changes with power_change() //var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored. @@ -71,7 +71,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/update_icon() if(!ispowered || isbroken) - icon_state = "newscaster_off" + icon_state = initial(icon_state) + set_light(FALSE) if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. cut_overlays() add_overlay("crack3") @@ -79,17 +80,24 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co cut_overlays() //reset overlays + var/mutable_appearance/base_screen_overlay = mutable_appearance(icon, "newscaster-screen", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(base_screen_overlay) + set_light(1.4, 1, COLOR_CYAN) + if(SSnews.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message - icon_state = "newscaster_wanted" + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-wanted", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) return if(alert) //new message alert overlay - add_overlay("newscaster_alert") + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-alert", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) if(hitstaken > 0) //Cosmetic damage overlay - add_overlay("crack[hitstaken]") + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "crack[hitstaken]", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) - icon_state = "newscaster_normal" + icon_state = initial(icon_state) return /obj/machinery/newscaster/power_change() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 083cc4e4cd5..0428dc76844 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -28,7 +28,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() desc = "A console intended to send requests to different departments on the station." anchored = 1 icon = 'icons/obj/terminals.dmi' - icon_state = "req_comp0" + icon_state = "req_comp" component_types = list( /obj/item/circuitboard/requestconsole, /obj/item/stock_parts/capacitor, @@ -73,16 +73,28 @@ var/list/obj/machinery/requests_console/allConsoles = list() update_icon() /obj/machinery/requests_console/update_icon() + cut_overlays() if(stat & NOPOWER) - if(icon_state != "req_comp_off") - icon_state = "req_comp_off" + icon_state = initial(icon_state) + set_light(FALSE) else - if(icon_state == "req_comp_off") - icon_state = "req_comp[newmessagepriority]" - if (newmessagepriority) - set_light(2) - else - set_light(0) + switch(newmessagepriority) + if(0) + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-idle", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) + if(1) + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-alert", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) + if(2) + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-redalert", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_RED_LIGHT) + if(3) + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-yellowalert", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_YELLOW) /obj/machinery/requests_console/Initialize(mapload, var/dir, var/building = 0) . = ..() @@ -107,6 +119,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() req_console_supplies |= department if (departmentType & RC_INFO) req_console_information |= department + update_icon() /obj/machinery/requests_console/Destroy() allConsoles -= src diff --git a/code/game/machinery/ringer.dm b/code/game/machinery/ringer.dm index ec41a659e1c..1f215a3e6c4 100644 --- a/code/game/machinery/ringer.dm +++ b/code/game/machinery/ringer.dm @@ -2,7 +2,7 @@ name = "ringer terminal" desc = "A ringer terminal, PDAs can be linked to it." icon = 'icons/obj/terminals.dmi' - icon_state = "bell_standby" + icon_state = "bell" anchored = TRUE req_access = list() //what access it needs to link your pda @@ -16,8 +16,9 @@ /obj/machinery/ringer/Initialize() . = ..() - if (id) + if(id) ringers = new(id, src) + update_icon() /obj/machinery/ringer/power_change() ..() @@ -28,17 +29,24 @@ return ..() /obj/machinery/ringer/update_icon() - if(stat & NOPOWER) - icon_state = "bell_off" + cut_overlays() + if(!on || stat & NOPOWER) + icon_state = initial(icon_state) + set_light(FALSE) + return + if(rings_pdas || rings_pdas.len) + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-active", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) return - if (rings_pdas || rings_pdas.len) - icon_state = "bell_active" if(pinged) - icon_state = "bell_alert" - if(!on) - icon_state = "bell_off" + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-alert", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_RED_LIGHT) else - icon_state = "bell_standby" + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-standby", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) /obj/machinery/ringer/attackby(obj/item/C as obj, mob/living/user as mob) if(stat & (BROKEN|NOPOWER) || !istype(user,/mob/living)) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 87b7ddcbdff..7d19598f6d0 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -36,6 +36,7 @@ log transactions /obj/machinery/atm/Initialize() . = ..() machine_id = "Idris SelfServ #[SSeconomy.num_financial_terminals++]" + update_icon() /obj/machinery/atm/Destroy() authenticated_account = null @@ -45,9 +46,28 @@ log transactions return ..() +/obj/machinery/atm/power_change() + ..() + update_icon() + +/obj/machinery/atm/update_icon() + cut_overlays() + if(stat & NOPOWER) + set_light(FALSE) + return + + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "atm-active", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) + + if(held_card) + var/mutable_appearance/card_overlay = mutable_appearance(icon, "atm-cardin", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(card_overlay) /obj/machinery/atm/machinery_process() if(stat & NOPOWER) + cut_overlays() + set_light(FALSE) return if(ticks_left_timeout > 0) @@ -99,6 +119,7 @@ log transactions held_card = idcard if(authenticated_account && held_card.associated_account_number != authenticated_account.account_number) authenticated_account = null + update_icon() else if(authenticated_account) if(istype(I,/obj/item/spacecash)) //consume the money @@ -437,6 +458,7 @@ log transactions if (istype(I, /obj/item/card/id)) usr.drop_from_inventory(I,src) held_card = I + update_icon() else release_held_id(usr) if("logout") @@ -505,6 +527,7 @@ log transactions if(!human_user.get_active_hand()) human_user.put_in_hands(held_card) held_card = null + update_icon() /obj/machinery/atm/proc/spawn_ewallet(var/sum, loc, mob/living/carbon/human/human_user as mob) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 2cf21822c8a..a8806c56066 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -21,6 +21,12 @@ var/waste = 0 var/idx = 0 +/obj/machinery/mineral/processing_unit_console/Initialize(mapload, d, populate_components) + . = ..() + var/mutable_appearance/screen_overlay = mutable_appearance(icon, "console-screen", EFFECTS_ABOVE_LIGHTING_LAYER) + add_overlay(screen_overlay) + set_light(1.4, 1, COLOR_CYAN) + /obj/machinery/mineral/processing_unit_console/proc/setup_machine(mob/user) if(!machine) var/area/A = get_area(src) diff --git a/html/changelogs/geeves-shiny_wall_fixtures.yml b/html/changelogs/geeves-shiny_wall_fixtures.yml new file mode 100644 index 00000000000..56323f33e86 --- /dev/null +++ b/html/changelogs/geeves-shiny_wall_fixtures.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Some of the wall fixtures now glow in the dark, as they have bright cyan screens." + - rscadd: "ATMs now gain an overlay when a card is inserted. It's minute, so you'll probably still forget your ID, like you always do." \ No newline at end of file diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index cfda2112b70..f251568938d 100644 Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 4e4c928aa18..0d49cf2358c 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ