From c8d666cd34ed9a3be3ebe7d8f327c9532aaeaeb1 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 17 Jul 2020 00:21:59 -0500 Subject: [PATCH 1/5] Revert "DNC weirdness" This reverts commit 49ac30a0b42019b1885016d00d1b0d0c1f8f39b9. --- code/__DEFINES/traits.dm | 2 +- code/datums/traits/negative.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index d1c74674..ab191aa3 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -161,7 +161,7 @@ #define TRAIT_XRAY_VISION "xray_vision" #define TRAIT_THERMAL_VISION "thermal_vision" #define TRAIT_CUM_PLUS "cum_plus" -#define TRAIT_NEVER_CLONE "donotclone" +#define TRAIT_NEVER_CLONE "noclone" // common trait sources diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index a690c63f..5bcf6f32 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -368,7 +368,7 @@ medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." //Port from Shadow -/datum/quirk/donotclone +/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 From 05acfc1f72fe1022c301ed41f6e1a9dd987d1946 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 17 Jul 2020 00:22:23 -0500 Subject: [PATCH 2/5] Revert "Do Not Clone" This reverts commit 3c572f0d6e9c2b0b40a860c35dcec8077097c353. --- code/__DEFINES/traits.dm | 3 +-- code/datums/traits/negative.dm | 8 -------- code/game/machinery/computer/cloning.dm | 4 ---- hyperstation/code/modules/traits.dm | 3 ++- 4 files changed, 3 insertions(+), 15 deletions(-) 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." From 546f3a993ca116195d442229490c5eb4b07fe120 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 17 Jul 2020 16:26:32 -0500 Subject: [PATCH 3/5] Revert "Revert "Do Not Clone"" This reverts commit 05acfc1f72fe1022c301ed41f6e1a9dd987d1946. --- code/__DEFINES/traits.dm | 3 ++- code/datums/traits/negative.dm | 8 ++++++++ code/game/machinery/computer/cloning.dm | 4 ++++ hyperstation/code/modules/traits.dm | 3 +-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index ca35177d..ab191aa3 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -160,7 +160,8 @@ #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_CUM_PLUS "cum_plus" +#define TRAIT_NEVER_CLONE "noclone" // common trait sources diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 5ca3ba4e..5bcf6f32 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -366,3 +366,11 @@ 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 039152f5..05486a4c 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -449,6 +449,10 @@ 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 136e0892..f3407352 100644 --- a/hyperstation/code/modules/traits.dm +++ b/hyperstation/code/modules/traits.dm @@ -1,7 +1,6 @@ -#define TRAIT_CUM_PLUS "cum_plus" -//Jay - Coooooom +//Jay Sparrow /datum/quirk/cum_plus name = "Extra productive genitals" desc = "Your lower bits produce more and hold more than normal." From af4bf42d013f5316db030a577208adf030f51612 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 17 Jul 2020 16:26:37 -0500 Subject: [PATCH 4/5] Revert "Revert "DNC weirdness"" This reverts commit c8d666cd34ed9a3be3ebe7d8f327c9532aaeaeb1. --- code/__DEFINES/traits.dm | 2 +- code/datums/traits/negative.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index ab191aa3..d1c74674 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -161,7 +161,7 @@ #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_NEVER_CLONE "donotclone" // common trait sources diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 5bcf6f32..a690c63f 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -368,7 +368,7 @@ medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." //Port from Shadow -/datum/quirk/noclone +/datum/quirk/donotclone 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 From e5592937aabcd2bae7d9c30d3405cc8488223c79 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 17 Jul 2020 17:14:01 -0500 Subject: [PATCH 5/5] Cloning fix Clone pod works more than once, and resizes characters --- code/game/machinery/cloning.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e3c2cfd3..2dd1735e 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -204,8 +204,6 @@ H.give_genitals(TRUE) H.suiciding = FALSE - H.custom_body_size = H.client.prefs.body_size - //H.size_multiplier = (max(min( round((H.custom_body_size)), MAX_BODYSIZE),MIN_BODYSIZE)* 0.01) //Not working dont know why. attempting = FALSE return TRUE @@ -382,6 +380,10 @@ qdel(fl) unattached_flesh.Cut() + //Do the resize on ejection. The clone pod seems to do a lot of matrix transforms the way size code does, so we will handle our resize after. + mob_occupant.previous_size = 1 //Set the previous size to default so the resize properly set health and speed. + mob_occupant.custom_body_size = mob_occupant.client.prefs.body_size + mob_occupant.resize(mob_occupant.custom_body_size * 0.01) occupant = null /obj/machinery/clonepod/proc/malfunction()