diff --git a/code/defines/mob/living/living.dm b/code/defines/mob/living/living.dm index 3badf77ed34..03d77d4670b 100644 --- a/code/defines/mob/living/living.dm +++ b/code/defines/mob/living/living.dm @@ -4,4 +4,5 @@ var/t_sl_gas = null var/t_n2 = null var/now_pushing = null - var/cameraFollow = null \ No newline at end of file + var/cameraFollow = null + var/age = null \ No newline at end of file diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 82074ad7aa5..5d2f6842a5d 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -6,18 +6,6 @@ var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble -/obj/machinery/computer/operating - name = "Operating Computer" - density = 1 - anchored = 1.0 - desc = "Used to monitor status of people being operated on." - icon_state = "operating" - circuit = "/obj/item/weapon/circuitboard/operating" - var/mob/living/carbon/human/victim = null - var/obj/machinery/optable/table = null - var/id = 0.0 - - /obj/machinery/computer/arcade name = "arcade machine" desc = "Does not support Pinball." diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 8b37e8f6eef..52ca6d1471b 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,3 +1,14 @@ +/obj/machinery/computer/operating + name = "Operating Computer" + density = 1 + anchored = 1.0 + desc = "Used to monitor status of people being operated on." + icon_state = "operating" + circuit = "/obj/item/weapon/circuitboard/operating" + var/mob/living/carbon/human/victim = null + var/obj/machinery/optable/table = null + var/id = 0.0 + /obj/machinery/computer/operating/New() ..() for(var/obj/machinery/optable/O in world) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index eb9cdd72bdd..b7c3e807228 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -20,7 +20,7 @@ var/g_eyes = 0.0 var/b_eyes = 0.0 var/s_tone = 0.0 - var/age = 30.0 + age = 30.0 var/used_skillpoints = 0 var/skill_specialization = null var/list/skills = null