diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index f43e2622..55cb460e 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -36,14 +36,44 @@
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
return 1
+/datum/job/emt
+ title = "Emergency Medical Technician"
+ flag = EMT
+ department_flag = MEDSCI
+ faction = "Station"
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "the chief medical officer"
+ selection_color = "#ffeef0"
+ access = list(access_medical, access_morgue, access_chemistry, access_genetics,access_maint_tunnels, access_external_airlocks)
+ minimal_access = list(access_medical, access_morgue, access_maint_tunnels, access_external_airlocks)
+ alt_titles = list("Paramedic")
+ equip(var/mob/living/carbon/human/H)
+ if(!H) return 0
+ H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+ switch(H.backbag)
+ if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/emt(H), slot_back)
+ if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/emt(H), slot_back)
+ if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/emt(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
+ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+ H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
+ H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+ H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
+ if(H.backbag == 1)
+ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+ else
+ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+ return 1
/datum/job/doctor
title = "Medical Doctor"
flag = DOCTOR
department_flag = MEDSCI
faction = "Station"
- total_positions = 5
+ total_positions = 4
spawn_positions = 3
supervisors = "the chief medical officer"
selection_color = "#ffeef0"
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 1547ce82..dc980f84 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -23,13 +23,14 @@ var/const/SCIENTIST =(1<<1)
var/const/CHEMIST =(1<<2)
var/const/CMO =(1<<3)
var/const/DOCTOR =(1<<4)
-var/const/GENETICIST =(1<<5)
-var/const/VIROLOGIST =(1<<6)
-var/const/PSYCHIATRIST =(1<<7)
-var/const/ROBOTICIST =(1<<8)
-var/const/XENOBIOLOGIST =(1<<9)
-var/const/INTERN_MED =(1<<10)
-var/const/INTERN_SCI =(1<<11)
+var/const/EMT =(1<<5)
+var/const/GENETICIST =(1<<6)
+var/const/VIROLOGIST =(1<<7)
+var/const/PSYCHIATRIST =(1<<8)
+var/const/ROBOTICIST =(1<<9)
+var/const/XENOBIOLOGIST =(1<<10)
+var/const/INTERN_MED =(1<<11)
+var/const/INTERN_SCI =(1<<12)
@@ -79,7 +80,8 @@ var/list/medical_positions = list(
"Geneticist",
"Psychiatrist",
"Chemist",
- "Nursing Inter"
+ "Emergency Medical Technician",
+ "Nursing Intern"
)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index a95c2d29..fc53d07d 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -102,6 +102,12 @@
icon_state = "clownpack"
item_state = "clownpack"
+/obj/item/weapon/storage/backpack/emt
+ name = "emergency medical backpack"
+ desc = "It's a tough backpack used by first responders."
+ icon_state = "emtpack"
+ item_state = "emtpack"
+
/obj/item/weapon/storage/backpack/medic
name = "medical backpack"
desc = "It's a backpack especially designed for use in a sterile environment."
@@ -135,6 +141,12 @@
desc = "It's a very fancy satchel made with fine leather."
icon_state = "satchel"
+/obj/item/weapon/storage/backpack/satchel/emt
+ name = "emergency medical satchel"
+ desc = "It's a tough satchel used by first responders."
+ icon_state = "satchel-emt"
+ item_state = "satchel-emt"
+
/obj/item/weapon/storage/backpack/satchel/withwallet
New()
..()
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 8d0f794b..e5a55c19 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -105,7 +105,11 @@
item_color = "orderly"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-
+/obj/item/clothing/under/rank/medical/emt
+ name = "emergency medical technician's jumpsuit"
+ icon_state = "emt"
+ item_state = "emt"
+ item_color = "emt"
/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
name = "medical doctor's jumpsuit"
diff --git a/code/modules/economy/Job_Departments.dm b/code/modules/economy/Job_Departments.dm
index b1e10f12..36a454c0 100644
--- a/code/modules/economy/Job_Departments.dm
+++ b/code/modules/economy/Job_Departments.dm
@@ -47,6 +47,8 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
/datum/job/doctor/department = "Medical"
+/datum/job/emt/department = "Medical"
+
/datum/job/chemist/department = "Medical"
/datum/job/geneticist/department = "Medical"
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index f9e61d94..d1e6fda1 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -492,6 +492,20 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(EMT)
+ clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(DOCTOR)
clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index 4daa1c89..4a57e1a1 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,22 +1,6 @@
-03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-03:56 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-03:56 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:01 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:01 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:06 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:06 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:11 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:11 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:16 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:16 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:21 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:21 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:26 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:26 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:31 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:31 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
-04:36 [0x20078f6] (92,152,1) || the gravitational generator has regained power.
-04:36 [0x20078f6] (92,152,1) || the gravitational generator is now charging.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator has regained power.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator is now charging.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator has regained power.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator is now charging.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator has regained power.
+20:45 [0x20078f9] (92,152,1) || the gravitational generator is now charging.
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index f1f53bf0..3a57acb4 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index bda059ad..89a7b011 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 7440321d..98542648 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index b34675c6..339d9178 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm
index cb947d41..990e9751 100644
--- a/maps/tgstation2.dmm
+++ b/maps/tgstation2.dmm
@@ -3402,7 +3402,7 @@
"bnv" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
"bnw" = (/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/medical/reception)
"bnx" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/med_data/laptop,/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
-"bny" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
+"bny" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Emergency Medical Technician"},/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
"bnz" = (/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
"bnA" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = ""; name = "Medbay"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bnB" = (/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/medbay2)
@@ -4168,7 +4168,7 @@
"bCh" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor{icon_state = "white"},/area/medical/ward)
"bCi" = (/obj/machinery/computer/crew,/obj/structure/sign/nosmoking_2{pixel_x = -28},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/medical/sleeper)
"bCj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
-"bCk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
+"bCk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bCl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bCm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bCn" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Cryogenics"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
@@ -4248,7 +4248,7 @@
"bDJ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/ward)
"bDK" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bDL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
-"bDM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
+"bDM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/effect/landmark/start{name = "Emergency Medical Technician"},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bDN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bDO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
"bDP" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; level = 2},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/medical/medbay2)