Merge pull request #300 from Jay-Sparrow/No-clone

Do Not Clone

code/__DEFINES/traits.dm

@@ -161,7 +161,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

code/datums/traits/negative.dm

@@ -366,3 +366,11 @@
 	gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	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."

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 = "<font class='bad'>Subject has an active DNC record on file. Unable to clone.</font>"
+		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+		return
 	if(!istype(dna))
 		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)

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."