Merge remote-tracking branch 'upstream/master' into radiance

code/__DEFINES/citadel_defines.dm

@@ -69,9 +69,10 @@
 #define BREASTS_SIZE_HUGE		16
 #define BREASTS_SIZE_MASSIVE		17
 #define BREASTS_SIZE_GIGA		25
+
 //Bodysize Limits
-#define MIN_BODYSIZE		80
-#define MAX_BODYSIZE		120
+#define MIN_BODYSIZE		50
+#define MAX_BODYSIZE		150
 
 #define BREASTS_SIZE_MIN 	BREASTS_SIZE_A
 #define BREASTS_SIZE_DEF	BREASTS_SIZE_D

code/__DEFINES/traits.dm

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

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

code/game/objects/items/plushes.dm

@@ -558,6 +558,13 @@
 	item_state = "almaz"
 	squeak_override = list('modular_citadel/sound/voice/raptor_purr.ogg' = 1)
 
+/obj/item/toy/plush/lizardplushie/malric
+	desc = "An adorable stuffed toy that resembles a certain drake. He looks tired."
+	icon_state = "malric"
+	item_state = "malric"
+	attack_verb = list("depressed", "tailwhipped", "hissed on")
+	squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1)
+
 /obj/item/toy/plush/snakeplushie
 	name = "snake plushie"
 	desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."