Skip to content

Commit

Permalink
TG port: New display, pod control and request console sprites (Paradi…
Browse files Browse the repository at this point in the history
…seSS13#22979)

* TG port: New display, pod control and
request console sprites

* fixing pod control sprite animation speed
  • Loading branch information
Henri215 authored Oct 29, 2023
1 parent 27dcf8c commit de50855
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 14 deletions.
17 changes: 4 additions & 13 deletions code/game/machinery/requests_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
desc = "A console intended to send requests to different departments on the station."
anchored = TRUE
icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp0"
icon_state = "req_comp_off"
max_integrity = 300
armor = list(MELEE = 70, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, RAD = 0, FIRE = 90, ACID = 90)
var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
Expand Down Expand Up @@ -75,25 +75,16 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
set_light(1, LIGHTING_MINIMUM_POWER)
update_icon(UPDATE_ICON_STATE | UPDATE_OVERLAYS)

/obj/machinery/requests_console/update_icon_state()
if(stat & NOPOWER)
if(icon_state != "req_comp_off")
icon_state = "req_comp_off"
else
icon_state = "req_comp[newmessagepriority]"

/obj/machinery/requests_console/update_overlays()
. = ..()
underlays.Cut()

if(stat & NOPOWER)
return

if(newmessagepriority == RQ_NONEW_MESSAGES)
underlays += emissive_appearance(icon, "req_comp_lightmask")
else
underlays += emissive_appearance(icon, "req_comp2_lightmask")
. += "req_comp[newmessagepriority]"

underlays += emissive_appearance(icon, "req_comp_lightmask")

/obj/machinery/requests_console/Initialize(mapload)
Radio = new /obj/item/radio(src)
Expand Down Expand Up @@ -263,7 +254,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
for(var/obj/machinery/requests_console/Console in GLOB.allRequestConsoles)
if(Console.department == department)
Console.newmessagepriority = RQ_NONEW_MESSAGES
Console.icon_state = "req_comp0"
Console.update_icon(UPDATE_OVERLAYS)
Console.set_light(1)
if(tempScreen == RCS_MAINMENU)
reset_message()
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/mountable_frames/newscaster_frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@
/obj/item/mounted/frame/display/display_frame
name = "status display frame"
desc = "Used to build status displays, just secure to the wall."
icon_state = "frame_unanchored"
build_path = /obj/machinery/status_display

/obj/item/mounted/frame/display/ai_display_frame
name = "ai status display frame"
desc = "Used to build ai status displays, just secure to the wall."
icon_state = "frame_unanchored"
build_path = /obj/machinery/ai_status_display

/obj/item/mounted/frame/display/entertainment_frame
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/message_server.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(message_servers)
continue
if(RC.newmessagepriority < priority)
RC.newmessagepriority = priority
RC.icon_state = "req_comp[priority]"
RC.update_icon(UPDATE_OVERLAYS)
switch(priority)
if(2)
if(!RC.silent)
Expand Down
Binary file modified icons/obj/status_display.dmi
Binary file not shown.
Binary file modified icons/obj/terminals.dmi
Binary file not shown.

0 comments on commit de50855

Please sign in to comment.