diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index ab191aa3..ca35177d 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -160,8 +160,7 @@ #define TRAIT_CULT_EYES "cult_eyes" #define TRAIT_XRAY_VISION "xray_vision" #define TRAIT_THERMAL_VISION "thermal_vision" -#define TRAIT_CUM_PLUS "cum_plus" -#define TRAIT_NEVER_CLONE "noclone" +//#define TRAIT_CUM_PLUS "cum_plus" // common trait sources diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 5bcf6f32..5ca3ba4e 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -366,11 +366,3 @@ gain_text = "There's a lot on your mind right now." lose_text = "Your mind finally feels calm." medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." - -//Port from Shadow -/datum/quirk/noclone - name = "DNC" - desc = "You have filed a Do Not Clone order, stating that you do not wish to be cloned. You can still be revived by other means." - value = -2 - mob_trait = TRAIT_NEVER_CLONE - medical_record_text = "Patient has a DNC (Do not clone) order on file, and cannot be cloned as a result." \ No newline at end of file diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 05486a4c..039152f5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -449,10 +449,6 @@ var/mob/living/brain/B = mob_occupant dna = B.stored_dna - if(HAS_TRAIT(mob_occupant, TRAIT_NEVER_CLONE)) - scantemp = "Subject has an active DNC record on file. Unable to clone." - playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) - return if(!istype(dna)) scantemp = "Unable to locate valid genetic data." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) diff --git a/hyperstation/code/modules/traits.dm b/hyperstation/code/modules/traits.dm index f3407352..136e0892 100644 --- a/hyperstation/code/modules/traits.dm +++ b/hyperstation/code/modules/traits.dm @@ -1,6 +1,7 @@ +#define TRAIT_CUM_PLUS "cum_plus" -//Jay Sparrow +//Jay - Coooooom /datum/quirk/cum_plus name = "Extra productive genitals" desc = "Your lower bits produce more and hold more than normal."