diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index de31fe7f3f5..47008848927 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -88,11 +88,30 @@ faction = "Zeng-Hu Pharmaceuticals" /datum/gear/faction/zenghu_labcoat - display_name = "zeng-hu labcoat" + display_name = "zeng-hu labcoat selection" path = /obj/item/clothing/suit/storage/toggle/labcoat/zeng slot = slot_wear_suit faction = "Zeng-Hu Pharmaceuticals" +/datum/gear/faction/zenghu_labcoat/New() + ..() + var/masks = list() + masks["zeng-hu labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + masks["zeng-hu labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + gear_tweaks += new/datum/gear_tweak/path(masks) + +/datum/gear/faction/zenghu_apron + display_name = "zeng-hu vinyl apron" + path = /obj/item/clothing/suit/apron/surgery/zeng + slot = slot_wear_suit + faction = "Zeng-Hu Pharmaceuticals" + +/datum/gear/faction/zenghu_gloves + display_name = "zeng-hu vinyl gloves" + path = /obj/item/clothing/gloves/zeng + slot = slot_gloves + faction = "Zeng-Hu Pharmaceuticals" + /datum/gear/faction/zavodskoi_patch display_name = "zavodskoi sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/zavodskoi diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index b8ce8e3e78f..32e4ad11dc8 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -193,3 +193,10 @@ /obj/item/clothing/gloves/fingerless/colour icon_state = "fingerlessgloves_colour" item_state = "fingerlessgloves_colour" + +/obj/item/clothing/gloves/zeng + name = "zeng-hu vinyl gloves" + desc = "A key design element in the labwear was utility and compatibility with the Zeng-Hu positronic chassis workers that are ubiquitous throughout the corporation. \ + As a result they are breathable yet non-porous, allowing for ample airflow while retaining the cleanroom standards expected of a medical and scientific uniform." + icon_state = "zeng_gloves" + item_state = "zeng_gloves" \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 64c3d952398..0799676f6b2 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -41,6 +41,13 @@ obj/item/clothing/suit/apron/overalls/blue allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood) +/obj/item/clothing/suit/apron/surgery/zeng + name = "zeng-hu vinyl apron" + desc = "A key design element in the labwear was utility and compatibility with the Zeng-Hu positronic chassis workers that are ubiquitous throughout the corporation. As a result \ + they are breathable yet non-porous, allowing for ample airflow while retaining the cleanroom standards expected of a medical and scientific uniform." + icon_state = "zeng_apron" + item_state = "zeng_apron" + //Chaplain /obj/item/clothing/suit/chaplain_hoodie name = "chaplain hoodie" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index f68cf941d62..f5a93467c21 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -91,6 +91,9 @@ desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Comes in Zeng-Hu colours." icon_state = "labcoat_zeng" +/obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + icon_state = "labcoat_zeng_alt" + /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi name = "Zavodskoi Interstellar labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Comes in Zavodskoi Interstellar colours." diff --git a/html/changelogs/alberyk-zengclothing.yml b/html/changelogs/alberyk-zengclothing.yml new file mode 100644 index 00000000000..43587401bc5 --- /dev/null +++ b/html/changelogs/alberyk-zengclothing.yml @@ -0,0 +1,6 @@ +author: Alberyk, Niennab + +delete-after: True + +changes: + - rscadd: "Added some clothing loadout options for Zeng-Hu contractors." diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 866d81a6709..2bd9d2a0e3d 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 4295a1d4834..794f4abb3da 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 1034f95023e..c04a7f78ea7 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index da10e5f2355..7a05b797e51 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