Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13

code/modules/mob/living/living.dm

@@ -339,7 +339,7 @@
 		death()
 
 
-/mob/living/incapacitated(ignore_restraints, ignore_grab, ignore_stasis)
+/mob/living/incapacitated(ignore_restraints, ignore_grab)
 	if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
 		return TRUE
 
@@ -603,7 +603,7 @@
 		..(pressure_difference, direction, pressure_resistance_prob_delta)
 
 /mob/living/can_resist()
-	return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE, ignore_stasis= TRUE))
+	return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE))
 
 /mob/living/verb/resist()
 	set name = "Resist"
@@ -1011,8 +1011,6 @@
 	var/has_legs = get_num_legs()
 	var/has_arms = get_num_arms()
 	var/ignore_legs = get_leg_ignore()
-	var/in_stasis = IsInStasis()
-	var/canmove = !buckled && (pulledby) && !chokehold && !IsFrozen() && !in_stasis && (has_arms || ignore_legs || has_legs)
 	var/pinned = resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground
 	if(ko || move_and_fall || IsStun() || chokehold) // Cit change - makes resting not force you to drop everything
 		drop_all_held_items()

code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm

@@ -65,6 +65,15 @@
 ///Medical//
 ////////////
 
+
+/datum/design/medkit
+	name = "Medkit Cabinent"
+	id = "medkit_cabinet"
+	build_type = AUTOLATHE | PROTOLATHE
+	materials = list(MAT_METAL = 4000)
+	build_path = /obj/item/wallframe/medkit_cabinet
+	category = list("initial", "Medical")
+
 /datum/design/scalpel
 	name = "Scalpel"
 	id = "scalpel"

code/modules/research/techweb/all_nodes.dm

@@ -11,7 +11,7 @@
 	design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani",
 	"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
 	"space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal",
-	"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack")
+	"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinet")
 
 /datum/techweb_node/mmi
 	id = "mmi"