add: New sprites for paramedic new skirt and cap (#5709)

* Adding new content in game

* Krill issue fix

* Drask sprite issue fix

* Deaberdir notice tweaks

code/game/jobs/job/medical.dm

@@ -360,7 +360,7 @@
 
 	uniform = /obj/item/clothing/under/rank/medical/paramedic
 	shoes = /obj/item/clothing/shoes/black
-	head = /obj/item/clothing/head/soft/blue
+	head = /obj/item/clothing/head/soft/paramedic
 	mask = /obj/item/clothing/mask/cigarette
 	l_ear = /obj/item/radio/headset/headset_med
 	id = /obj/item/card/id/medical
@@ -375,3 +375,8 @@
 	satchel = /obj/item/storage/backpack/satchel_med
 	dufflebag = /obj/item/storage/backpack/duffel/medical
 	box = /obj/item/storage/box/engineer
+
+/datum/outfit/job/paramedic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(H.gender == FEMALE)
+		uniform = /obj/item/clothing/under/rank/medical/paramedic/skirt

code/game/machinery/vending.dm

@@ -2542,6 +2542,7 @@
 	req_access = list(ACCESS_MEDICAL)
 	products = list(
 		/obj/item/clothing/head/beret/med  			= 10,
+		/obj/item/clothing/head/soft/paramedic		= 5,
 		/obj/item/clothing/head/surgery/purple 		= 10,
 		/obj/item/clothing/head/surgery/blue 		= 10,
 		/obj/item/clothing/head/surgery/green 		= 10,
@@ -2563,6 +2564,8 @@
 		/obj/item/clothing/under/rank/nursesuit				= 10,
 		/obj/item/clothing/under/rank/nurse					= 10,
 		/obj/item/clothing/under/rank/orderly				= 10,
+		/obj/item/clothing/under/rank/medical/paramedic		= 5,
+		/obj/item/clothing/under/rank/medical/paramedic/skirt			= 5,
 
 		/obj/item/clothing/suit/storage/labcoat 	= 10,
 		/obj/item/clothing/suit/storage/suragi_jacket/medic = 10,

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -144,16 +144,16 @@
 /obj/structure/closet/paramedic/populate_contents()
 	new /obj/item/clothing/under/rank/medical/paramedic(src)
 	new /obj/item/clothing/under/rank/medical/paramedic(src)
+	new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+	new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
 	new /obj/item/radio/headset/headset_med(src)
 	new /obj/item/radio/headset/headset_med(src)
-	new /obj/item/clothing/head/soft/blue(src)
-	new /obj/item/clothing/head/soft/blue(src)
 	new /obj/item/clothing/gloves/color/latex(src)
 	new /obj/item/clothing/gloves/color/latex(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/head/soft/blue(src)
-	new /obj/item/clothing/head/soft/blue(src)
+	new /obj/item/clothing/head/soft/paramedic(src)
+	new /obj/item/clothing/head/soft/paramedic(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
 	new	/obj/item/clothing/suit/storage/paramedic_jacket(src)

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -135,6 +135,11 @@
 	path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
 	allowed_roles = list(JOB_TITLE_CMO)
 
+/datum/gear/uniform/skirt/job/paramedic
+	display_name = "skirt, paramedic"
+	path = /obj/item/clothing/under/rank/medical/paramedic/skirt
+	allowed_roles = list(JOB_TITLE_PARAMEDIC)
+
 /datum/gear/uniform/skirt/job/chem
 	display_name = "skirt, chemist"
 	path = /obj/item/clothing/under/rank/chemist/skirt

code/modules/clothing/head/soft_caps.dm

@@ -111,9 +111,17 @@
 	item_color = "rainbow"
 	dog_fashion = null
 
+/obj/item/clothing/head/soft/paramedic
+	name = "paramedic`s cap"
+	desc = "A soft cap worn by a paramedic."
+	icon_state = "paramedicsoft"
+	item_state = "paramedicsoft"
+	item_color = "paramedic"
+	dog_fashion = null
+
 /obj/item/clothing/head/soft/brigphys
 	name = "brigphysic`s cap"
-	desc = "Кепи бригмедика"
+	desc = "A soft cap worn by a brig physician."
 	icon_state = "brigphyssoft"
 	item_state = "brigphyssoft"
 	item_color = "brigphys"

code/modules/clothing/suits/jobs.dm

@@ -10,15 +10,16 @@
 	allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe,
 	/obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen,/obj/item/rad_laser)
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50)
-
 	sprite_sheets = list(
 		SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
 		SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
 		SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
 		SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
 		SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
 		SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
-		SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
+		SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+		SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+		SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi'
 		)
 
 /obj/item/clothing/suit/storage/paramedic_jacket

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

@@ -2,16 +2,16 @@
  * Science
  */
 /obj/item/clothing/under/rank/research_director
-	desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
 	name = "research director's jumpsuit"
+	desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
 	icon_state = "director"
 	item_state = "g_suit"
 	item_color = "director"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35)
 
 /obj/item/clothing/under/rank/scientist
-	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
 	name = "scientist's jumpsuit"
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
 	icon_state = "toxins"
 	item_state = "w_suit"
 	item_color = "toxinswhite"
@@ -47,8 +47,8 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/chemist
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
 	name = "chemist's jumpsuit"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
 	icon_state = "chemistry"
 	item_state = "w_suit"
 	item_color = "chemistrywhite"
@@ -65,24 +65,24 @@
  * Medical
  */
 /obj/item/clothing/under/rank/chief_medical_officer
-	desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	name = "chief medical officer's jumpsuit"
+	desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	icon_state = "cmo"
 	item_state = "w_suit"
 	item_color = "cmo"
 	permeability_coefficient = 0.50
 	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/chief_medical_officer/skirt
-	desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	name = "chief medical officer's jumpskirt"
+	desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	icon_state = "cmof"
 	item_color = "cmof"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/geneticist
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
 	name = "geneticist's jumpsuit"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
 	icon_state = "genetics"
 	item_state = "w_suit"
 	item_color = "geneticswhite"
@@ -96,8 +96,8 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/virologist
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
 	name = "virologist's jumpsuit"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
 	icon_state = "virology"
 	item_state = "w_suit"
 	item_color = "virologywhite"
@@ -111,35 +111,35 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/rank/nursesuit
-	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"
+	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	icon_state = "nursesuit"
 	item_state = "nursesuit"
 	item_color = "nursesuit"
 	permeability_coefficient = 0.50
 	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/nurse
-	desc = "A dress commonly worn by the nursing staff in the medical department."
 	name = "nurse's dress"
+	desc = "A dress commonly worn by the nursing staff in the medical department."
 	icon_state = "nurse"
 	item_state = "nurse"
 	item_color = "nurse"
 	permeability_coefficient = 0.50
 	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/orderly
-	desc = "A white suit to be worn by orderly people who love orderly things."
 	name = "orderly's uniform"
+	desc = "A white suit to be worn by orderly people who love orderly things."
 	icon_state = "orderly"
 	item_state = "orderly"
 	item_color = "orderly"
 	permeability_coefficient = 0.50
 	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
-	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"
+	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."
 	icon_state = "medical"
 	item_state = "w_suit"
 	item_color = "medical"
@@ -210,31 +210,38 @@
 
 //paramedic
 /obj/item/clothing/under/rank/medical/paramedic
-	desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the chest denoting that the wearer is trained medical personnel."
 	name = "paramedic's jumpsuit"
+	desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the chest denoting that the wearer is trained medical personnel."
 	icon_state = "paramedic"
 	item_state = "paramedic"
 	item_color = "paramedic"
 	permeability_coefficient = 0.50
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/medical/paramedic/skirt
+	name = "paramedic's jumpskirt"
+	desc = "It's made of a special fiber that provides minor protection against biohazards and radiation blue jumpskirt. It has a cross on the chest denoting that the wearer is trained medical personnel."
+	icon_state = "paramedicf"
+	item_state = "paramedicf"
+	item_color = "paramedicf"
+
 /obj/item/clothing/under/rank/psych
-	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
 	name = "psychiatrist's jumpsuit"
+	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
 	icon_state = "psych"
 	item_state = "w_suit"
 	item_color = "psych"
 
 /obj/item/clothing/under/rank/psych/skirt
-	desc = "A basic white jumpskirt. It has turqouise markings that denote the wearer as a psychiatrist."
 	name = "psychiatrist's jumpskirt"
+	desc = "A basic white jumpskirt. It has turqouise markings that denote the wearer as a psychiatrist."
 	icon_state = "psychf"
 	item_state = "w_suit"
 	item_color = "psychf"
 
 /obj/item/clothing/under/rank/psych/turtleneck
-	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
 	name = "psychologist's turtleneck"
+	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
 	icon_state = "psychturtle"
 	item_state = "b_suit"
 	item_color = "psychturtle"
@@ -244,35 +251,35 @@
  * Medsci, unused (i think) stuff
  */
 /obj/item/clothing/under/rank/geneticist_new
-	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	name = "geneticist's jumpsuit"
+	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	icon_state = "genetics_new"
 	item_state = "w_suit"
 	item_color = "genetics_new"
 	permeability_coefficient = 0.50
 	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/chemist_new
-	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	name = "chemist's jumpsuit"
+	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	icon_state = "chemist_new"
 	item_state = "w_suit"
 	item_color = "chemist_new"
 	permeability_coefficient = 0.50
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
 
 /obj/item/clothing/under/rank/scientist_new
-	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
 	name = "scientist's jumpsuit"
+	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
 	icon_state = "scientist_new"
 	item_state = "w_suit"
 	item_color = "scientist_new"
 	permeability_coefficient = 0.50
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
 /obj/item/clothing/under/rank/virologist_new
-	desc = "Made of a special fiber that gives increased protection against biohazards."
 	name = "virologist's jumpsuit"
+	desc = "Made of a special fiber that gives increased protection against biohazards."
 	icon_state = "virologist_new"
 	item_state = "w_suit"
 	item_color = "virologist_new"

code/modules/mob/new_player/preferences_setup.dm

@@ -735,7 +735,7 @@
 				clothes_s = new /icon(uniform_dmi, "paramedic_s")
 				clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigoff"), ICON_OVERLAY)
-				clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bluesoft"), ICON_OVERLAY)
+				clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "paramedicsoft"), ICON_OVERLAY)
 				switch(backbag)
 					if(2)
 						clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)