From 53070924e1f9904c6e6c40d0a96cb1736cd3a38f Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:30:54 +0100 Subject: [PATCH 1/2] Nerf --- code/__DEFINES/traits.dm | 1 + yogstation/code/game/gamemodes/shadowling/shadowling.dm | 2 +- .../antagonists/shadowling/special_shadowling_abilities.dm | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index bcfdfb97bfc0..06c30e6a60fb 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -327,6 +327,7 @@ #define RANDOM_BLACKOUTS "random_blackouts" #define MADE_UNCLONEABLE "made-uncloneable" #define BLOODSUCKER_TRAIT "bloodsucker_trait" +#define SHADOWLING_TRAIT "shadowling_trait" #define FRENZY_TRAIT "frenzy_trait" #define HORROR_TRAIT "horror" #define HOLDER_TRAIT "holder_trait" diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm index 06619935a634..271118675904 100644 --- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm +++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm @@ -212,7 +212,7 @@ Made by Xhuis if(light_amount > LIGHT_DAM_THRESHOLD) C.remove_movespeed_modifier(id) else - C.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) + C.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) /datum/species/shadow/ling/lesser //Empowered thralls. Obvious, but powerful diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index 084a144b1abd..fd41f75a01a7 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -97,6 +97,8 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(H), SLOT_WEAR_SUIT) H.equip_to_slot_or_del(new /obj/item/clothing/head/shadowling(H), SLOT_HEAD) H.set_species(/datum/species/shadow/ling) //can't be a shadowling without being a shadowling + H.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE) + ADD_TRAIT(H, TRAIT_GENELESS, SHADOWLING_TRAIT) H.mind.RemoveSpell(src) if(!do_mob(H,H,10,1)) return From 5e347d89686f8e3e33d61dfce62cd3ed5fda6801 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun, 26 Jun 2022 14:24:44 +0100 Subject: [PATCH 2/2] Makes Less Cringe --- code/__DEFINES/traits.dm | 1 - .../mob/living/carbon/human/species_types/shadowpeople.dm | 4 ++-- .../antagonists/shadowling/special_shadowling_abilities.dm | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 06c30e6a60fb..bcfdfb97bfc0 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -327,7 +327,6 @@ #define RANDOM_BLACKOUTS "random_blackouts" #define MADE_UNCLONEABLE "made-uncloneable" #define BLOODSUCKER_TRAIT "bloodsucker_trait" -#define SHADOWLING_TRAIT "shadowling_trait" #define FRENZY_TRAIT "frenzy_trait" #define HORROR_TRAIT "horror" #define HOLDER_TRAIT "holder_trait" diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 4d986a5ea931..dbb652e4f475 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -8,8 +8,8 @@ sexes = 0 ignored_by = list(/mob/living/simple_animal/hostile/faithless) meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow - species_traits = list(NOBLOOD,NOEYESPRITES,NOFLASH) - inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH) + species_traits = list(NOBLOOD,NOEYESPRITES,NOFLASH,) + inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,TRAIT_GENELESS) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC mutanteyes = /obj/item/organ/eyes/night_vision diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index fd41f75a01a7..9d9093166253 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -98,7 +98,6 @@ H.equip_to_slot_or_del(new /obj/item/clothing/head/shadowling(H), SLOT_HEAD) H.set_species(/datum/species/shadow/ling) //can't be a shadowling without being a shadowling H.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE) - ADD_TRAIT(H, TRAIT_GENELESS, SHADOWLING_TRAIT) H.mind.RemoveSpell(src) if(!do_mob(H,H,10,1)) return