[MIRROR] Re-adds the custom sprites for Hospital Gowns (#5281)

* Re-adds the custom sprites for Hospital Gowns (#4726) * restore hospital gown sprites * oops * oh wait the base labcoat isnt even greyscale they just did this for no good reason * Apply suggestions from code review --------- Co-authored-by: Bloop <[email protected]> * [MIRROR] Re-adds the custom sprites for Hospital Gowns --------- Co-authored-by: OrionTheFox <[email protected]> Co-authored-by: Bloop <[email protected]> Co-authored-by: StealsThePRs <[email protected]>
Fluffy-Frontier · Jan 8, 2025 · 88d928f · 88d928f
1 parent 65847a1
commit 88d928f
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 21 deletions.
diff --git a/code/datums/storage/subtypes/surgery_tray.dm b/code/datums/storage/subtypes/surgery_tray.dm
@@ -18,7 +18,7 @@
 		/obj/item/cautery,
 		/obj/item/circular_saw,
 		/obj/item/clothing/mask/surgical,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown, // NOVA EDIT ADDITION
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown, // NOVA EDIT ADDITION
 		/obj/item/hemostat,
 		/obj/item/razor,
 		/obj/item/retractor,

diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -598,7 +598,7 @@
 	new /obj/item/surgicaldrill(src)
 	new /obj/item/cautery(src)
 	new /obj/item/surgical_drapes(src)
-	new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src)	//NOVA EDIT ADDITION
+	new /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown(src) //NOVA EDIT ADDITION
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/blood_filter(src)
 

diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -250,7 +250,7 @@
 		/obj/item/clothing/mask/muzzle,
 		/obj/item/clothing/mask/surgical,
 		/obj/item/clothing/head/utility/surgerycap,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown, //NOVA EDIT ADDITION - adds surgery gowns to belts
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown, // NOVA EDIT ADDITION - adds surgery gowns to belts
 		/obj/item/construction/plumbing,
 		/obj/item/dnainjector,
 		/obj/item/extinguisher/mini,

diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
@@ -169,7 +169,7 @@
 	new /obj/item/cautery(src)
 	new /obj/item/circular_saw(src)
 	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // NOVA EDIT ADDITION
+	new /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown(src) // NOVA EDIT ADDITION
 	new /obj/item/hemostat(src)
 	new /obj/item/razor/surgery(src)
 	new /obj/item/retractor(src)
@@ -191,7 +191,7 @@
 	new /obj/item/cautery/cruel(src)
 	new /obj/item/circular_saw(src)
 	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // NOVA EDIT ADDITION
+	new /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown(src) // NOVA EDIT ADDITION
 	new /obj/item/hemostat/cruel(src)
 	new /obj/item/razor/surgery(src)
 	new /obj/item/retractor/cruel(src)

diff --git a/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm b/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm
@@ -78,13 +78,10 @@
 	if(!isinhands)
 		. += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)
 
-/obj/item/clothing/suit/toggle/labcoat/hospitalgown //Intended to keep patients modest while still allowing for surgeries
+/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown //Intended to keep patients modest while still allowing for surgeries
 	name = "hospital gown"
 	desc = "A complicated drapery with an assortment of velcros and strings, designed to keep a patient modest during medical stay and surgeries."
-	icon_state = "labcoat_job"
-	greyscale_config = /datum/greyscale_config/labcoat
-	greyscale_config_worn = /datum/greyscale_config/labcoat/worn
-	greyscale_colors = "#478294#478294#478294#478294"
+	icon_state = "hgown"
 	toggle_noun = "drapes"
 	body_parts_covered = NONE //Allows surgeries despite wearing it; hiding genitals is handled in /datum/sprite_accessory/genital/is_hidden() (Only place it'd work sadly)
 	armor_type = /datum/armor/none

diff --git a/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi b/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi
diff --git a/modular_nova/modules/cellguns/code/medigun_cells.dm b/modular_nova/modules/cellguns/code/medigun_cells.dm
@@ -406,7 +406,7 @@
 		return
 
 	var/mob/living/carbon/wearer = target
