Surgery holosign, operating table console and stethoscope improvements

code/__HELPERS/global_lists.dm

@@ -131,6 +131,7 @@ var/list/vehicle_list = list()
 var/list/paicard_list = list()
 var/list/effects_list = list()
 var/list/laser_pointers_list = list()
+var/list/obj/machinery/optable/optable_list = list()
 var/list/obj/structure/morgue/morgue_list = list()
 var/list/obj/effect/time_anomaly/time_anomaly_list = list()
 var/list/map_pickspawners = list()

code/game/machinery/OpTable.dm

@@ -14,16 +14,30 @@
 	var/rating = 1 //Use this for upgrades some day
 	pass_flags_self = PASSTABLE
 	var/obj/machinery/computer/operating/computer = null
+	var/pulsing = FALSE
 
 /obj/machinery/optable/New()
 	..()
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-		computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
-		if (computer)
-			break
+	optable_list += src
+	updatemodules()
 //	spawn(100) //Wont the MC just call this process() before and at the 10 second mark anyway?
 //		process()
 
+/obj/machinery/optable/Destroy()
+	optable_list -= src
+	..()
+
+/obj/machinery/optable/proc/updatemodules()
+	computer = find_computer()
+	if(computer && !computer.optable)
+		computer.optable = src
+
+/obj/machinery/optable/proc/find_computer()
+	for(dir in cardinal)
+		. = locate(/obj/machinery/computer/operating) in get_step(src, dir)
+		if (.)
+			break
+
 /obj/machinery/optable/ex_act(severity)
 
 	switch(severity)
@@ -93,23 +107,41 @@
 	take_victim(L, user)
 	return
 
+/obj/machinery/optable/proc/flatline(mob/user, body_destroyed)
+	if(user == victim && victim.loc == src.loc && victim.lying)
+		if(computer)
+			playsound(computer.loc, 'sound/machines/Flatline.ogg', 50)
+			computer.icon_state = "operating-dead"
+		icon_state = "table2-idle"
+
 /obj/machinery/optable/proc/check_victim()
+	updatemodules()
 	if (victim)
 		if (victim.loc == src.loc)
 			if (victim.lying)
-				if (victim.pulse)
-					icon_state = "table2-active"
-				else
-					icon_state = "table2-idle"
-
 				return 1
 
 		victim.reset_view()
+		victim.unregister_event(/event/death, src, nameof(src::flatline()))
 		victim = null
+		update()
 
+	if(computer)
+		computer.icon_state = "operating"
 	icon_state = "table2-idle"
 	return 0
 
+/obj/machinery/optable/proc/update()
+	var/area/this_area = get_area(src)
+	for(var/obj/machinery/holosign/surgery/sign in holosigns)
+		var/area/sign_area = get_area(sign)
+		if(this_area != sign_area)
+			continue
+		if(sign.should_update)
+			continue
+		sign.should_update = TRUE
+		processing_objects += sign
+
 /obj/machinery/optable/process()
 	check_victim()
 
@@ -140,6 +172,7 @@
 		victim = C
 		C.resting = 1 //This probably shouldn't be using this variable
 		C.update_canmove() //but for as long as it does we're adding sanity to it
+		C.register_event(/event/death, src, nameof(src::flatline()))
 
 	if (C == user)
 		user.visible_message("[user] climbs on the operating table.","You climb on the operating table.")
@@ -148,6 +181,21 @@
 
 	add_fingerprint(user)
 
+	update()
+
+	spawn()
+		if(!pulsing)
+			while(victim.loc == src.loc && victim.lying && victim.pulse != PULSE_NONE && victim.stat != DEAD && !victim.timestopped)
+				pulsing = TRUE
+				var/pulsespeed = victim.get_pulsespeed()
+				if(pulsespeed)
+					if(computer)
+						playsound(computer.loc, 'sound/machines/Heartbeat.ogg', 50)
+						computer.icon_state = "operating-living"
+					icon_state = "table2-active"
+					sleep(max(1,pulsespeed))
+			pulsing = FALSE
+
 /obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
 	if(W.is_wrench(user))
 		W.playtoolsound(src, 50)

