diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index aef0a62c049..ae1c5d3bb90 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -72,6 +72,7 @@ name = "Investigator - Idris" uniform = /obj/item/clothing/under/det/idris + suit = /obj/item/clothing/suit/storage/det_jacket/idris id = /obj/item/card/id/idris/sec /datum/outfit/job/intern_sec/idris diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index e58d149f674..9be719b8f98 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -78,6 +78,7 @@ name = "Investigator - PMC" uniform = /obj/item/clothing/under/det/pmc + suit = /obj/item/clothing/suit/storage/det_jacket/pmc id = /obj/item/card/id/pmc /datum/outfit/job/doctor/pmc @@ -111,6 +112,7 @@ /datum/outfit/job/med_tech/pmc name = "First Responder - PMC" + head = /obj/item/clothing/head/softcap/medical/pmc uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc id = /obj/item/card/id/pmc diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 0674bd329e8..81d3cf5470a 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -25,6 +25,9 @@ /datum/species/skrell, /datum/species/unathi, /datum/species/diona, + /datum/species/bug = TRUE, + /datum/species/bug/type_b = TRUE, + /datum/species/bug/type_e = TRUE, /datum/species/machine ) @@ -87,7 +90,8 @@ id = /obj/item/card/id/zavodskoi/sec uniform = /obj/item/clothing/under/det/zavod - head = /obj/item/clothing/head/softcap/zavod/alt + suit = /obj/item/clothing/suit/storage/det_jacket/zavod + head = null /datum/outfit/job/scientist/zavodskoi name = "Scientist - Zavodskoi Interstellar" diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 573dfd7b03c..cdfa9761e93 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -93,6 +93,7 @@ /datum/outfit/job/med_tech/zeng_hu name = "First Responder - Zeng-Hu" + head = /obj/item/clothing/head/softcap/medical/pmc suit = null uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index e2a514a49ef..08b68c0b3a2 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -107,6 +107,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) name = "Executive Officer" jobtype = /datum/job/xo + head = /obj/item/clothing/head/caphat/xo uniform = /obj/item/clothing/under/rank/xo shoes = /obj/item/clothing/shoes/brown id = /obj/item/card/id/navy @@ -148,12 +149,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access = list(access_eva, access_heads, access_maint_tunnels, access_weapons, access_bridge_crew, access_intrepid) minimal_access = list(access_heads, access_eva, access_heads, access_gateway, access_weapons, access_bridge_crew, access_intrepid) - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/outfit/job/bridge_crew name = "Bridge Crew" jobtype = /datum/job/bridge_crew + head = /obj/item/clothing/head/caphat/bridge_crew uniform = /obj/item/clothing/under/rank/bridge_crew shoes = /obj/item/clothing/shoes/black diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 2d76d526c58..686c5f0a26b 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -251,6 +251,7 @@ base_name = "First Responder" jobtype = /datum/job/med_tech + head = /obj/item/clothing/head/softcap/medical/nt uniform = /obj/item/clothing/under/rank/medical/first_responder/nt shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 863e92a9600..66630627d1a 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -37,6 +37,22 @@ desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority." icon_state = "hopcap" +/obj/item/clothing/head/caphat/xo + name = "executive officer cap" + desc = "A stylish cap issued to SCC executive officers." + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + contained_sprite = TRUE + icon_state = "executive_officer_cap" + item_state = "executive_officer_cap" + +/obj/item/clothing/head/caphat/bridge_crew + name = "bridge crew cap" + desc = "A stylish cap issued to the SCC bridge crew." + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + contained_sprite = TRUE + icon_state = "bridge_officer_cap" + item_state = "bridge_officer_cap" + //Chaplain /obj/item/clothing/head/chaplain_hood name = "chaplain's hood" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 2d3d673cf5b..6dcbe4910a8 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -164,4 +164,19 @@ /obj/item/clothing/head/softcap/zavod/alt desc = "A tan company-issue Zavokdskoi cap with the symbol of the corporation at its front." icon_state = "zavod" - item_state = "zavod" \ No newline at end of file + item_state = "zavod" + +/obj/item/clothing/head/softcap/medical/zeng + desc = "A medical cap in Zeng-Hu colors." + icon_state = "zeng_emt_cap" + item_state = "zeng_emt_cap" + +/obj/item/clothing/head/softcap/medical/nt + desc = "A medical cap in NanoTrasen colors." + icon_state = "nt_emt_cap" + item_state = "nt_emt_cap" + +/obj/item/clothing/head/softcap/medical/pmc + desc = "A medical cap in PMC colors." + icon_state = "epmc_emt_cap" + item_state = "epmc_emt_cap" \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 56e67690713..caaa43f2962 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -152,7 +152,7 @@ obj/item/clothing/suit/apron/overalls/blue /obj/item/clothing/suit/storage/det_jacket name = "detective's jacket" - desc = "Stylish yet comfortable professional jacket manufactured by CL corporation for NT detectives." + desc = "Stylish yet comfortable professional jacket manufactured by CL corporation for detectives." icon_state = "det_jacket" item_state = "det_jacket" blood_overlay_type = "coat" @@ -181,6 +181,24 @@ obj/item/clothing/suit/apron/overalls/blue body_parts_covered = UPPER_TORSO|ARMS allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator) +/obj/item/clothing/suit/storage/det_jacket/zavod + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zav_invest_coat" + item_state = "zav_invest_coat" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/det_jacket/pmc + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "epmc_invest_coat" + item_state = "epmc_invest_coat" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/det_jacket/idris + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "idris_invest_coat" + item_state = "idris_invest_coat" + contained_sprite = TRUE + /obj/item/clothing/suit/storage/toggle/forensics/blue icon_state = "forensicsblue" item_state = "forensicsblue" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e28c502f490..2e50b511970 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index cf3e5534230..4ca6d621a53 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index 910ebc3bef4..b23fd64c2bc 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index 23bab43dca9..b4b958405a0 100644 Binary files a/icons/obj/clothing/hats/soft_caps.dmi and b/icons/obj/clothing/hats/soft_caps.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/command.dmi b/icons/obj/contained_items/department_uniforms/command.dmi index 1e27c982f32..95446c89a05 100644 Binary files a/icons/obj/contained_items/department_uniforms/command.dmi and b/icons/obj/contained_items/department_uniforms/command.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/engineering.dmi b/icons/obj/contained_items/department_uniforms/engineering.dmi index 960312783f2..7c7f13ab924 100644 Binary files a/icons/obj/contained_items/department_uniforms/engineering.dmi and b/icons/obj/contained_items/department_uniforms/engineering.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/medical.dmi b/icons/obj/contained_items/department_uniforms/medical.dmi index b302daca567..7bafae99781 100644 Binary files a/icons/obj/contained_items/department_uniforms/medical.dmi and b/icons/obj/contained_items/department_uniforms/medical.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/operations.dmi b/icons/obj/contained_items/department_uniforms/operations.dmi index 9d1bcd0d4d7..dafe3ef0ab8 100644 Binary files a/icons/obj/contained_items/department_uniforms/operations.dmi and b/icons/obj/contained_items/department_uniforms/operations.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi index de5c391aa81..f86c4a9221a 100644 Binary files a/icons/obj/contained_items/department_uniforms/security.dmi and b/icons/obj/contained_items/department_uniforms/security.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/service.dmi b/icons/obj/contained_items/department_uniforms/service.dmi index feb40ceb4e2..6c9fed52d23 100644 Binary files a/icons/obj/contained_items/department_uniforms/service.dmi and b/icons/obj/contained_items/department_uniforms/service.dmi differ