Merge branch 'surgery'

code/modules/mob/living/carbon/carbon_defines.dm

@@ -2,12 +2,6 @@
 	gender = MALE
 	var/list/stomach_contents = list()
 	var/brain_op_stage = 0.0
-	var/ribcage_op_stage = 0
-	var/alien_op_stage = 0.0
-/*
-	var/eye_op_stage = 0.0
-	var/appendix_op_stage = 0.0
-*/
 	var/datum/disease2/disease/virus2 = null
 	var/list/datum/disease2/disease/resistances2 = list()
 	var/antibodies = 0
@@ -22,3 +16,5 @@
 	var/number_wounds = 0
 	var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
 	var/obj/item/legcuffed = null  //Same as handcuffs but for legs. Bear traps use this.
+	//Surgery info
+	var/datum/surgery_status/op_stage = new/datum/surgery_status