From e633d9f6cee2d661f53da7238a8fd5d517879219 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 29 Aug 2021 15:42:10 -0400 Subject: [PATCH 1/2] removes a little prick --- .../gamemodes/changeling/powers/tiny_prick.dm | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 14d93439510..09702c97d3c 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -66,60 +66,6 @@ add_attack_logs(user, target, "Unsuccessful sting (changeling)") return 1 -/datum/action/changeling/sting/transformation - name = "Transformation Sting" - desc = "We silently sting a human, injecting a retrovirus that forces them to transform. Costs 50 chemicals." - helptext = "The victim will transform much like a changeling would. The effects will be obvious to the victim, and the process will damage our genomes." - button_icon_state = "sting_transform" - sting_icon = "sting_transform" - chemical_cost = 50 - dna_cost = 3 - genetic_damage = 100 - var/datum/dna/selected_dna = null - -/datum/action/changeling/sting/transformation/Trigger() - var/mob/user = usr - var/datum/changeling/changeling = user.mind.changeling - if(changeling.chosen_sting) - unset_sting(user) - return - selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") - if(!selected_dna) - return - if((NOTRANSSTING in selected_dna.species.species_traits) || selected_dna.species.is_small) - to_chat(user, "The selected DNA is incompatible with our sting.") - return - ..() - -/datum/action/changeling/sting/transformation/can_sting(mob/user, mob/target) - if(!..()) - return - if(HAS_TRAIT(target, TRAIT_HUSK) || !ishuman(target) || (NOTRANSSTING in target.dna.species.species_traits)) - to_chat(user, "Our sting appears ineffective against its DNA.") - return FALSE - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(HAS_TRAIT(H, TRAIT_GENELESS)) - to_chat(user, "This won't work on a creature without DNA.") - return FALSE - return TRUE - -/datum/action/changeling/sting/transformation/sting_action(mob/user, mob/target) - add_attack_logs(user, target, "Transformation sting (changeling) (new identity is [selected_dna.real_name])") - if(issmall(target)) - to_chat(user, "Our genes cry out as we sting [target.name]!") - - if(iscarbon(target) && (target.status_flags & CANWEAKEN)) - var/mob/living/carbon/C = target - C.do_jitter_animation(500) - - target.visible_message("[target] begins to violenty convulse!","You feel a tiny prick and a begin to uncontrollably convulse!") - - spawn(10) - transform_dna(target,selected_dna)//target is always human so no problem here - SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) - return TRUE - /datum/action/changeling/sting/extract_dna name = "Extract DNA Sting" desc = "We stealthily sting a target and extract their DNA. Costs 25 chemicals." From 34bf1a5fe8d034bbde13a8a47709e09adcde163b Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed, 1 Sep 2021 13:27:28 -0400 Subject: [PATCH 2/2] Removes notranssting flag --- code/__DEFINES/genetics.dm | 1 - code/modules/mob/living/carbon/human/species/machine.dm | 2 +- code/modules/mob/living/carbon/human/species/plasmaman.dm | 2 +- code/modules/mob/living/carbon/human/species/vox.dm | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index f64022136ef..55701ed9166 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -74,7 +74,6 @@ //Species traits. #define NO_BLOOD "no_blood" -#define NOTRANSSTING "no_trans_sting" #define IS_WHITELISTED "whitelisted" #define LIPS "lips" #define EXOTIC_COLOR "exotic_blood_color" diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 963b878a758..43c0931f96b 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -21,7 +21,7 @@ death_message = "gives a short series of shrill beeps, their chassis shuddering before falling limp, nonfunctional." death_sounds = list('sound/voice/borg_deathsound.ogg') //I've made this a list in the event we add more sounds for dead robots. - species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_CLONESCAN, NO_INTORGANS, NOTRANSSTING) + species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_CLONESCAN, NO_INTORGANS) inherent_traits = list(TRAIT_VIRUSIMMUNE, TRAIT_NOBREATH, TRAIT_RADIMMUNE, TRAIT_NOGERMS, TRAIT_NODECAY, TRAIT_NOPAIN, TRAIT_GENELESS) //Computers that don't decay? What a lie! inherent_biotypes = MOB_ROBOTIC | MOB_HUMANOID clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 926ed17348e..4a49b965fb8 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -5,7 +5,7 @@ dangerous_existence = TRUE //So so much //language = "Clatter" - species_traits = list(IS_WHITELISTED, NO_BLOOD, NOTRANSSTING, NO_HAIR) + species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_HAIR) inherent_traits = list(TRAIT_RADIMMUNE, TRAIT_NOHUNGER) inherent_biotypes = MOB_HUMANOID | MOB_MINERAL forced_heartattack = TRUE // Plasmamen have no blood, but they should still get heart-attacks diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index f4ccced8fd8..ee4046314d3 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -22,7 +22,7 @@ eyes = "vox_eyes_s" - species_traits = list(NO_CLONESCAN, IS_WHITELISTED, NOTRANSSTING) + species_traits = list(NO_CLONESCAN, IS_WHITELISTED) inherent_traits = list(TRAIT_NOGERMS, TRAIT_NODECAY) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS //Species-fitted 'em all. dietflags = DIET_OMNI