From d258a476f8086584555320572d00237b54dca5a3 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Thu, 26 Feb 2015 16:37:27 -0500 Subject: [PATCH 1/3] Adds paramedic to the medical category. Fixes #8255 --- code/game/jobs/jobs.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index e1c42254a65..135da6bb606 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -72,7 +72,8 @@ var/list/medical_positions = list( "Medical Doctor", "Geneticist", "Psychiatrist", - "Chemist" + "Chemist", + "Paramedic" ) From 14f76324b963daca76878d260abb02b8da81336f Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 27 Feb 2015 17:18:47 -0500 Subject: [PATCH 2/3] Fixes #8231. Adds on_hear_radio proc for observers to add tracking. --- code/modules/mob/hear_say.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 8b39a00aa55..e5e91c4bdc7 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -199,6 +199,9 @@ /mob/proc/on_hear_radio(part_a, speaker_name, track, part_b, formatted) src << "[part_a][speaker_name][part_b][formatted]" +/mob/dead/observer/on_hear_radio(part_a, speaker_name, track, part_b, formatted) + src << "[part_a][track][part_b][formatted]" + /mob/living/silicon/on_hear_radio(part_a, speaker_name, track, part_b, formatted) var/time = say_timestamp() src << "[time][part_a][speaker_name][part_b][formatted]" From 5d2f492386317d577e35825af9a906b707686163 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 27 Feb 2015 18:09:09 -0500 Subject: [PATCH 3/3] Fixes #8265. Moves the print report link being added to the window to after the data is saved for printing. --- code/modules/hydroponics/trays/tray_tools.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index cd7d0daf9a9..64e0fe43694 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -198,10 +198,10 @@ if(grown_seed.get_trait(TRAIT_TELEPORTING)) dat += "
The fruit is temporal/spatially unstable." - dat += "

\[print report\]" if(dat) - user << browse(dat,"window=plant_analyzer") last_data = dat + dat += "

\[print report\]" + user << browse(dat,"window=plant_analyzer") return