diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index a7e57071a26..133c8bfedd2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -47,11 +47,29 @@ faction = "Eridani Private Military Contractors" /datum/gear/faction/zenghu_uniform_alt - display_name = "zeng-hu black uniform" + display_name = "zeng-hu white uniform" path = /obj/item/clothing/under/rank/zeng/alt slot = slot_wear_suit faction = "Zeng-Hu Pharmaceuticals" +/datum/gear/faction/zenghu_beret + display_name = "purple zeng-hu beret" + path = /obj/item/clothing/head/beret/zeng + slot = slot_head + faction = "Zeng-Hu Pharmaceuticals" + +/datum/gear/faction/zenghu_beret_alt + display_name = "white zeng-hu beret" + path = /obj/item/clothing/head/beret/zeng/alt + slot = slot_head + faction = "Zeng-Hu Pharmaceuticals" + +/datum/gear/faction/zenghu_labcoat + display_name = "zeng-hu labcoat" + path = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + slot = slot_wear_suit + faction = "Zeng-Hu Pharmaceuticals" + /datum/gear/faction/necro_patch display_name = "necropolis sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/necro diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d4cce74f850..064b8e106b4 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -107,6 +107,16 @@ desc = "A beret with the medical insignia emblazoned on it. For medical members that want to crush their brains after college left them in massive debt." icon_state = "medberet" +/obj/item/clothing/head/beret/zeng + name = "zeng-hu beret" + desc = "A purple beret with the Zeng-Hu insignia emblazoned on it." + icon_state = "zengberet" + +/obj/item/clothing/head/beret/zeng/alt + name = "zeng-hu beret" + desc = "A white beret with the Zeng-Hu insignia emblazoned on it." + icon_state = "zengaltberet" + /obj/item/clothing/head/beret/purple name = "purple beret" desc = "A stylish, if purple, beret." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 746d34df24e..a83b316278c 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -151,4 +151,12 @@ icon_state = "iac_vest_s" item_state = "iac_vest" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0) \ No newline at end of file + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0) + +/obj/item/clothing/suit/storage/toggle/labcoat/zeng + name = "zeng-hu labcoat" + 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_open" + icon_open = "labcoat_zeng_open" + icon_closed = "labcoat_zeng" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0) \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index a5213eec1b8..2512ab2b0fb 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -166,6 +166,8 @@ desc = "A uniform worn by Hephaestus Industries engineers." icon_state = "heph_engineer" worn_state = "heph_engineer" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) + siemens_coefficient = 0.75 /obj/item/clothing/under/rank/hephaestus/tech name = "Hephaestus Industries technician uniform" @@ -178,6 +180,8 @@ desc = "A uniform worn by Hephaestus Industries researchers." icon_state = "heph_research" worn_state = "heph_research" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 10) /obj/item/clothing/under/rank/necropolis name = "Necropolis Industries uniform" @@ -190,6 +194,8 @@ desc = "A uniform worn by Necropolis Industries researchers." icon_state = "necro_research" worn_state = "necro_research" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0) /obj/item/clothing/under/rank/necropolis/research/alt icon_state = "necro_research_alt" @@ -214,12 +220,16 @@ desc = "A uniform worn by Einstein Engines Incorporated employees and contractors." icon_state = "einstein_engine" worn_state = "einstein_engine" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) + siemens_coefficient = 0.75 /obj/item/clothing/under/rank/zeng name = "Zeng-Hu uniform" desc = "A uniform worn by Zeng-Hu medical doctors and researchers." icon_state = "zeng_research" worn_state = "zeng_research" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0) /obj/item/clothing/under/rank/zeng/alt icon_state = "zeng_research_alt" @@ -235,4 +245,6 @@ name = "Eridani PMC medic uniform" desc = "A uniform worn by Eridani PMC paramedics." icon_state = "eridani_medic" - worn_state = "eridani_medic" \ No newline at end of file + worn_state = "eridani_medic" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) diff --git a/html/changelogs/furrycactus - zeng stuff.yml b/html/changelogs/furrycactus - zeng stuff.yml new file mode 100644 index 00000000000..822ca8e8b7b --- /dev/null +++ b/html/changelogs/furrycactus - zeng stuff.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Furrycactus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added new clothing items for Zeng-Hu contractors; two berets and a labcoat." + - spellcheck: "Fixed the mislabeling of the alternate Zeng-Hu uniform, it's now named 'zeng-hu white uniform' instead of 'zeng-hu black uniform', because it is in fact white and not black." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 71e9ad73873..fa71184fe4c 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 3fff238df79..44325a376f8 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 78e0c2e68c6..eb10314a511 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d745fb95847..cf327cd1726 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