Merge branch 'master' into cit_mood

Handled Conflict with tgstation.dme

modular_citadel/code/datums/components/material_container.dm

@@ -0,0 +1,4 @@
+/datum/material/plastic
+	name = "Plastic"
+	id = MAT_PLASTIC
+	sheet_type = /obj/item/stack/sheet/plastic

modular_citadel/code/datums/status_effects/debuffs.dm

@@ -0,0 +1,13 @@
+/datum/status_effect/incapacitating/knockdown/on_creation(mob/living/new_owner, set_duration, updating_canmove)
+	if(iscarbon(new_owner) && isnum(set_duration))
+		new_owner.resting = TRUE
+		new_owner.adjustStaminaLoss(set_duration*0.25)
+		if(set_duration > 80)
+			set_duration = set_duration*0.15
+			. = ..()
+			return
+		else if(updating_canmove)
+			new_owner.update_canmove()
+		qdel(src)
+	else
+		. = ..()