From 1678a133cefa865015b1074e839352c1c776d9e7 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 1 Mar 2024 01:25:43 -0800 Subject: [PATCH 1/2] Fix skills for UPP/CLF Synths --- code/modules/gear_presets/clf.dm | 1 + code/modules/gear_presets/upp.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 392cb63646f6..9c05ff8fa5fc 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -746,6 +746,7 @@ new_human.set_species(SYNTH_COLONY_GEN_ONE) /datum/equipment_preset/clf/synth/load_skills(mob/living/carbon/human/new_human) + . = ..() new_human.allow_gun_usage = FALSE /datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 74bd9d8483fb..e73db8431f32 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -2638,6 +2638,7 @@ new_human.set_species(SYNTH_GEN_THREE) /datum/equipment_preset/upp/synth/load_skills(mob/living/carbon/human/new_human) + . = ..() new_human.allow_gun_usage = FALSE /datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human) From b1c42d0db642affec6c9491595701e13c02dd0df Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 1 Mar 2024 01:25:59 -0800 Subject: [PATCH 2/2] Fix naming for colony synth gen 1 and 2 --- code/__DEFINES/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index ebf08f495752..c0a5e837c554 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -182,8 +182,8 @@ //Synthetic Defines #define SYNTH_COLONY "Third Generation Colonial Synthetic" -#define SYNTH_COLONY_GEN_TWO "First Generation Colonial Synthetic" -#define SYNTH_COLONY_GEN_ONE "Second Generation Colonial Synthetic" +#define SYNTH_COLONY_GEN_TWO "Second Generation Colonial Synthetic" +#define SYNTH_COLONY_GEN_ONE "First Generation Colonial Synthetic" #define SYNTH_COMBAT "Combat Synthetic" #define SYNTH_INFILTRATOR "Infiltrator Synthetic" #define SYNTH_WORKING_JOE "Working Joe"