-	var/obj/item/clothing/gown = new /obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight
+	var/obj/item/clothing/gown = new /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown/hardlight
 
 	if(wearer.equip_to_slot_if_possible(gown, ITEM_SLOT_OCLOTHING, 1, 1, 1))
 		wearer.visible_message(span_notice("The [gown] covers [wearer] body"), span_notice("The [gown] wraps around your body, covering you"))
@@ -496,12 +496,12 @@
 	sparks.start()
 
 //Objects Used by medicells.
-/obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight
+/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown/hardlight
 	name = "hardlight hospital gown"
 	desc = "A hospital gown made out of hardlight - you can barely feel it on your body, especially with all the anesthetics."
-	greyscale_colors = "#B2D3CA#B2D3CA#B2D3CA#B2D3CA"
+	icon_state = "lgown"
 
-/obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight/dropped(mob/user)
+/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown/hardlight/dropped(mob/user)
 	. = ..()
 	var/mob/living/carbon/wearer = user
 

diff --git a/...lar_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/...lar_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
@@ -20,7 +20,7 @@
 			if((target_mob.w_uniform && target_mob.w_uniform.body_parts_covered & genital_location) || (target_mob.wear_suit && target_mob.wear_suit.body_parts_covered & genital_location))
 				return TRUE
 			//Do they have a Hospital Gown covering them? (The gown has no body_parts_covered so needs its own check)
-			if(istype(target_mob.wear_suit, /obj/item/clothing/suit/toggle/labcoat/hospitalgown))
+			if(istype(target_mob.wear_suit, /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown))
 				return TRUE
 
 			//Are they wearing an Undershirt?

diff --git a/modular_nova/modules/deforest_medical_items/code/storage_items.dm b/modular_nova/modules/deforest_medical_items/code/storage_items.dm
@@ -251,7 +251,7 @@
 		/obj/item/clothing/mask/breath,
 		/obj/item/clothing/mask/muzzle,
 		/obj/item/clothing/mask/surgical,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown,
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown,
 		/obj/item/dnainjector,
 		/obj/item/extinguisher/mini,
 		/obj/item/flashlight/pen,
@@ -346,7 +346,7 @@
 		/obj/item/clothing/mask/breath,
 		/obj/item/clothing/mask/muzzle,
 		/obj/item/clothing/mask/surgical,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown,
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown,
 		/obj/item/construction/plumbing,
 		/obj/item/dnainjector,
 		/obj/item/extinguisher/mini,
@@ -457,7 +457,7 @@
 		/obj/item/clothing/mask/breath,
 		/obj/item/clothing/mask/muzzle,
 		/obj/item/clothing/mask/surgical,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown,
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown,
 		/obj/item/dnainjector,
 		/obj/item/extinguisher/mini,
 		/obj/item/flashlight/pen,

diff --git a/modular_nova/modules/mapping/voidraptor/code/clothing.dm b/modular_nova/modules/mapping/voidraptor/code/clothing.dm
@@ -11,7 +11,7 @@
 	new /obj/item/cautery(src)
 	new /obj/item/bonesetter(src)
 	new /obj/item/surgical_drapes(src)
-	new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src)
+	new /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/razor(src)
 	new /obj/item/blood_filter(src)
diff --git a/modular_nova/modules/medical_designs/medical_designs.dm b/modular_nova/modules/medical_designs/medical_designs.dm
@@ -5,7 +5,7 @@
 	materials = list(
 		/datum/material/plastic = SHEET_MATERIAL_AMOUNT,
 	)
-	build_path = /obj/item/clothing/suit/toggle/labcoat/hospitalgown
+	build_path = /obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown
 	category = list(
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
 	)

diff --git a/modular_nova/modules/modular_vending/code/wardrobes.dm b/modular_nova/modules/modular_vending/code/wardrobes.dm
@@ -2,7 +2,7 @@
 	products_nova = list(
 		/obj/item/radio/headset/headset_med = 3,
 		/obj/item/clothing/gloves/latex/nitrile = 2,
-		/obj/item/clothing/suit/toggle/labcoat/hospitalgown = 5,
+		/obj/item/clothing/suit/toggle/labcoat/nova/hospitalgown = 5,
 		/obj/item/storage/belt/medbandolier = 2,
 		/obj/item/clothing/under/rank/engineering/engineer/nova/hazard_chem/emt = 2,
 		/obj/item/clothing/under/rank/medical/scrubs/nova/red = 4,