From 6211735bac7bba1c7f6b93058f4ef93ebc0c69e7 Mon Sep 17 00:00:00 2001 From: Neerti Date: Mon, 18 Feb 2019 03:52:19 -0500 Subject: [PATCH 1/2] Fixes Diona and Promethean prosthetics. --- code/modules/organs/robolimbs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 5a55b1bcd5..3562ca3d1e 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -42,7 +42,11 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ var/lifelike // If set, appears organic. var/skin_tone // If set, applies skin tone rather than part color var/blood_color = "#030303" +<<<<<<< HEAD var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit +======= + var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA) +>>>>>>> d734a24... Merge pull request #5969 from Mechoid/No_Robot_For_The_Weirdos var/list/monitor_styles //If empty, the model of limbs offers a head compatible with monitors. var/parts = BP_ALL //Defines what parts said brand can replace on a body. var/health_hud_intensity = 1 // Intensity modifier for the health GUI indicator. From 92a9d8159954c844b7066a22daab25e6bd04e14a Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 28 Mar 2019 20:33:14 -0400 Subject: [PATCH 2/2] Update robolimbs.dm --- code/modules/organs/robolimbs.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 3562ca3d1e..e2772756ec 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -42,11 +42,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ var/lifelike // If set, appears organic. var/skin_tone // If set, applies skin tone rather than part color var/blood_color = "#030303" -<<<<<<< HEAD - var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit -======= - var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA) ->>>>>>> d734a24... Merge pull request #5969 from Mechoid/No_Robot_For_The_Weirdos + var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_XENOCHIMERA) //VOREStation Edit var/list/monitor_styles //If empty, the model of limbs offers a head compatible with monitors. var/parts = BP_ALL //Defines what parts said brand can replace on a body. var/health_hud_intensity = 1 // Intensity modifier for the health GUI indicator.