diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 5b3bca9f191..7d26c67f6da 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2723,6 +2723,58 @@ Follow by example and make good judgement based on length which list to include name = "yellow IPC screen" icon_state = "ipc_yellow" + ipc_screen_nanotrasen + name = "nanotrasen IPC screen" + icon_state = "ipc_nt" + + ipc_screen_hephaestus + name = "hephaestus IPC screen" + icon_state = "ipc_heph" + + ipc_screen_idris + name = "idris IPC screen" + icon_state = "ipc_idris" + + ipc_screen_zavodskoi + name = "zavodskoi IPC screen" + icon_state = "ipc_zavod" + + ipc_screen_zenghu + name = "zeng-hu IPC screen" + icon_state = "ipc_zenghu" + + ipc_screen_scc + name = "scc IPC screen" + icon_state = "ipc_scc" + + ipc_screen_biesel + name = "republic of biesel IPC screen" + icon_state = "ipc_biesel" + + ipc_screen_sol + name = "sol alliance IPC screen" + icon_state = "ipc_sol" + + ipc_screen_coalition + name = "coalition of colonies IPC screen" + icon_state = "ipc_coc" + + ipc_screen_elyra + name = "republic of elyra IPC screen" + icon_state = "ipc_elyra" + + ipc_screen_eridani + name = "eridani IPC screen" + icon_state = "ipc_eridani" + + ipc_screen_burzsia + name = "burzsia IPC screen" + icon_state = "ipc_burzsia" + + ipc_screen_tp + name = "trinary perfection IPC screen" + icon_state = "ipc_tp" + diona_eye icon = 'icons/mob/human_face/dionae_hair.dmi' name = "Mono Eye" @@ -2903,7 +2955,7 @@ Follow by example and make good judgement based on length which list to include do_colouration = FALSE body_parts = list(BP_CHEST) species_allowed = list(/datum/species/bug, /datum/species/bug/type_b) - + mecha_abdomen name = "Mecha Abdomen" icon_state = "mecha_abdomen" @@ -3483,7 +3535,7 @@ Follow by example and make good judgement based on length which list to include icon_state = "taj_pawsocks" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) species_allowed = list(/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara) - + taj_glovesfull_alt name = "Socks Coloration (Full Gloves Alt)" icon_state = "taj_pawsocks_alternate" diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm index a8abb01323f..feaa43d2721 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm @@ -290,6 +290,45 @@ if ("waiting IPC screen") return "#FFFFFF" + if ("nanotrasen IPC screen") + return LIGHT_COLOR_BLUE + + if ("hephaestus IPC screen") + return LIGHT_COLOR_ORANGE + + if ("idris IPC screen") + return LIGHT_COLOR_CYAN + + if ("zavodskoi IPC screen") + return LIGHT_COLOR_RED + + if ("zeng-hu IPC screen") + return "#FFFFFF" + + if ("scc IPC screen") + return LIGHT_COLOR_BLUE + + if ("republic of biesel IPC screen") + return "#FFFFFF" + + if ("sol alliance IPC screen") + return "#FFFFFF" + + if ("coalition of colonies IPC screen") + return LIGHT_COLOR_BLUE + + if ("republic of elyra IPC screen") + return LIGHT_COLOR_YELLOW + + if ("eridani IPC screen") + return "#FFFFFF" + + if ("burzsia IPC screen") + return LIGHT_COLOR_ORANGE + + if ("trinary perfection IPC screen") + return LIGHT_COLOR_RED + /datum/species/machine/before_equip(var/mob/living/carbon/human/H) . = ..() check_tag(H, H.client) diff --git a/html/changelogs/stryker-ipcscreens2.yml b/html/changelogs/stryker-ipcscreens2.yml new file mode 100644 index 00000000000..19ae77bce18 --- /dev/null +++ b/html/changelogs/stryker-ipcscreens2.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NiennaB, HappyFox + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds various baseline IPC screens for Trinary Perfection, the megacorporations (NT, Hephaestus, Idris, Zavodskoi, Zeng-Hu, SCC), as well as several human factions (Biesel, Sol, CoC, Elyra, Eridani, and Burzsia)." diff --git a/icons/mob/human_face/ipc_screens.dmi b/icons/mob/human_face/ipc_screens.dmi index 2f4cd4dc375..f35791a87a2 100644 Binary files a/icons/mob/human_face/ipc_screens.dmi and b/icons/mob/human_face/ipc_screens.dmi differ