Merge pull request #11180 from Detective-Google/psych+paramedic

Adds epic and also cool paramedics [lazy tg port]

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -86375,6 +86375,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "cPF" = (
@@ -127461,6 +127462,22 @@
 /obj/machinery/light/small,
 /turf/open/floor/plasteel,
 /area/security/prison)
+"vEq" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/storage)
 "wei" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -174855,7 +174872,7 @@ cAm
 cKO
 cMm
 cNO
-cPF
+vEq
 cRi
 cSV
 cUN

_maps/map_files/MetaStation/MetaStation.dmm

@@ -52211,6 +52211,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "bZZ" = (
@@ -54651,6 +54652,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
 "cez" = (

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -57031,6 +57031,10 @@
 	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
+"naS" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
 "ncm" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
@@ -61095,6 +61099,13 @@
 	},
 /turf/open/floor/wood,
 /area/lawoffice)
+"wtE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
 "wun" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -88795,7 +88806,7 @@ bzQ
 ioj
 bsA
 bEw
-bkh
+naS
 bkh
 bId
 bFO
@@ -89566,7 +89577,7 @@ bBc
 bCm
 bDr
 bEz
-bnF
+wtE
 buh
 bIg
 bjc

code/__DEFINES/jobs.dm

@@ -23,6 +23,7 @@
 #define DOCTOR			(1<<4)
 #define GENETICIST		(1<<5)
 #define VIROLOGIST		(1<<6)
+#define PARAMEDIC		(1<<7)
 
 
 #define CIVILIAN		(1<<2)
@@ -58,32 +59,33 @@
 #define JOB_DISPLAY_ORDER_ASSISTANT 1
 #define JOB_DISPLAY_ORDER_CAPTAIN 2
 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
-#define JOB_DISPLAY_ORDER_BARTENDER 4
-#define JOB_DISPLAY_ORDER_COOK 5
-#define JOB_DISPLAY_ORDER_BOTANIST 6
-#define JOB_DISPLAY_ORDER_JANITOR 7
-#define JOB_DISPLAY_ORDER_CLOWN 8
-#define JOB_DISPLAY_ORDER_MIME 9
-#define JOB_DISPLAY_ORDER_CURATOR 10
-#define JOB_DISPLAY_ORDER_LAWYER 11
-#define JOB_DISPLAY_ORDER_CHAPLAIN 12
-#define JOB_DISPLAY_ORDER_QUARTERMASTER 13
-#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14
-#define JOB_DISPLAY_ORDER_SHAFT_MINER 15
-#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
-#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
-#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
-#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19
-#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
-#define JOB_DISPLAY_ORDER_CHEMIST 21
-#define JOB_DISPLAY_ORDER_GENETICIST 22
-#define JOB_DISPLAY_ORDER_VIROLOGIST 23
-#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
-#define JOB_DISPLAY_ORDER_SCIENTIST 25
-#define JOB_DISPLAY_ORDER_ROBOTICIST 26
-#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
-#define JOB_DISPLAY_ORDER_WARDEN 28
-#define JOB_DISPLAY_ORDER_DETECTIVE 29
-#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
-#define JOB_DISPLAY_ORDER_AI 31
-#define JOB_DISPLAY_ORDER_CYBORG 32
+#define JOB_DISPLAY_ORDER_QUARTERMASTER 4
+#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5
+#define JOB_DISPLAY_ORDER_SHAFT_MINER 6
+#define JOB_DISPLAY_ORDER_BARTENDER 7
+#define JOB_DISPLAY_ORDER_COOK 8
+#define JOB_DISPLAY_ORDER_BOTANIST 9
+#define JOB_DISPLAY_ORDER_JANITOR 10
+#define JOB_DISPLAY_ORDER_CLOWN 11
+#define JOB_DISPLAY_ORDER_MIME 12
+#define JOB_DISPLAY_ORDER_CURATOR 13
+#define JOB_DISPLAY_ORDER_LAWYER 14
+#define JOB_DISPLAY_ORDER_CHAPLAIN 15
+#define JOB_DISPLAY_ORDER_AI 16
+#define JOB_DISPLAY_ORDER_CYBORG 17
+#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18
+#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19
+#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22
+#define JOB_DISPLAY_ORDER_PARAMEDIC 23
+#define JOB_DISPLAY_ORDER_CHEMIST 24
+#define JOB_DISPLAY_ORDER_VIROLOGIST 25
+#define JOB_DISPLAY_ORDER_GENETICIST 26
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
+#define JOB_DISPLAY_ORDER_SCIENTIST 28
+#define JOB_DISPLAY_ORDER_ROBOTICIST 29
+#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
+#define JOB_DISPLAY_ORDER_WARDEN 31
+#define JOB_DISPLAY_ORDER_DETECTIVE 32
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33

code/datums/traits/negative.dm

@@ -55,6 +55,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 			heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
 		if("Medical Doctor")
 			heirloom_type = /obj/item/healthanalyzer/advanced
