Merge remote-tracking branch 'upstream/master'

modular_sand/code/datums/traits/negative.dm

@@ -15,3 +15,10 @@
 /datum/quirk/sheltered/remove() //i mean, the lose text explains it, so i'm making it actually work
 	var/mob/living/carbon/human/H = quirk_holder
 	H.grant_language(/datum/language/common)
+
+/datum/quirk/dnc_order
+	name = "DNC Order"
+	desc = "You have a Do Not Clone order on your record, stating that you may not be cloned. You can still be revived by other means."
+	value = -2
+	mob_trait = TRAIT_DNC_ORDER
+	medical_record_text = "Patient has a DNC (Do Not Clone) order and will be rejected by cloning mechanisms as a result."

modular_sand/code/game/machinery/computer/cloning.dm

@@ -0,0 +1,15 @@
+// Proc for scanning a mob in a cloning machine
+/obj/machinery/computer/cloning/can_scan(datum/dna/dna, mob/living/mob_occupant, experimental = FALSE, datum/bank_account/account)
+	// Check for DNC Order quirk
+	if(HAS_TRAIT(mob_occupant, TRAIT_DNC_ORDER))
+		// Set scan failure reason
+		scantemp = "Subject has an active DNC order on file. Further operations terminated."
+
+		// Play error sound
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+		// Return without scanning
+		return
+
+	// Return normally
+	. = ..()