code/game/machinery/computer/Operating.dm

@@ -16,28 +16,21 @@
 	..()
 	spawn(5)
 		updatemodules()
-		return
-	return
 
 /obj/machinery/computer/operating/proc/updatemodules()
-	src.optable = findoptable()
+	optable = findoptable()
+	if(optable && !optable.computer)
+		optable.computer = src
 
 /obj/machinery/computer/operating/proc/findoptable()
-	var/obj/machinery/optable/optablef = null
-
 	// Loop through every direction
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-
+	for(dir in cardinal)
 		// Try to find a scanner in that direction
-		optablef = locate(/obj/machinery/optable, get_step(src, dir))
-
+		. = locate(/obj/machinery/optable) in get_step(src, dir)
 		// If found, then we break, and return the scanner
-		if (!isnull(optablef))
+		if (.)
 			break
 
-	// If no scanner was found, it will return null
-	return optablef
-
 /obj/machinery/computer/operating/attack_paw(user as mob)
 	return attack_hand(user)
 
@@ -91,15 +84,5 @@
 /obj/machinery/computer/operating/process()
 	if(..())
 		src.updateDialog()
-	update_icon()
-
-/obj/machinery/computer/operating/update_icon()
-	..()
 	if(!(stat & (FORCEDISABLE |BROKEN | NOPOWER)))
 		updatemodules()
-		if(!isnull(src.optable) && (src.optable.check_victim()))
-			src.victim = src.optable.victim
-			if(victim.stat == DEAD)
-				icon_state = "operating-dead"
-			else
-				icon_state = "operating-living"

code/game/machinery/holosign.dm

@@ -14,6 +14,7 @@ var/list/obj/machinery/holosign/holosigns = list()
 	var/lit = 0
 	var/on_icon = ""
 	var/image/overlay
+	var/should_update = FALSE
 
 	light_color = "#6496FA"
 
@@ -60,6 +61,21 @@ var/list/obj/machinery/holosign/holosigns = list()
 	on_icon = "surgery"
 	id_tag = "surgery"
 
+/obj/machinery/holosign/surgery/process()
+	var/area/this_area = get_area(src)
+	for(var/obj/machinery/optable/OT in optable_list)
+		var/area/optable_area = get_area(OT)
+		if(optable_area != this_area)
+			continue
+		if(OT.victim)
+			toggle(TRUE)
+			should_update = FALSE
+			return PROCESS_KILL
+	if(lit < 2)
+		toggle(FALSE)
+		should_update = FALSE
+	return PROCESS_KILL
+
 /obj/machinery/holosign/virology
 	name = "virology holosign"
 	desc = "Small wall-mounted holographic projector. This one reads BIOHAZARD."
@@ -72,7 +88,6 @@ var/list/obj/machinery/holosign/holosigns = list()
 	desc = "Small wall-mounted holographic projector. This one reads MORGUE."
 	on_icon = "morgue"
 	id_tag = "morgue"
-	var/should_update = FALSE
 
 /obj/machinery/holosign/morgue/process()
 	var/area/this_area = get_area(src)
@@ -136,7 +151,7 @@ var/list/obj/machinery/holosign/holosigns = list()
 
 	for(var/obj/machinery/holosign/M in holosigns)
 		if (M.id_tag == src.id_tag)
-			M.toggle(active)
+			M.toggle(active*2)
 
 /obj/machinery/holosign_switch/attack_ghost(var/mob/dead/observer/ghost)
 	if(!can_spook())

code/modules/clothing/accessories/accessory.dm

@@ -185,43 +185,41 @@
 	origin_tech = Tc_BIOTECH + "=1"
 	restraint_resist_time = 30 SECONDS
 	toolsounds = list("rustle")
+	var/listening = FALSE
 
 /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
 	if(ishuman(M) && isliving(user))
 		if(user.a_intent == I_HELP)
 			var/body_part = parse_zone(user.zone_sel.selecting)
 			if(body_part)
