diff --git a/GainStation13/icons/obj/status_display.dmi b/GainStation13/icons/obj/status_display.dmi new file mode 100644 index 0000000000..4e86f4b366 Binary files /dev/null and b/GainStation13/icons/obj/status_display.dmi differ diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index dcb9ee9eb0..a49939cb55 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -267,7 +267,9 @@ /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" desc = "Damn, they better have the /tg/ channel on these things." - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "entertainment_blank" network = list("thunder") density = FALSE diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 98fe6c63af..5a69399440 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -18,7 +18,9 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/door_timer name = "door timer" - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "frame" desc = "A remote control for a door." plane = ABOVE_WALL_PLANE @@ -177,7 +179,9 @@ if(maptext) maptext = "" cut_overlays() - add_overlay(mutable_appearance('icons/obj/status_display.dmi', state)) + // GS13 EDIT + add_overlay(mutable_appearance('GainStation13/icons/obj/status_display.dmi', state)) + // GS13 END EDIT //Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 0ebd66f80f..9e1a6b61ec 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -18,7 +18,9 @@ /obj/machinery/status_display name = "status display" desc = null - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "frame" base_icon_state = "unanchoredstatusdisplay" verb_say = "beeps" @@ -249,7 +251,9 @@ * Nice overlay to make text smoothly scroll with no client updates after setup. */ /obj/effect/overlay/status_display_text - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_PLANE | VIS_INHERIT_ID var/message @@ -501,7 +505,9 @@ var/list/choices = list() for(var/emotion_const in emotion_map) var/icon_state = emotion_map[emotion_const] - choices[emotion_const] = image(icon = 'icons/obj/status_display.dmi', icon_state = icon_state) + // GS13 EDIT + choices[emotion_const] = image(icon = 'GainStation13/icons/obj/status_display.dmi', icon_state = icon_state) + // GS13 END EDIT var/emotion_result = show_radial_menu(user, src, choices, tooltips = TRUE) for(var/_emote in typesof(/datum/emote/ai/emotion_display)) diff --git a/config/maps.txt b/config/maps.txt index 327f44c024..8e060cda84 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -20,6 +20,9 @@ map boxstation #voteweight 1.5 endmap +map cogstation +endmap + map metastation minplayers 25 #voteweight 0.5