From 122b21d0acfcb87ff8aabe5e5ef143594d99517b Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 20 Jul 2022 19:56:57 -0500 Subject: [PATCH] Remove deprecated cloning code (#68555) * Remove deprecated cloning code, makeUncloneable() proc and some cloning defines. --- code/__DEFINES/traits.dm | 4 +--- code/modules/mob/living/carbon/human/death.dm | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 5f93764d4b6..0f0c3aa1b6b 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -371,7 +371,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_SPRAY_PAINTABLE "spray_paintable" /// This person is blushing #define TRAIT_BLUSHING "blushing" -/// For simple mobs controlled by a player. Sends a death alert in deadchat (used by space dragons, morphs, revenants, elite lavaland mobs, brood spiders) +/// For simple mobs controlled by a player. Sends a death alert in deadchat (used by space dragons, morphs, revenants, elite lavaland mobs, brood spiders) #define TRAIT_ALERT_GHOSTS_ON_DEATH "trait_alert_ghosts_on_death" #define TRAIT_NOBLEED "nobleed" //This carbon doesn't bleed /// This atom can ignore the "is on a turf" check for simple AI datum attacks, allowing them to attack from bags or lockers as long as any other conditions are met @@ -729,7 +729,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define CURRENTLY_CLEANING "currently_cleaning" // unique trait sources, still defines -#define CLONING_POD_TRAIT "cloning-pod" #define STATUE_MUTE "statue" #define CHANGELING_DRAIN "drain" #define ABYSSAL_GAZE_BLIND "abyssal_gaze" @@ -765,7 +764,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define LOCKED_HELMET_TRAIT "locked-helmet" #define NINJA_SUIT_TRAIT "ninja-suit" #define SLEEPING_CARP_TRAIT "sleeping_carp" -#define MADE_UNCLONEABLE "made-uncloneable" #define TIMESTOP_TRAIT "timestop" #define LIFECANDLE_TRAIT "lifecandle" #define VENTCRAWLING_TRAIT "ventcrawling" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 8df10e8798d..98ee19b4bc5 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -44,14 +44,8 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) set_species(/datum/species/skeleton) return TRUE - /mob/living/carbon/proc/Drain() become_husk(CHANGELING_DRAIN) ADD_TRAIT(src, TRAIT_BADDNA, CHANGELING_DRAIN) blood_volume = 0 return TRUE - -/mob/living/carbon/proc/makeUncloneable() - ADD_TRAIT(src, TRAIT_BADDNA, MADE_UNCLONEABLE) - blood_volume = 0 - return TRUE