From 9a994e4e16146060b3ec08fda7296307eda65643 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 24 Jun 2019 11:23:41 -0800 Subject: [PATCH] Merge pull request #6226 from SubberTheFabulous/MonitorFix Makes some alt. roboheads actually use their monitors --- code/modules/organs/robolimbs.dm | 7 ++++++- icons/mob/monitor_icons.dmi | Bin 5506 -> 5738 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index fd59a97d076..8f0ef8174c2 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -129,7 +129,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon = 'icons/mob/human_races/cyberlimbs/grayson/grayson_main.dmi' unavailable_to_build = 1 monitor_styles = "blank=grayson_off;\ + red=grayson_red;\ green=grayson_green;\ + blue=grayson_blue;\ rgb=grayson_rgb" /datum/robolimb/grayson_alt1 @@ -177,7 +179,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ desc = "This rather thick limb has a militaristic green plating." icon = 'icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi' unavailable_to_build = 1 - + monitor_styles = "red=athena_red;\ + blank=athena_off" /datum/robolimb/hephaestus_monitor company = "Hephaestus Monitor" @@ -266,7 +269,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi' unavailable_to_build = 1 monitor_styles = "blank=xion_off;\ + red=xion_red;\ green=xion_green;\ + blue=xion_blue;\ rgb=xion_rgb" /datum/robolimb/xion_alt3 diff --git a/icons/mob/monitor_icons.dmi b/icons/mob/monitor_icons.dmi index 0dd92e3fc225d358839d6aa30673a48a7b3af167..cd7de49fb9ab365f0ae5b09c9f8e200170fe8d90 100644 GIT binary patch literal 5738 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 literal 5506 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