-				var/their = "their"
-				switch(M.gender)
-					if(MALE)
-						their = "his"
-					if(FEMALE)
-						their = "her"
-
 				var/sound = "pulse"
 				var/sound_strength
 
-				if(M.isDead())
+				if(M.isDead() || body_part == "eyes" || body_part == "mouth")
 					sound_strength = "cannot hear"
 					sound = "anything"
 				else
 					sound_strength = "hear a weak"
-					switch(body_part)
-						if(LIMB_CHEST)
-							if(M.oxyloss < 50)
-								sound_strength = "hear a healthy"
+					if(body_part == LIMB_CHEST)
+						if(M.oxyloss < 50)
+							sound_strength = "hear a healthy"
+						if(!(M_NO_BREATH in M.mutations))
 							sound = "pulse and respiration"
-						if("eyes","mouth")
-							sound_strength = "cannot hear"
-							sound = "anything"
-						else
-							sound_strength = "hear a weak"
 
-				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].")
+				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [M]'s [body_part]. You [sound_strength] [sound].")
+
+				spawn()
+					if(!listening)
+						while(M.pulse != PULSE_NONE && loc == user && M.Adjacent(user) && !M.timestopped)
+							listening = TRUE
+							var/pulsespeed = M.get_pulsespeed()
+							if(pulsespeed)
+								to_chat(user,"*thump*")
+								sleep(max(1,pulsespeed))
+						listening = FALSE
 				return
 	return ..(M,user)
 
-
 //Medals
 /obj/item/clothing/accessory/medal
 	name = "bronze medal"

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

@@ -439,6 +439,31 @@
 		temp += rand(-10, 10)
 	return num2text(round(temp))
 
+/mob/living/carbon/proc/get_pulsespeed()
+	. = 600
+	switch(src.pulse)
+		if(PULSE_NONE)
+			. = 0
+		if(PULSE_2SLOW)
+			. /= (30 + sin(life_tick / 2) * 10)
+		if(PULSE_SLOW)
+			. /= (50 + sin(life_tick / 2) * 10)
+		if(PULSE_NORM)
+			. /= (75 + sin(life_tick / 2) * 15)
+		if(PULSE_FAST)
+			. /= (105 + sin(life_tick / 2) * 15)
+		if(PULSE_2FAST)
+			. /= (140 + sin(life_tick / 2) * 20)
+		if(PULSE_THREADY)
+			. = 2
+
+/*/mob/living/carbon/proc/pulse_loop() // commented out because not used beyond fluff, was requested
+	while(pulse != PULSE_NONE)
+		var/pulsespeed = get_pulsespeed()
+		if(pulsespeed && !timestopped)
+			INVOKE_EVENT(src, /event/heartbeat, "user" = src)
+		sleep(max(1,pulsespeed))*/
+
 /mob/living/carbon/verb/mob_sleep()
 	set name = "Sleep"
 	set category = "IC"

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

@@ -35,6 +35,8 @@
 	..()
 	hud_list[CONVERSION_HUD] = new/image/hud('icons/mob/hud.dmi', src, "hudblank")
 	register_event(/event/after_move, src, /mob/living/carbon/proc/update_holomaps)
+	//spawn()
+		//pulse_loop()
 
 /mob/living/carbon/Destroy()
 	unregister_event(/event/after_move, src, /mob/living/carbon/proc/update_holomaps)

code/modules/mob/living/carbon/human/life.dm

@@ -185,6 +185,7 @@ var/global/list/organ_damage_overlays = list(
 	update_canmove()
 	//Update our name based on whether our face is obscured/disfigured
 	handle_regular_hud_updates()
+	//var/oldpulse = pulse
 	pulse = handle_pulse()
 	for(var/obj/item/weapon/grab/G in src)
 		G.process()
@@ -194,6 +195,9 @@ var/global/list/organ_damage_overlays = list(
 		UpdateDamageIcon()
 	cycle++
 	..()
+	//if(oldpulse == PULSE_NONE && pulse != PULSE_NONE)
+		//spawn()
+			//pulse_loop() //restart this if pulse comes back
 
 //Need this in species.
 //#undef HUMAN_MAX_OXYLOSS