+		if("Paramedic")
+			heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag)
 		if("Station Engineer")
 			heirloom_type = /obj/item/wirecutters/brass
 		if("Atmospheric Technician")

code/game/machinery/computer/crew.dm

@@ -40,6 +40,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Geneticist"] = 22
 	jobs["Virologist"] = 23
 	jobs["Medical Doctor"] = 24
+	jobs["Paramedic"] = 25
 	jobs["Research Director"] = 30
 	jobs["Scientist"] = 31
 	jobs["Roboticist"] = 32

code/game/objects/effects/landmarks.dm

@@ -151,6 +151,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Medical Doctor"
 	icon_state = "Medical Doctor"
 
+/obj/effect/landmark/start/paramedic
+	name = "Paramedic"
+	icon_state = "Paramedic"
+
 /obj/effect/landmark/start/scientist
 	name = "Scientist"
 	icon_state = "Scientist"

code/modules/clothing/under/jobs/medsci.dm

@@ -158,6 +158,23 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
+/obj/item/clothing/under/rank/medical/paramedic
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	name = "paramedic jumpsuit"
+	icon_state = "paramedic"
+	item_state = "w_suit"
+	permeability_coefficient = 0.5
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+
+/obj/item/clothing/under/rank/medical/paramedic/skirt
+	name = "paramedic jumpskirt"
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	icon_state = "paramedic_skirt"
+	item_state = "w_suit"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"

code/modules/events/wizard/departmentrevolt.dm

@@ -19,7 +19,7 @@
 			jobs_to_revolt = list("Assistant")
 			nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi")
 		if("white")
-			jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist")
+			jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Virologist")
 			nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych")
 		if("yellow")
 			jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")

code/modules/jobs/access.dm

@@ -357,7 +357,7 @@
 /proc/get_all_jobs()
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
-				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
+				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic",
 				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 
 /proc/get_all_job_icons() //For all existing HUD icons

code/modules/jobs/job_types/paramedic.dm

@@ -0,0 +1,45 @@
+/datum/job/paramedic
+	title = "Paramedic"
+	flag = PARAMEDIC
+	department_head = list("Chief Medical Officer")
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 3
+	spawn_positions = 2
+	supervisors = "the chief medical officer"
+	selection_color = "#74b5e0"
+
+	outfit = /datum/outfit/job/paramedic
+
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
+	minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
+
+	display_order = JOB_DISPLAY_ORDER_PARAMEDIC
+
+/datum/outfit/job/paramedic
+	name = "Paramedic"
+	jobtype = /datum/job/paramedic
+
+	ears = /obj/item/radio/headset/headset_med
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
+	uniform = /obj/item/clothing/under/rank/medical/paramedic
+	mask = /obj/item/clothing/mask/surgical
+	shoes = /obj/item/clothing/shoes/jackboots
+	head = /obj/item/clothing/head/soft/emt
+	suit =  /obj/item/clothing/suit/toggle/labcoat/emt
+	belt = /obj/item/storage/belt/medical
+	l_hand = /obj/item/storage/firstaid/regular
+	suit_store = /obj/item/flashlight/pen
+	id = /obj/item/card/id
+	r_pocket = /obj/item/pinpointer/crew
+	l_pocket = /obj/item/pda/medical
+	backpack_contents = list(/obj/item/roller=1)
+	pda_slot = ITEM_SLOT_POCKET
+
+	backpack = /obj/item/storage/backpack/medic
+	satchel = /obj/item/storage/backpack/satchel/med
+	duffelbag = /obj/item/storage/backpack/duffelbag/med
+
+	backpack_contents = list(/obj/item/storage/hypospraykit/regular)
+
+	chameleon_extras = /obj/item/gun/syringe

code/modules/jobs/jobs.dm

@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(medical_positions, list(
 	"Medical Doctor",
 	"Geneticist",
 	"Virologist",
+	"Paramedic",
 	"Chemist"))
 
 

config/jobs.txt

@@ -31,6 +31,7 @@ Station Engineer=5,5
 Atmospheric Technician=3,2
 
 Medical Doctor=5,3
+Paramedic=2,2
 Chemist=2,2
 Geneticist=2,2
 Virologist=1,1

strings/ion_laws.json

@@ -332,6 +332,7 @@
         "RESEARCH DIRECTORS",
         "CHIEF MEDICAL OFFICERS",
 		"MEDICAL DOCTORS",
+		"PARAMEDICS",
         "CHEMISTS",
         "GENETICISTS",
         "VIROLOGISTS",

tgstation.dme

@@ -1986,6 +1986,7 @@
 #include "code\modules\jobs\job_types\lawyer.dm"
 #include "code\modules\jobs\job_types\medical_doctor.dm"
 #include "code\modules\jobs\job_types\mime.dm"
+#include "code\modules\jobs\job_types\paramedic.dm"
 #include "code\modules\jobs\job_types\quartermaster.dm"
 #include "code\modules\jobs\job_types\research_director.dm"
 #include "code\modules\jobs\job_types\roboticist.dm"