cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Uniformity : The Confluence of Conformity (#13773)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-05-13 12:08:50 +02:00
committed by GitHub
parent 72f22493a3
commit 3e8f9e0901
89 changed files with 1063 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/corpse.dm
+1 -1
View File
@@ -176,7 +176,7 @@
name = "Scientist"
corpseradio = /obj/item/device/radio/headset/headset_sci
corpseuniform = /obj/item/clothing/under/rank/scientist
corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/science
corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/nt
corpseback = /obj/item/storage/backpack
corpseshoes = /obj/item/clothing/shoes/science
corpseid = 1
code/modules/client/preference_setup/loadout/loadout_factions.dm
+43 -68
View File
@@ -1,6 +1,6 @@
/datum/gear/faction
display_name = "idris cap"
path = /obj/item/clothing/head/softcap/security/idris
path = /obj/item/clothing/head/softcap/idris
slot = slot_head
sort_category = "Factions"
cost = 1
@@ -8,21 +8,13 @@
/datum/gear/faction/idris_beret
display_name = "idris beret"
path = /obj/item/clothing/head/beret/security/idris
path = /obj/item/clothing/head/beret/corporate/idris
faction = "Idris Incorporated"
/datum/gear/faction/idris_beret_alt
display_name = "idris beret (alt)"
path = /obj/item/clothing/head/beret/security/idris/alt
path = /obj/item/clothing/head/beret/corporate/idris/alt
faction = "Idris Incorporated"
/datum/gear/faction/idris_uniform_alt
display_name = "idris service skirt"
description = "Not for security usage."
path = /obj/item/clothing/under/rank/idris/service/alt
slot = slot_w_uniform
faction = "Idris Incorporated"
/datum/gear/faction/idris_armband
display_name = "idris armband"
path = /obj/item/clothing/accessory/armband/idris
@@ -79,34 +71,22 @@
/datum/gear/faction/zavodskoi_beret
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi
path = /obj/item/clothing/head/beret/corporate/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_beret/alt
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi/alt
path = /obj/item/clothing/head/beret/corporate/zavod
sort_category = "Factions"
/datum/gear/faction/zavodskoi_softcap
display_name = "black zavodskoi cap"
path = /obj/item/clothing/head/softcap/zavod
path = /obj/item/clothing/head/softcap/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_softcap/alt
display_name = "brown zavodskoi cap"
path = /obj/item/clothing/head/softcap/zavod/alt
/datum/gear/faction/zavodskoi_uniform_alt
display_name = "brown zavodskoi uniform"
path = /obj/item/clothing/under/rank/security/zavodskoi/alt
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_research_alt
display_name = "brown zavodskoi research uniform"
path = /obj/item/clothing/under/rank/zavodskoi/research/alt
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
path = /obj/item/clothing/head/softcap/zavod
/datum/gear/faction/zavodskoi_labcoat
display_name = "zavodskoi labcoat"
@@ -130,66 +110,61 @@
zavod_sunglasses["aviator sunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod
gear_tweaks += new /datum/gear_tweak/path(zavod_sunglasses)
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
path = /obj/item/clothing/head/beret/security/eri
/datum/gear/faction/pmc_beret
display_name = "PMCG beret"
path = /obj/item/clothing/head/beret/corporate/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/eridani_cap
display_name = "eridani cap"
path = /obj/item/clothing/head/softcap/eri
/datum/gear/faction/pmc_cap
display_name = "PMCG cap"
path = /obj/item/clothing/head/softcap/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_sunglasses
display_name = "EPMC security HUD selection"
description = "A selection of EPMC security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/epmc
/datum/gear/faction/pmc_sunglasses
display_name = "PMCG security HUD selection"
description = "A selection of PMCG security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/pmc
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_sunglasses/New()
/datum/gear/faction/pmc_sunglasses/New()
..()
var/list/epmc_sunglasses = list()
epmc_sunglasses["HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/epmc
epmc_sunglasses["fat HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/big/epmc
epmc_sunglasses["aviator sunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
gear_tweaks += new /datum/gear_tweak/path(epmc_sunglasses)
var/list/pmc_sunglasses = list()
pmc_sunglasses["HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/pmc
pmc_sunglasses["fat HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/big/pmc
pmc_sunglasses["aviator sunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc
gear_tweaks += new /datum/gear_tweak/path(pmc_sunglasses)
/datum/gear/faction/epmc_labcoat
display_name = "EPMC labcoat selection"
description = "A selection of EPMC labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
/datum/gear/faction/pmc_labcoat
display_name = "PMCG labcoat selection"
description = "A selection of PMCG labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/pmc
slot = slot_wear_suit
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_labcoat/New()
/datum/gear/faction/pmc_labcoat/New()
..()
var/list/epmc_labcoats = list()
epmc_labcoats["security labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
epmc_labcoats["security labcoat alt, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/alt
epmc_labcoats["medical labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/med
gear_tweaks += new /datum/gear_tweak/path(epmc_labcoats)
/datum/gear/faction/zenghu_uniform_alt
display_name = "zeng-hu white uniform"
path = /obj/item/clothing/under/rank/zeng/alt
slot = slot_w_uniform
faction = "Zeng-Hu Pharmaceuticals"
var/list/pmc_labcoats = list()
pmc_labcoats["labcoat, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc
pmc_labcoats["labcoat alt, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt
gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats)
/datum/gear/faction/zenghu_beret
display_name = "purple zeng-hu beret"
path = /obj/item/clothing/head/beret/zeng
display_name = "Zeng-Hu beret selection"
description = "A selection of Zeng-Hu berets."
path = /obj/item/clothing/head/beret/corporate/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_beret/New()
..()
var/list/zenghu_berets = list()
zenghu_berets["beret, zeng-hu"] = /obj/item/clothing/head/beret/corporate/zeng
zenghu_berets["beret alt, zeng-hu"] = /obj/item/clothing/head/beret/corporate/zeng/alt
gear_tweaks += new /datum/gear_tweak/path(zenghu_berets)
/datum/gear/faction/zenghu_labcoat
display_name = "zeng-hu coat selection"
@@ -237,7 +212,7 @@
allowed_roles = list("Security Officer","Investigator","Warden")
/datum/gear/faction/erisec_patch
display_name = "EPMC sleeve patch"
display_name = "PMCG sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/erisec
slot = slot_tie
faction = "Private Military Contracting Group"
@@ -257,7 +232,7 @@
/datum/gear/faction/heph_beret
display_name = "hephaestus beret"
path = /obj/item/clothing/head/beret/heph
path = /obj/item/clothing/head/beret/corporate/heph
slot = slot_head
faction = "Hephaestus Industries"
code/modules/client/preference_setup/loadout/loadout_head.dm
+12 -16
View File
@@ -25,7 +25,6 @@
bandanas["bandana, red"] = /obj/item/clothing/head/bandana/red
bandanas["bandana, captain"] = /obj/item/clothing/head/bandana/captain
bandanas["bandana, security"] = /obj/item/clothing/head/bandana/security
bandanas["bandana, security (corporate)"] = /obj/item/clothing/head/bandana/security/corp
bandanas["bandana, science"] = /obj/item/clothing/head/bandana/science
bandanas["bandana, medical"] = /obj/item/clothing/head/bandana/medical
bandanas["bandana, engineering"] = /obj/item/clothing/head/bandana/engineering
@@ -56,7 +55,6 @@
softcaps["softcap, red"] = /obj/item/clothing/head/softcap/red
softcaps["softcap, captain"] = /obj/item/clothing/head/softcap/captain
softcaps["softcap, security"] = /obj/item/clothing/head/softcap/security
softcaps["softcap, security (corporate)"] = /obj/item/clothing/head/softcap/security/corp
softcaps["softcap, science"] = /obj/item/clothing/head/softcap/science
softcaps["softcap, medical"] = /obj/item/clothing/head/softcap/medical
softcaps["softcap, engineering"] = /obj/item/clothing/head/softcap/engineering
@@ -87,7 +85,6 @@
berets["beret, red"] = /obj/item/clothing/head/beret/red
berets["beret, captain"] = /obj/item/clothing/head/beret/captain
berets["beret, security"] = /obj/item/clothing/head/beret/security
berets["beret, security (corporate)"] = /obj/item/clothing/head/beret/security/corp
berets["beret, science"] = /obj/item/clothing/head/beret/science
berets["beret, medical"] = /obj/item/clothing/head/beret/medical
berets["beret, engineering"] = /obj/item/clothing/head/beret/engineering
@@ -113,10 +110,10 @@
/datum/gear/head/warden/New()
..()
var/list/wardenhead = list()
wardenhead["warden hat, standard"] = /obj/item/clothing/head/warden
wardenhead["warden hat, corporate"] = /obj/item/clothing/head/warden/corp
wardenhead["warden beret, standard"] = /obj/item/clothing/head/beret/security/warden
wardenhead["warden beret, corporate"] = /obj/item/clothing/head/beret/security/warden/corp
wardenhead["warden hat, zavod"] = /obj/item/clothing/head/warden
wardenhead["warden hat, idris"] = /obj/item/clothing/head/warden/idris
wardenhead["warden hat, pmc"] = /obj/item/clothing/head/warden/pmc
wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden
gear_tweaks += new /datum/gear_tweak/path(wardenhead)
/datum/gear/head/hos
@@ -128,10 +125,8 @@
/datum/gear/head/hos/New()
..()
var/list/hoshead = list()
hoshead["head of security hat, standard"] = /obj/item/clothing/head/hos
hoshead["head of security hat, corporate"] = /obj/item/clothing/head/hos/corp
hoshead["head of security beret, standard"] = /obj/item/clothing/head/beret/security/hos
hoshead["head of security beret, corporate"] = /obj/item/clothing/head/beret/security/hos/corp
hoshead["head of security hat"] = /obj/item/clothing/head/hos
hoshead["head of security beret"] = /obj/item/clothing/head/beret/security/hos
gear_tweaks += new /datum/gear_tweak/path(hoshead)
/datum/gear/head/hardhat
@@ -247,16 +242,17 @@
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
path = /obj/item/clothing/head/surgery/pmc
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
/datum/gear/head/surgical/New()
..()
var/list/surgical = list()
surgical["surgical cap, purple"] = /obj/item/clothing/head/surgery/purple
surgical["surgical cap, blue"] = /obj/item/clothing/head/surgery/blue
surgical["surgical cap, green"] = /obj/item/clothing/head/surgery/green
surgical["surgical cap, black"] = /obj/item/clothing/head/surgery/black
surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
surgical["surgical cap, PMCG blue"] = /obj/item/clothing/head/surgery/pmc
surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
surgical["surgical cap, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris
gear_tweaks += new /datum/gear_tweak/path(surgical)
/datum/gear/head/headbando
code/modules/client/preference_setup/loadout/loadout_suit.dm
+1 -3
View File
@@ -117,9 +117,7 @@ datum/gear/suit/colorvest
..()
var/list/medical_outerwear = list()
medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig
medical_outerwear["first responder vest"] = /obj/item/clothing/suit/storage/medical_chest_rig/first_responder
medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/alt
medical_outerwear["first responder jacket, alt"] = /obj/item/clothing/suit/storage/toggle/fr_jacket // this variant is the old bright green one and doesn't go with the NT medic uniform
medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket
gear_tweaks += new /datum/gear_tweak/path(medical_outerwear)
/datum/gear/suit/iac_outerwear
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+7 -20
View File
@@ -95,16 +95,18 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
path = /obj/item/clothing/under/rank/medical/surgeon/zavod
allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
/datum/gear/uniform/scrubs/New()
..()
var/list/scrubs = list()
scrubs["scrubs, black"] = /obj/item/clothing/under/rank/medical/black
scrubs["scrubs, blue"] = /obj/item/clothing/under/rank/medical/blue
scrubs["scrubs, green"] = /obj/item/clothing/under/rank/medical/green
scrubs["scrubs, purple"] = /obj/item/clothing/under/rank/medical/purple
scrubs["scrubs, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon
scrubs["scrubs, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
scrubs["scrubs, PMCG blue"] = /obj/item/clothing/under/rank/medical/surgeon/pmc
scrubs["scrubs, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
scrubs["scrubs, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris
gear_tweaks += new /datum/gear_tweak/path(scrubs)
/datum/gear/uniform/dress
@@ -279,21 +281,6 @@
path = /obj/item/clothing/under/kimono
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/detective
display_name = "uniforms, (Investigations)"
description = "A selection of Investigations staff uniforms."
path = /obj/item/clothing/under/det
allowed_roles = list("Investigator")
/datum/gear/uniform/detective/New()
..()
var/list/uniform = list()
uniform["investigator uniform, tan"] = /obj/item/clothing/under/det
uniform["investigator uniform, grey"] = /obj/item/clothing/under/det/forensics
uniform["investigator uniform, black"] = /obj/item/clothing/under/det/black
uniform["investigator uniform, brown"] = /obj/item/clothing/under/det/classic
gear_tweaks += new /datum/gear_tweak/path(uniform)
/datum/gear/uniform/circuitry
display_name = "jumpsuit, circuitry (empty)"
path = /obj/item/clothing/under/circuitry
code/modules/clothing/clothing.dm
+31 -18
View File
@@ -1039,13 +1039,24 @@
else
worn_state = icon_state
//autodetect rollability
if(rolled_down < 0)
if (!SSicon_cache.uniform_states)
SSicon_cache.setup_uniform_mappings()
//autodetect rollability. now working with contained sprites!
var/icon/under_icon = INV_W_UNIFORM_DEF_ICON
if(rolled_down < 0 || rolled_sleeves < 0)
if(contained_sprite)
under_icon = icon
else if(icon_override)
under_icon = icon_override
else if(item_icons && item_icons[slot_w_uniform_str])
under_icon = item_icons[slot_w_uniform_str]
if (SSicon_cache.uniform_states["[worn_state]_d_s"])
if(rolled_down < 0)
if("[worn_state]_d[contained_sprite ? "_un" : "_s"]" in icon_states(under_icon))
rolled_down = 0
verbs += /obj/item/clothing/under/proc/rollsuit
if(rolled_sleeves < 0)
if("[worn_state]_r[contained_sprite ? "_un" : "_s"]" in icon_states(under_icon))
rolled_sleeves = 0
verbs += /obj/item/clothing/under/proc/rollsleeves
/obj/item/clothing/under/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
var/image/I = ..()
@@ -1129,9 +1140,10 @@
return our_image
/obj/item/clothing/under/update_clothing_icon()
if (ismob(src.loc))
if(ismob(src.loc))
var/mob/M = src.loc
M.update_inv_w_uniform()
playsound(M, /decl/sound_category/rustle_sound, 15, 1, -5)
/obj/item/clothing/under/examine(mob/user)
..(user)
@@ -1195,19 +1207,18 @@
set src in usr
set_sensors(usr)
/obj/item/clothing/under/verb/rollsuit()
set name = "Roll Down Jumpsuit"
/obj/item/clothing/under/proc/rollsuit()
set name = "Roll Up/Down Jumpsuit"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
update_rolldown_status()
if(rolled_down == -1)
to_chat(usr, SPAN_NOTICE("You cannot roll down [src]!"))
to_chat(usr, SPAN_NOTICE("You cannot roll down \the [src]!"))
if((rolled_sleeves == 1) && !(rolled_down))
rolled_sleeves = 0
return
update_rolldown_status()
rolled_down = !rolled_down
if(rolled_down)
@@ -1216,28 +1227,30 @@
item_state = "[initial(item_state)]_d"
else
item_state_slots[slot_w_uniform_str] = "[worn_state]_d"
to_chat(usr, SPAN_NOTICE("You roll up \the [src]."))
else
body_parts_covered = initial(body_parts_covered)
if(contained_sprite || !LAZYLEN(item_state_slots))
item_state = initial(item_state)
else
item_state_slots[slot_w_uniform_str] = "[worn_state]"
to_chat(usr, SPAN_NOTICE("You roll down \the [src]."))
update_clothing_icon()
/obj/item/clothing/under/verb/rollsleeves()
set name = "Roll Up Sleeves"
/obj/item/clothing/under/proc/rollsleeves()
set name = "Roll Up/Down Sleeves"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
update_rollsleeves_status()
if(rolled_sleeves == -1)
to_chat(usr, SPAN_NOTICE("You cannot roll up your [src]'s sleeves!"))
to_chat(usr, SPAN_NOTICE("You cannot roll up \the [src]'s sleeves!"))
return
if(rolled_down == 1)
to_chat(usr, SPAN_NOTICE("You must roll up your [src] first!"))
to_chat(usr, SPAN_NOTICE("You must roll up \the [src] first!"))
return
update_rollsleeves_status()
rolled_sleeves = !rolled_sleeves
if(rolled_sleeves)
@@ -1246,14 +1259,14 @@
item_state = "[initial(item_state)]_r"
else
item_state_slots[slot_w_uniform_str] = "[worn_state]_r"
to_chat(usr, SPAN_NOTICE("You roll up your [src]'s sleeves."))
to_chat(usr, SPAN_NOTICE("You roll up \the [src]'s sleeves."))
else
body_parts_covered = initial(body_parts_covered)
if(contained_sprite || !LAZYLEN(item_state_slots))
item_state = initial(item_state)
else
item_state_slots[slot_w_uniform_str] = "[worn_state]"
to_chat(usr, SPAN_NOTICE("You roll down your [src]'s sleeves."))
to_chat(usr, SPAN_NOTICE("You roll down \the [src]'s sleeves."))
update_clothing_icon()
/obj/item/clothing/under/rank/Initialize()
code/modules/clothing/factions/dominia.dm
+1 -4
View File
@@ -132,9 +132,6 @@
item_state = "dominia_uniform_red"
contained_sprite = TRUE
rolled_sleeves = FALSE
rolled_down = FALSE
/obj/item/clothing/under/dominia/black
icon = 'icons/clothing/under/uniforms/dominia_uniform_black.dmi'
icon_state = "dominia_uniform_black"
@@ -533,4 +530,4 @@
/obj/item/clothing/under/dominia/dress/fancy/sleeveless/kazhkz
name = "sleeveless house kazhkz Morozi dress"
house = "kazhkz"
house = "kazhkz"
code/modules/clothing/glasses/glasses.dm
+10 -10
View File
@@ -660,15 +660,15 @@ BLIND // can't see anything
desc = "Fat sunglasses in the colours of Zavodskoi Interstellar. They come with a red-tinted HUD."
icon_state = "bigsunglasses_hud_zavod"
/obj/item/clothing/glasses/sunglasses/sechud/epmc
name = "EPMC HUDsunglasses"
/obj/item/clothing/glasses/sunglasses/sechud/pmc
name = "PMCG HUDsunglasses"
desc = "Sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
icon_state = "sunhud_epmc"
icon_state = "sunhud_pmc"
/obj/item/clothing/glasses/sunglasses/sechud/big/epmc
name = "fat EPMC HUDsunglasses"
/obj/item/clothing/glasses/sunglasses/sechud/big/pmc
name = "fat PMCG HUDsunglasses"
desc = "Fat sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
icon_state = "bigsunglasses_hud_epmc"
icon_state = "bigsunglasses_hud_pmc"
/obj/item/clothing/glasses/sunglasses/sechud/idris
name = "Idris HUDsunglasses"
@@ -756,11 +756,11 @@ BLIND // can't see anything
icon_state = "aviator_sec_zavod"
off_state = "aviator_sec_zavod_off"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
name = "EPMC HUD aviators"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc
name = "PMCG HUD aviators"
desc = "Eridani PMC security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay."
icon_state = "aviator_sec_epmc"
off_state = "aviator_sec_epmc_off"
icon_state = "aviator_sec_pmc"
off_state = "aviator_sec_pmc_off"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/idris
name = "Idris HUD aviators"
code/modules/clothing/head/bandanas.dm
-8
View File
@@ -94,11 +94,3 @@
desc = "It's a janitor bandana with some fine nanotech lining. For the viscera cleaners of today!"
icon_state = "bandana_janitor"
item_state = "bandana_janitor"
// Corporate.
/obj/item/clothing/head/bandana/security/corp
name = "corporate security bandana"
desc = "It's a security bandana with some fine nanotech lining. Who knew a do-rag could be so oppresive?"
icon_state = "corp"
item_state = "corp"
code/modules/clothing/head/berets.dm
+44 -60
View File
@@ -98,86 +98,76 @@
icon_state = "beret_hos"
item_state = "beret_hos"
/obj/item/clothing/head/beret/security/hos/corp
name = "corporate commander beret"
desc = "A beret in corporate black with a commander's rank emblem. For heads of security that are more inclined towards style than safety."
icon_state = "corp"
item_state = "corp"
/obj/item/clothing/head/beret/security/warden
name = "warden beret"
desc = "A beret in security navy blue with a warden's rank emblem. For wardens that are more inclined towards style than safety."
icon_state = "beret_warden"
item_state = "beret_warden"
/obj/item/clothing/head/beret/security/warden/corp
name = "corporate warden beret"
desc = "A beret in corporate black with a warden's rank emblem. For wardens that are more inclined towards style than safety."
icon_state = "corp"
item_state = "corp"
// Corporate.
/obj/item/clothing/head/beret/security/corp
name = "corporate security beret"
desc = "A beret in corporate black. For those who pledge allegiance to no flag nor banner, but their paycheck."
icon_state = "corp"
item_state = "corp"
/obj/item/clothing/head/beret/security/idris
name = "idris beret"
desc = "A beret with the Idris Incorporated insignia emblazoned on it in a gold finish."
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/head/beret/security/idris/alt
name = "idris beret"
desc = "A beret with the Idris Incorporated insignia emblazoned on it in a cyan finish."
icon_state = "idrisalt"
item_state = "idrisalt"
/obj/item/clothing/head/beret/security/zavodskoi
name = "zavodskoi interstellar security beret"
desc = "A black beret with the Zavodskoi Interstellar insignia emblazoned on it."
icon_state = "necrosec"
item_state = "necrosec"
/obj/item/clothing/head/beret/security/zavodskoi/alt
name = "zavodskoi interstellar security beret"
desc = "A brown beret with the Zavodskoi Interstellar insignia emblazoned on it."
icon_state = "necrosecalt"
item_state = "necrosecalt"
/obj/item/clothing/head/beret/security/eri
name = "eridani security beret"
desc = "A beret with the Eridani PMC insignia emblazoned on it."
icon_state = "eridani"
item_state = "eridani"
/obj/item/clothing/head/beret/iac
name = "IAC beret"
desc = "A beret with the IAC insignia emblazoned on it."
icon_state = "iac"
item_state = "iac"
/obj/item/clothing/head/beret/zeng
/obj/item/clothing/head/beret/corporate
name = "nanotrasen beret"
desc = "A beret with the NanoTrasen insignia emblazoned on it."
icon_state = "nt"
item_state = "nt"
/obj/item/clothing/head/beret/corporate/zeng
name = "zeng-hu beret"
desc = "A purple beret with the Zeng-Hu insignia emblazoned on it."
desc = "A beret with the Zeng-Hu insignia emblazoned on it."
icon_state = "zenghu"
item_state = "zenghu"
/obj/item/clothing/head/beret/zeng/alt
name = "zeng-hu beret"
desc = "A white beret with the Zeng-Hu insignia emblazoned on it."
/obj/item/clothing/head/beret/corporate/zeng/alt
icon_state = "zenghualt"
item_state = "zenghualt"
/obj/item/clothing/head/beret/heph
/obj/item/clothing/head/beret/corporate/zavod
name = "zavodskoi interstellar beret"
desc = "A beret with the Zavodskoi Interstellar insignia emblazoned on it."
icon_state = "zav"
item_state = "zav"
/obj/item/clothing/head/beret/corporate/zavod/alt
icon_state = "zavalt"
item_state = "zavalt"
/obj/item/clothing/head/beret/corporate/heph
name = "hephaestus beret"
desc = "A green beret with the Hephaestus insignia emblazoned on it."
icon_state = "heph"
item_state = "heph"
/obj/item/clothing/head/beret/corporate/pmc
name = "eridani beret"
desc = "A beret with the Eridani PMC insignia emblazoned on it."
icon_state = "pmc"
item_state = "pmc"
/obj/item/clothing/head/beret/corporate/idris
name = "idris beret"
desc = "A beret with the Idris Incorporated insignia emblazoned on it."
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/head/beret/corporate/idris/alt
icon_state = "idrisalt"
item_state = "idrisalt"
/obj/item/clothing/head/beret/corporate/orion
name = "orion express beret"
desc = "A beret with the Orion Express insignia emblazoned on it."
icon_state = "orion"
item_state = "orion"
// TCFL
/obj/item/clothing/head/beret/legion
name = "TCFL dress beret"
desc = "A pale blue dress beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". A common good luck charm among former legionaires."
@@ -198,12 +188,6 @@
//centcom
/obj/item/clothing/head/beret/centcom/liaison
name = "corporate liaison beret"
desc = "A stylish beret worn by corporate liaisons."
icon_state = "centcomofficer"
item_state = "centcomofficer"
/obj/item/clothing/head/beret/centcom/officer
name = "officers beret"
desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces."
code/modules/clothing/head/jobs.dm
+43 -71
View File
@@ -50,8 +50,8 @@
desc = "A stylish cap issued to the bridge crew of SCC vessels."
icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
contained_sprite = TRUE
icon_state = "bridge_officer_cap"
item_state = "bridge_officer_cap"
icon_state = "bridge_crew_cap"
item_state = "bridge_crew_cap"
//Chaplain
/obj/item/clothing/head/chaplain_hood
@@ -68,45 +68,46 @@
flags_inv = BLOCKHAIR
//Medical
/obj/item/clothing/head/headmirror
name = "otolaryngologist's mirror"
desc = "Turn your head and cough."
desc_fluff = "That's an Ear, Nose and/or Throat surgeon to you, mister."
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
contained_sprite = TRUE
icon_state = "headmirror"
item_state = "headmirror"
/obj/item/clothing/head/surgery
name = "surgical cap"
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
icon_state = "surgcap_blue"
flags_inv = BLOCKHEADHAIR
/obj/item/clothing/head/surgery/purple
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."
icon_state = "surgcap_purple"
/obj/item/clothing/head/surgery/blue
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
icon_state = "surgcap_blue"
/obj/item/clothing/head/surgery/green
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
icon_state = "surgcap_green"
/obj/item/clothing/head/surgery/black
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is black."
icon_state = "surgcap_black"
/obj/item/clothing/head/surgery/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
contained_sprite = TRUE
icon_state = "surgcap_nt"
item_state = "surgcap_nt"
contained_sprite = TRUE
flags_inv = BLOCKHEADHAIR
/obj/item/clothing/head/surgery/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
contained_sprite = TRUE
icon_state = "surgcap_zeng"
item_state = "surgcap_zeng"
/obj/item/clothing/head/surgery/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
contained_sprite = TRUE
icon_state = "surgcap_epmc"
item_state = "surgcap_epmc"
icon_state = "surgcap_pmc"
item_state = "surgcap_pmc"
/obj/item/clothing/head/surgery/pmc
icon_state = "surgcap_pmc"
item_state = "surgcap_pmc"
// Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily.
/obj/item/clothing/head/surgery/zavod
icon_state = "surgcap_zav"
item_state = "surgcap_zav"
/obj/item/clothing/head/surgery/idris
icon_state = "surgcap_idris"
item_state = "surgcap_idris"
//Detective
@@ -132,72 +133,43 @@
/obj/item/clothing/head/warden
name = "warden hat"
desc = "A blue warden hat. For showing who is in charge of the brig."
icon = 'icons/obj/clothing/hats/security.dmi'
icon_state = "warden"
item_state = "warden"
desc = "A warden hat. For showing who is in charge of the brig."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_warden_hat"
item_state = "nt_warden_hat"
flags_inv = HIDEEARS
contained_sprite = TRUE
/obj/item/clothing/head/warden/corp
name = "corporate warden hat"
desc = "A black warden parade hat. For showing who is in charge of the brig."
icon_state = "corp"
item_state = "corp"
/obj/item/clothing/head/warden/zavod
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "zav_warden_hat"
item_state = "zav_warden_hat"
contained_sprite = TRUE
/obj/item/clothing/head/warden/pmc
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "epmc_warden_hat"
item_state = "epmc_warden_hat"
contained_sprite = TRUE
icon_state = "pmc_warden_hat"
item_state = "pmc_warden_hat"
/obj/item/clothing/head/warden/idris
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "idris_warden_hat"
item_state = "idris_warden_hat"
contained_sprite = TRUE
/obj/item/clothing/head/hos
name = "head of security hat"
desc = "The navy blue parade hat of the Head of Security. For showing the officers who's in charge."
icon = 'icons/obj/clothing/hats/security.dmi'
icon_state = "hos"
item_state = "hos"
flags_inv = HIDEEARS
contained_sprite = TRUE
/obj/item/clothing/head/hos/scc
icon = 'icons/obj/contained_items/department_uniforms/command.dmi'
icon_state = "hos_hat"
item_state = "hos_hat"
/obj/item/clothing/head/hos/corp
name = "corporate head of security hat"
desc = "The black parade hat of the Head of Security. For showing the officers who's in charge."
icon_state = "corp"
item_state = "corp"
flags_inv = HIDEEARS
contained_sprite = TRUE
/obj/item/clothing/head/flatcap/bartender
name = "bartender flatcap"
desc = "An simple hat issued to bartenders."
icon_state = "corp"
/obj/item/clothing/head/flatcap/bartender/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
desc = "An simple hat issued to bartenders. This one has Idris colors."
contained_sprite = TRUE
icon_state = "idris_bartender_flatcap"
item_state = "idris_bartender_flatcap"
/obj/item/clothing/head/flatcap/bartender/nt
desc = "An simple hat issued to bartenders. This one has NanoTrasen colors."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_bartender_flatcap"
item_state = "nt_bartender_flatcap"
/obj/item/clothing/head/flatcap/bartender/idris
icon_state = "idris_bartender_flatcap"
item_state = "idris_bartender_flatcap"
code/modules/clothing/head/soft_caps.dm
+22 -32
View File
@@ -101,7 +101,7 @@
/obj/item/clothing/head/softcap/cargo
name = "cargo softcap"
desc = "It's a peaked cap in a dusty yellow and grey."
desc = "It's a peaked cap in a dusty yellow and black."
icon_state = "softcap_cargo"
item_state = "softcap_cargo"
@@ -113,70 +113,60 @@
/obj/item/clothing/head/softcap/janitor
name = "janitor softcap"
desc = "It's a peaked cap in a sanitary purple and yellow."
icon_state = "softcap_janitor"
item_state = "softcap_janitor"
/obj/item/clothing/head/softcap/janitor/nt
desc = "It's a peaked cap, freshly sanitized and ready for a day of viscera cleanup."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_janitor_cap"
item_state = "nt_janitor_cap"
/obj/item/clothing/head/softcap/janitor/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "idris_janitor_cap"
item_state = "idris_janitor_cap"
// Corporate.
/obj/item/clothing/head/softcap/security/corp
name = "corporate security cap"
desc = "It's field cap in corporate colors. In an oppresive grey, no doubt."
icon_state = "corp"
item_state = "corp"
/obj/item/clothing/head/softcap/security/idris
name = "idris cap"
desc = "It's a company-issue Idris cap. Comes with flagrant corporate branding."
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/head/softcap/iac
name = "IAC cap"
desc = "An IAC cap. Standard issue and utilitarian."
icon_state = "iac"
item_state = "iac"
/obj/item/clothing/head/softcap/eri
/obj/item/clothing/head/softcap/idris
name = "idris cap"
desc = "It's a company-issue Idris cap. Comes with flagrant corporate branding."
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/head/softcap/pmc
name = "eridani cap"
desc = "A grey EPMC fatigue cap with the symbol of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection."
icon_state = "eridani"
item_state = "eridani"
desc = "A grey PMCG fatigue cap with the symbol of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection."
icon_state = "pmc"
item_state = "pmc"
/obj/item/clothing/head/softcap/zavod
name = "zavodskoi cap"
desc = "A black company-issue Zavokdskoi cap with the symbol of the corporation at its front."
icon_state = "zavodb"
item_state = "zavodb"
desc = "A tan company-issue Zavokdskoi cap with the symbol of the corporation at its front."
icon_state = "zav"
item_state = "zav"
/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"
icon_state = "zavalt"
item_state = "zavalt"
/obj/item/clothing/head/softcap/medical/zeng
desc = "A medical cap in Zeng-Hu colors."
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
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 = 'icons/obj/contained_items/department_uniforms/medical.dmi'
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"
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "pmc_emt_cap"
item_state = "pmc_emt_cap"
code/modules/clothing/suits/armor.dm
+11 -2
View File
@@ -361,9 +361,10 @@
icon_badge = "forensictech_badge"
icon_nobadge = "forensictech_nobadge"
/obj/item/clothing/suit/storage/hazardvest/cadet
/obj/item/clothing/suit/storage/hazardvest/security
name = "cadet hazard vest"
desc = "A sturdy high-visibility vest intended for in training security personnel."
desc = "A sturdy high-visibility vest intended for training security personnel."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "hazard_cadet"
item_state = "hazard_cadet"
allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight)
@@ -373,6 +374,14 @@
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
contained_sprite = TRUE
/obj/item/clothing/suit/storage/hazardvest/security/officer
name = "officer hazard jacket"
desc = "A sturdy high-visibility jacket for the on the beat officer."
icon_state = "hazard_officer"
item_state = "hazard_officer"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/vest/heavy/officer
name = "officer heavy armor vest"
code/modules/clothing/suits/jobs.dm
+107 -61
View File
@@ -153,12 +153,25 @@ 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 detectives."
icon_state = "det_jacket"
item_state = "det_jacket"
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_invest_coat"
item_state = "nt_invest_coat"
contained_sprite = TRUE
blood_overlay_type = "coat"
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_state = "zav_invest_coat"
item_state = "zav_invest_coat"
/obj/item/clothing/suit/storage/det_jacket/pmc
icon_state = "pmc_invest_coat"
item_state = "pmc_invest_coat"
/obj/item/clothing/suit/storage/det_jacket/idris
icon_state = "idris_invest_coat"
item_state = "idris_invest_coat"
/obj/item/clothing/suit/storage/toggle/det_trench
name = "brown trenchcoat"
desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!"
@@ -181,24 +194,6 @@ 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"
@@ -207,6 +202,29 @@ obj/item/clothing/suit/apron/overalls/blue
icon_state = "forensicsdnavy"
item_state = "forensicsdnavy"
//Corporate
/obj/item/clothing/suit/storage/toggle/warden
name = "warden's coat"
desc = "A thick, rugged overcoat, with corporate livery emblazoned on it."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_warden_coat"
item_state = "nt_warden_coat"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/warden/zavod
icon_state = "zav_warden_coat"
item_state = "zav_warden_coat"
/obj/item/clothing/suit/storage/toggle/warden/pmc
icon_state = "pmc_warden_coat"
item_state = "pmc_warden_coat"
/obj/item/clothing/suit/storage/toggle/warden/idris
icon_state = "idris_warden_coat"
item_state = "idris_warden_coat"
//Engineering
/obj/item/clothing/suit/storage/hazardvest
name = "hazard vest"
@@ -263,6 +281,16 @@ obj/item/clothing/suit/apron/overalls/blue
icon_state = "hazard_ce"
item_state = "hazard_ce"
/obj/item/clothing/suit/storage/iacvest // todo : make this hazard vest subtype
desc = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps as a high-visibility vest, over any other clothing. The I.A.C. logo is prominently displayed on the back of the vest, between the shoulders."
name = "IAC vest"
icon_state = "iac_vest"
item_state = "iac_vest"
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
//Lawyer
/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
name = "blue suit jacket"
@@ -282,14 +310,40 @@ obj/item/clothing/suit/apron/overalls/blue
body_parts_covered = UPPER_TORSO|ARMS
//Internal Affairs
/obj/item/clothing/suit/storage/toggle/liaison
name = "liaison jacket"
desc = "A smooth black jacket."
icon_state = "ia_jacket"
item_state = "ia_jacket"
/obj/item/clothing/suit/storage/liaison
name = "liaison vest"
desc = "A smooth suit vest. Freshly drycleaned, ready for a day of firm handshakes and dynamic synergy paradigm shifts."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_liaison_vest"
item_state = "nt_liaison_vest"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
opened = TRUE
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO
/obj/item/clothing/suit/storage/liaison/zeng
icon_state = "zeng_liaison_vest"
item_state = "zeng_liaison_vest"
/obj/item/clothing/suit/storage/liaison/zavod
icon_state = "zav_liaison_vest"
item_state = "zav_liaison_vest"
/obj/item/clothing/suit/storage/liaison/heph
icon_state = "heph_liaison_vest"
item_state = "heph_liaison_vest"
/obj/item/clothing/suit/storage/liaison/pmc
icon_state = "pmc_liaison_vest"
item_state = "pmc_liaison_vest"
/obj/item/clothing/suit/storage/liaison/idris
icon_state = "idris_liaison_vest"
item_state = "idris_liaison_vest"
/obj/item/clothing/suit/storage/liaison/orion
icon_state = "orion_liaison_vest"
item_state = "orion_liaison_vest"
//Resprited from IAA jacket
/obj/item/clothing/suit/storage/toggle/suitjacket
@@ -321,33 +375,25 @@ obj/item/clothing/suit/apron/overalls/blue
/obj/item/clothing/suit/storage/toggle/fr_jacket
name = "first responder jacket"
desc = "A high-visibility jacket worn by medical first responders."
icon_state = "fr_jacket"
item_state = "fr_jacket"
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
contained_sprite = TRUE
icon_state = "nt_emt_jacket"
item_state = "nt_emt_jacket"
blood_overlay_type = "armor"
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/head/hardhat/first_responder)
body_parts_covered = UPPER_TORSO|ARMS
opened = TRUE
/obj/item/clothing/suit/storage/toggle/fr_jacket/alt
desc = "A dark green first responder jacket."
icon = 'icons/clothing/kit/first_responder.dmi'
contained_sprite = TRUE
icon_state = "firstresponderjacket"
item_state = "firstresponderjacket"
/obj/item/clothing/suit/storage/toggle/fr_jacket/zeng
desc = "A first responder jacket in the classic white and purple of Zeng-Hu Pharmaceuticals."
icon = 'icons/clothing/suits/coats/zeng_responder.dmi'
contained_sprite = TRUE
icon_state = "zengresponderjacket"
item_state = "zengresponderjacket"
icon_state = "zeng_emt_jacket"
item_state = "zeng_emt_jacket"
/obj/item/clothing/suit/storage/toggle/fr_jacket/pmc
desc = "A first responder jacket in the classic black and blue of the PMCG."
icon_state = "pmc_emt_jacket"
item_state = "pmc_emt_jacket"
/obj/item/clothing/suit/storage/toggle/fr_jacket/ems
name = "\improper EMS jacket"
desc = "A dark blue, martian-pattern, EMS jacket. It sports high-visibility reflective stripes and a star of life on the back."
icon_state = "ems_jacket"
item_state = "ems_jacket"
/obj/item/clothing/suit/storage/medical_chest_rig
name = "medic chest-rig"
@@ -359,14 +405,6 @@ obj/item/clothing/suit/apron/overalls/blue
/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/head/hardhat/first_responder)
body_parts_covered = UPPER_TORSO
/obj/item/clothing/suit/storage/medical_chest_rig/first_responder
name = "first responder vest"
desc = "A dark green vest adorned with high-visibility stripes. Has pouches to carry equipment with."
icon = 'icons/clothing/kit/first_responder.dmi'
contained_sprite = TRUE
icon_state = "firstrespondervest"
item_state = "firstrespondervest"
//Mime
/obj/item/clothing/suit/suspenders
name = "suspenders"
@@ -376,19 +414,27 @@ obj/item/clothing/suit/apron/overalls/blue
blood_overlay_type = "armor" //it's the less thing that I can put here
body_parts_covered = 0
// Bartender
/obj/item/clothing/suit/storage/bartender
name = "bartender jacket"
desc = "A fancy jacket worn by corporate bartenders."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_bartender_jacket"
item_state = "nt_bartender_jacket"
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/storage/bartender/nt
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_bartender_jacket"
item_state = "nt_bartender_jacket"
/obj/item/clothing/suit/storage/bartender/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "idris_bartender_jacket"
item_state = "idris_bartender_jacket"
item_state = "idris_bartender_jacket"
// Machinist
/obj/item/clothing/suit/storage/machinist
name = "machinist jacket"
desc = "Functional, rugged durability. The perfect workwear for tinkering with muscle cars, robots and giant mechas."
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
icon_state = "machinist_jacket"
item_state = "machinist_jacket"
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
code/modules/clothing/suits/labcoat.dm
+14 -58
View File
@@ -29,93 +29,49 @@
desc = "A labcoat with command gold highlights."
icon_state = "labcoat_cmoalt2"
/obj/item/clothing/suit/storage/toggle/labcoat/medical
name = "medical labcoat"
desc = "A suit that protects against minor chemical spills. Has a green stripe on the shoulder."
icon_state = "labcoat_med"
/obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
name = "pharmacist labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
icon_state = "labcoat_chem"
/obj/item/clothing/suit/storage/toggle/labcoat/psych
name = "psychiatrist labcoat"
desc = "A suit that protects against minor chemical spills. Has a teal stripe on the shoulder."
icon_state = "labcoat_psych"
/obj/item/clothing/suit/storage/toggle/labcoat/surgeon
name = "surgeon labcoat"
desc = "A suit that protects against minor chemical spills. Has a light blue stripe on the shoulder."
icon_state = "labcoat_surgeon"
/obj/item/clothing/suit/storage/toggle/labcoat/trauma
name = "trauma physician labcoat"
desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
icon_state = "labcoat_trauma"
/obj/item/clothing/suit/storage/toggle/labcoat/science
name = "scientist labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
icon_state = "labcoat_sci"
/obj/item/clothing/suit/storage/iacvest
desc = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps as a high-visibility vest, over any other clothing. The I.A.C. logo is prominently displayed on the back of the vest, between the shoulders."
name = "IAC vest"
icon_state = "iac_vest"
item_state = "iac_vest"
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/suit/storage/toggle/labcoat/nt
name = "nt labcoat"
icon_state = "labcoat_nt"
/obj/item/clothing/suit/storage/toggle/labcoat/zeng
name = "zeng-hu labcoat"
desc = "A suit that protects against minor chemical spills. 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. Comes in Zavodskoi Interstellar colours."
icon_state = "labcoat_necro"
name = "zavodskoi interstellar labcoat"
icon_state = "labcoat_zav"
/obj/item/clothing/suit/storage/toggle/labcoat/heph
name = "hephaestus labcoat"
desc = "A suit that protects against minor chemical spills. Comes in Hephaestus colours."
icon_state = "labcoat_heph"
/obj/item/clothing/suit/storage/toggle/labcoat/epmc
name = "\improper PMCG security labcoat"
desc = "A suit that protects against minor chemical spills. Comes in PMCG colours."
icon_state = "labcoat_erisec"
/obj/item/clothing/suit/storage/toggle/labcoat/pmc
name = "PMCG labcoat"
icon_state = "labcoat_pmc"
/obj/item/clothing/suit/storage/toggle/labcoat/epmc/alt
desc = "A suit that protects against minor chemical spills. Darker than the standard issue."
icon_state = "labcoat_erisec_alt"
/obj/item/clothing/suit/storage/toggle/labcoat/epmc/med
name = "\improper PMCG medical labcoat"
desc = "A suit that protects against minor chemical spills. Comes in PMCG colours."
icon_state = "labcoat_erimed"
/obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt
icon_state = "labcoat_pmc_alt"
/obj/item/clothing/suit/storage/toggle/labcoat/iac
name = "iac labcoat"
desc = "A suit that protects against minor chemical spills. Comes in IAC colors."
icon_state = "labcoat_iac"
item_state = "labcoat_iac"
/obj/item/clothing/suit/storage/toggle/labcoat/security
name = "security labcoat"
desc = "A suit that protects against minor chemical spills. Has a dark blue stripe on the shoulder."
icon_state = "labcoat_sec"
/obj/item/clothing/suit/storage/toggle/labcoat/idris
name = "idris labcoat"
desc = "A suit that protects against minor chemical spills. Comes in Idris colours."
icon_state = "labcoat_idris"
item_state = "labcoat_idris"
/obj/item/clothing/suit/storage/toggle/labcoat/idris/alt
icon_state = "labcoat_idris_alt"
item_state = "labcoat_idris_alt"
code/modules/clothing/under/accessories/accessory.dm
+79 -3
View File
@@ -203,6 +203,7 @@
name = "bowtie"
desc = "Snazzy!"
icon_state = "bowtie"
/obj/item/clothing/accessory/stethoscope
name = "stethoscope"
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
@@ -572,7 +573,7 @@
icon_state = "qeblak_cape"
item_state = "qeblak_cape"
flippable = FALSE
/obj/item/clothing/accessory/poncho/shouldercape/weishiirobe
name = "weishii robe"
desc = "A robe denoting the wearer as a member fo the Weishii faith."
@@ -758,7 +759,7 @@
overlay_state = "necrosec_patch"
/obj/item/clothing/accessory/sleevepatch/erisec
name = "\improper EPMC sleeve patch"
name = "\improper PMCG sleeve patch"
desc = "A digital patch which can be attached to the shoulder sleeve of clothing. This one denotes the wearer as an Eridani Private Military Contractor."
icon_state = "erisec_patch"
overlay_state = "erisec_patch"
@@ -820,6 +821,80 @@
desc = "An embroidered patch indicating the wearer's blood type as AB NEGATIVE."
icon_state = "abnegtag"
// Corporate Liaison stuff.
/obj/item/clothing/accessory/tie/corporate
name = "corporate tie"
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_tie"
item_state = "nt_tie"
contained_sprite = TRUE
/obj/item/clothing/accessory/tie/corporate/zeng
icon_state = "zeng_tie"
item_state = "zeng_tie"
/obj/item/clothing/accessory/tie/corporate/zavod
icon_state = "zav_tie"
item_state = "zav_tie"
/obj/item/clothing/accessory/tie/corporate/heph
icon_state = "heph_tie"
item_state = "heph_tie"
/obj/item/clothing/accessory/tie/corporate/pmc
icon_state = "pmc_tie"
item_state = "pmc_tie"
/obj/item/clothing/accessory/tie/corporate/idris
icon_state = "idris_tie"
item_state = "idris_tie"
/obj/item/clothing/accessory/tie/corporate/orion
icon_state = "orion_tie"
item_state = "orion_tie"
/obj/item/clothing/accessory/pin/corporate
name = "corporate badge"
desc = "A shiny button which reads, <i>'Nanotrasen - The leader in all things Phoron!'</i>"
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_liaison_badge"
item_state = "nt_liaison_badge"
drop_sound = 'sound/items/drop/ring.ogg'
pickup_sound = 'sound/items/pickup/ring.ogg'
contained_sprite = TRUE
/obj/item/clothing/accessory/pin/corporate/zeng
desc = "A shiny button which reads, <i>'Zeng-Hu - Building a brighter future.'</i>"
icon_state = "zeng_liaison_badge"
item_state = "zeng_liaison_badge"
/obj/item/clothing/accessory/pin/corporate/zavod
desc = "A shiny button which reads, <i>'Zavodskoi Interstellar - Even one matters in the battlefield.'</i>"
icon_state = "zav_liaison_badge"
item_state = "zav_liaison_badge"
/obj/item/clothing/accessory/pin/corporate/heph
desc = "A shiny button which reads, <i>'Hephaestus Industries - The anvil upon which the world is shaped.'</i>"
icon_state = "heph_liaison_badge"
item_state = "heph_liaison_badge"
/obj/item/clothing/accessory/pin/corporate/pmc
desc = "A shiny button which reads, <i>'PMCG - Always on guard, always on watch.'</i>"
icon_state = "pmc_liaison_badge"
item_state = "pmc_liaison_badge"
/obj/item/clothing/accessory/pin/corporate/idris
desc = "A shiny button which reads, <i>'Idris, Inc. - Astronomical Figures. Unlimited Power.'</i>"
icon_state = "idris_liaison_badge"
item_state = "idris_liaison_badge"
/obj/item/clothing/accessory/pin/corporate/orion
desc = "A shiny button which reads, <i>'Orion Express - For all your logistical needs!'</i>"
icon_state = "orion_liaison_badge"
item_state = "orion_liaison_badge"
/obj/item/clothing/accessory/poncho/ipc_mantle
name = "\improper Burzsian shoulder mantle"
desc = "A uniform mantle made out of rudimentary metallic plates. The sigil of Burzsia is pressed into the front of it."
@@ -829,4 +904,5 @@
item_state = "Burz_gorget"
contained_sprite = TRUE
icon_override = null
body_parts_covered = UPPER_TORSO
body_parts_covered = UPPER_TORSO
code/modules/clothing/under/jobs/civilian.dm
+60 -204
View File
@@ -1,44 +1,16 @@
//Alphabetical order of civilian jobs.
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
icon_state = "ba_suit"
item_state = "ba_suit"
worn_state = "ba_suit"
/obj/item/clothing/under/rank/bartender/nt
desc = "It looks like it could use some more flair."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_bartender"
item_state = "nt_bartender"
/obj/item/clothing/under/rank/bartender/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "idris_bartender"
item_state = "idris_bartender"
/obj/item/clothing/under/rank/quartermaster
name = "quartermaster's jumpsuit"
desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
icon_state = "qm"
item_state = "lb_suit"
worn_state = "qm"
/obj/item/clothing/under/rank/cargo
name = "cargo technician's jumpsuit"
desc = "The future of cargo tech apparel: long, stuffy slacks. We never said it was a bright future."
icon_state = "cargo"
item_state = "lb_suit"
worn_state = "cargo"
/obj/item/clothing/under/rank/cargo/alt
desc = "Shooooorts! They're comfy and easy to wear!"
icon_state = "cargo_alt"
worn_state = "cargo_alt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
name = "chaplain's jumpsuit"
@@ -65,69 +37,70 @@
icon_state = "idris_chef"
item_state = "idris_chef"
/obj/item/clothing/under/rank/head_of_personnel
desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
name = "head of personnel's jumpsuit"
icon_state = "hop"
item_state = "b_suit"
worn_state = "hop"
/obj/item/clothing/under/rank/head_of_personnel_whimsy
desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
name = "head of personnel's suit"
icon_state = "hopwhimsy"
item_state = "b_suit"
worn_state = "hopwhimsy"
/obj/item/clothing/under/rank/hydroponics
desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
name = "botanist's jumpsuit"
icon_state = "hydroponics"
item_state = "g_suit"
worn_state = "hydroponics"
permeability_coefficient = 0.50
/obj/item/clothing/under/rank/hydroponics/nt
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_gardener"
item_state = "nt_gardener"
/obj/item/clothing/under/rank/hydroponics/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
permeability_coefficient = 0.50
contained_sprite = TRUE
/obj/item/clothing/under/rank/hydroponics/idris
icon_state = "idris_gardener"
item_state = "idris_gardener"
/obj/item/clothing/under/rank/liaison
desc = "The plain, professional attire of a corporate liaison. The collar is <i>immaculately</i> starched."
name = "corporate liaison uniform"
icon_state = "internalaffairs"
item_state = "ba_suit"
worn_state = "internalaffairs"
// Liaison, a.k.a. Internal Affairs
/obj/item/clothing/under/rank/liaison
name = "corporate liaison uniform"
desc = "The plain, professional attire of a corporate liaison. The collar is <i>immaculately</i> starched."
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_liaison"
item_state = "nt_liaison"
contained_sprite = TRUE
/obj/item/clothing/under/rank/liaison/zeng
icon_state = "zeng_liaison"
item_state = "zeng_liaison"
/obj/item/clothing/under/rank/liaison/zavod
icon_state = "zav_liaison"
item_state = "zav_liaison"
/obj/item/clothing/under/rank/liaison/heph
icon_state = "heph_liaison"
item_state = "heph_liaison"
/obj/item/clothing/under/rank/liaison/pmc
icon_state = "pmc_liaison"
item_state = "pmc_liaison"
/obj/item/clothing/under/rank/liaison/idris
icon_state = "idris_liaison"
item_state = "idris_liaison"
/obj/item/clothing/under/rank/liaison/orion
icon_state = "orion_liaison"
item_state = "orion_liaison"
// Janitor
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
name = "janitor's jumpsuit"
icon_state = "janitor"
worn_state = "janitor"
item_state = "janitor"
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
icon_state = "nt_janitor"
item_state = "nt_janitor"
contained_sprite = TRUE
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/janitor/nt
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_janitor"
item_state = "nt_janitor"
/obj/item/clothing/under/rank/janitor/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "idris_janitor"
item_state = "idris_janitor"
// Lawyer (to be replaced by modularization)
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "lawyer suit"
@@ -156,149 +129,38 @@
item_state = "ba_suit"
worn_state = "lawyer_purple"
// Librarian
/obj/item/clothing/under/librarian
name = "sensible suit"
desc = "It's very... sensible."
icon_state = "red_suit"
item_state = "lawyer_red"
worn_state = "red_suit"
/obj/item/clothing/under/librarian/nt
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_librarian"
item_state = "nt_librarian"
/obj/item/clothing/under/librarian/idris
icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "idris_librarian"
item_state = "idris_librarian"
/obj/item/clothing/under/mime
name = "mime's outfit"
desc = "It's not very colourful."
icon_state = "mime"
item_state = "ba_suit"
worn_state = "mime"
// Miner
/obj/item/clothing/under/rank/miner
desc = "It's a snappy miner's jumpsuit, sans overalls and caked with dirt."
desc = "It's a snappy miner's jumpsuit, complete with overalls and caked-on dirt."
name = "miner's jumpsuit"
icon_state = "miner"
item_state = "lb_suit"
worn_state = "miner"
/obj/item/clothing/under/rank/miner/heph
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "nt_miner"
item_state = "nt_miner"
/obj/item/clothing/under/rank/miner/heph
icon_state = "heph_miner"
item_state = "heph_miner"
/obj/item/clothing/under/rank/miner/orion
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "orion_miner"
item_state = "orion_miner"
/obj/item/clothing/under/rank/hephaestus
name = "Hephaestus Industries engineer uniform"
desc = "A uniform worn by Hephaestus Industries engineers."
icon_state = "heph_engineer"
worn_state = "heph_engineer"
armor = list(
rad = ARMOR_RAD_MINOR
)
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/hephaestus/tech
name = "Hephaestus Industries technician uniform"
desc = "A uniform worn by Hephaestus Industries technicians."
icon_state = "heph_technician"
worn_state = "heph_technician"
/obj/item/clothing/under/rank/hephaestus/research
name = "Hephaestus Industries research uniform"
desc = "A uniform worn by Hephaestus Industries researchers."
icon_state = "heph_research"
worn_state = "heph_research"
permeability_coefficient = 0.50
armor = list(
rad = ARMOR_RAD_MINOR
)
/obj/item/clothing/under/rank/zavodskoi
name = "Zavodskoi Interstellar uniform"
desc = "A uniform worn by Zavodskoi Interstellar employees and contractors."
icon_state = "necro"
worn_state = "necro"
/obj/item/clothing/under/rank/zavodskoi/research
name = "Zavodskoi Interstellar research uniform"
desc = "A uniform worn by Zavodskoi Interstellar researchers."
icon_state = "necro_research"
worn_state = "necro_research"
permeability_coefficient = 0.50
armor = list(
bomb = ARMOR_BOMB_MINOR
)
/obj/item/clothing/under/rank/zavodskoi/research/alt
icon_state = "necro_research_alt"
worn_state = "necro_research_alt"
/obj/item/clothing/under/rank/idris
name = "Idris Incorporated uniform"
desc = "A uniform worn by Idris Incorporated employees and contractors."
icon_state = "idris_service"
worn_state = "idris_service"
/obj/item/clothing/under/rank/idris/service
name = "Idris Incorporated service uniform"
desc = "A uniform worn by Idris Incorporated service personnel."
/obj/item/clothing/under/rank/idris/service/alt
icon_state = "idris_service_alt"
worn_state = "idris_service_alt"
/obj/item/clothing/under/rank/einstein_engines
name = "Einstein Engines uniform"
desc = "A uniform worn by Einstein Engines Incorporated employees and contractors."
icon_state = "einstein"
worn_state = "einstein"
armor = list(
rad = ARMOR_RAD_MINOR
)
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(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/zeng/alt
icon_state = "zeng_research_alt"
worn_state = "zeng_research_alt"
/obj/item/clothing/under/rank/zeng/civilian
name = "Zeng-Hu civilian uniform"
desc = "A uniform worn by Zeng-Hu employees."
icon_state = "zeng_service"
worn_state = "zeng_service"
/obj/item/clothing/under/rank/eridani_medic
name = "Eridani PMC medic uniform"
desc = "A uniform worn by Eridani PMC paramedics."
icon_state = "eridani_medic"
worn_state = "eridani_medic"
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/operations_manager
name = "operations manager's jumpsuit"
desc = "A uniform worn by the operations manager. It has the SCC insignia on it."
@@ -309,20 +171,17 @@
/obj/item/clothing/under/rank/hangar_technician
name = "hangar technician's jumpsuit"
desc = "A practical uniform used by hangar technicians."
icon_state = "cargo"
item_state = "lb_suit"
worn_state = "cargo"
desc = "The future of hangar tech apparel: long, stuffy slacks. We never said it was a bright future."
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
icon_state = "nt_tech"
item_state = "nt_tech"
contained_sprite = TRUE
/obj/item/clothing/under/rank/hangar_technician/heph
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "heph_tech"
item_state = "heph_tech"
/obj/item/clothing/under/rank/hangar_technician/orion
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "orion_tech"
item_state = "orion_tech"
@@ -345,18 +204,15 @@
/obj/item/clothing/under/rank/machinist
name = "machinist's jumpsuit"
desc = "A practical uniform designed for industrial work."
icon_state = "mechanic"
item_state = "b_suit"
worn_state = "mechanic"
/obj/item/clothing/under/rank/machinist/heph
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "nt_machinist"
item_state = "nt_machinist"
/obj/item/clothing/under/rank/machinist/heph
icon_state = "heph_machinist"
item_state = "heph_machinist"
/obj/item/clothing/under/rank/machinist/orion
icon = 'icons/obj/contained_items/department_uniforms/operations.dmi'
contained_sprite = TRUE
icon_state = "orion_machinist"
item_state = "orion_machinist"
code/modules/clothing/under/jobs/engineering.dm
+10 -28
View File
@@ -14,68 +14,50 @@
/obj/item/clothing/under/rank/atmospheric_technician
name = "atmospheric technician's jumpsuit"
desc = "It's a jumpsuit worn by atmospheric technicians."
icon_state = "atmos"
item_state = "atmos_suit"
worn_state = "atmos"
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "nt_atmos"
item_state = "nt_atmos"
contained_sprite = TRUE
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/atmospheric_technician/heph
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "heph_atmos"
item_state = "heph_atmos"
contained_sprite = TRUE
/obj/item/clothing/under/rank/atmospheric_technician/zavod
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "zav_atmos"
item_state = "zav_atmos"
contained_sprite = TRUE
/obj/item/clothing/under/rank/engineer
name = "engineer's jumpsuit"
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
icon_state = "engine"
item_state = "engi_suit"
worn_state = "engine"
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "nt_engineer"
item_state = "nt_engineer"
contained_sprite = TRUE
armor = list(
rad = ARMOR_RAD_MINOR
)
siemens_coefficient = 0.75
/obj/item/clothing/under/rank/engineer/heph
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "heph_engineer"
item_state = "heph_engineer"
contained_sprite = TRUE
/obj/item/clothing/under/rank/engineer/zavod
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "zav_engineer"
item_state = "zav_engineer"
contained_sprite = TRUE
/obj/item/clothing/under/rank/engineer/apprentice
name = "engineering apprentice's jumpsuit"
desc = "It's a noticeably cheaper high visibility jumpsuit worn by engineering apprentices. It has minor radiation shielding."
icon_state = "engine_app"
worn_state = "engine_app"
icon_state = "nt_apprentice"
item_state = "nt_apprentice"
/obj/item/clothing/under/rank/engineer/apprentice/heph
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "heph_apprentice"
item_state = "heph_apprentice"
contained_sprite = TRUE
/obj/item/clothing/under/rank/engineer/apprentice/zavod
icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi'
icon_state = "zav_apprentice"
item_state = "zav_apprentice"
contained_sprite = TRUE
/obj/item/clothing/under/rank/roboticist
name = "roboticist's jumpsuit"
desc = "It's a white and purple jumpsuit with reinforced seams; great for industrial work."
icon_state = "robotics"
item_state = "bl_suit"
worn_state = "robotics"
siemens_coefficient = 0.75
code/modules/clothing/under/jobs/medsci.dm
+88 -196
View File
@@ -12,134 +12,95 @@
bio = ARMOR_BIO_MINOR
)
// Scientist
/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"
icon_state = "science"
item_state = "w_suit"
worn_state = "science"
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 = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_scientist"
item_state = "nt_scientist"
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/scientist/nt
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_scientist"
item_state = "nt_scientist"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/zeng
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zeng_scientist"
item_state = "zeng_scientist"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/zavod
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zav_scientist"
item_state = "zav_scientist"
contained_sprite = TRUE
// Xenobotanist
/obj/item/clothing/under/rank/scientist/botany
desc = "It's made of a special fiber that provides minor protection against biohazards. Its colour denotes the wearer as a xenobotanist."
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_xenob"
item_state = "nt_xenob"
contained_sprite = TRUE
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/scientist/botany/zeng
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zeng_xenob"
item_state = "zeng_xenob"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/botany/zavod
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zav_xenob"
item_state = "zav_xenob"
contained_sprite = TRUE
// Xenobiologist
/obj/item/clothing/under/rank/scientist/xenobio
desc = "It's made of a special fiber that provides minor protection against biohazards. Its colour denotes the wearer as a xenobiologist."
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_xenob"
item_state = "nt_xenob"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/xenobio/zeng
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zeng_xenob"
item_state = "zeng_xenob"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/xenobio/zavod
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zav_xenob"
item_state = "zav_xenob"
contained_sprite = TRUE
// Lab Assistant.
/obj/item/clothing/under/rank/scientist/intern
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a laboratory assistant."
name = "laboratory assistant's jumpsuit"
icon_state = "intern_science"
worn_state = "intern_science"
/obj/item/clothing/under/rank/scientist/intern/nt
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_assistant"
item_state = "nt_assistant"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/intern/zeng
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zeng_assistant"
item_state = "zeng_assistant"
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/intern/zavod
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zav_assistant"
item_state = "zav_assistant"
contained_sprite = TRUE
// Xenoarcheologist
/obj/item/clothing/under/rank/xenoarcheologist
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a xenoarcheologist."
name = "xenoarcheologist's jumpsuit"
icon_state = "xenoarcheology"
item_state = "w_suit"
worn_state = "xenoarcheology"
desc = "It's made of a special fiber that provides minor protection against explosions. It has markings that denote the wearer as a xenoarcheologist."
icon_state = "nt_xenoarch"
item_state = "nt_xenoarch"
permeability_coefficient = 0.50
armor = list(
bomb = ARMOR_BOMB_MINOR
)
/obj/item/clothing/under/rank/xenoarcheologist/nt
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "nt_xenoarch"
item_state = "nt_xenoarch"
contained_sprite = TRUE
/obj/item/clothing/under/rank/xenoarcheologist/zeng
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zeng_xenoarch"
item_state = "zeng_xenoarch"
contained_sprite = TRUE
/obj/item/clothing/under/rank/xenoarcheologist/zavod
icon = 'icons/obj/contained_items/department_uniforms/science.dmi'
icon_state = "zav_xenoarch"
item_state = "zav_xenoarch"
contained_sprite = TRUE
/*
* 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"
@@ -162,182 +123,113 @@
bio = ARMOR_BIO_MINOR
)
// Physician
/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is trained medical personnel."
name = "physician's jumpsuit"
icon_state = "medical"
item_state = "w_suit"
worn_state = "medical"
desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is a trained medical physician."
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "nt_phys"
worn_state = "nt_phys"
contained_sprite = TRUE
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/medical/intern
desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is still a medical intern."
name = "medical intern's jumpsuit"
icon_state = "intern_medical"
worn_state = "intern_medical"
/obj/item/clothing/under/rank/medical/intern/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "zeng_intern"
item_state = "zeng_intern"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/intern/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "nt_intern"
item_state = "nt_intern"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/intern/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_intern"
item_state = "epmc_intern"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
icon_state = "scrubsblue"
item_state = "b_suit"
worn_state = "scrubsblue"
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
icon_state = "scrubsgreen"
item_state = "g_suit"
worn_state = "scrubsgreen"
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
icon_state = "scrubspurple"
item_state = "p_suit"
worn_state = "scrubspurple"
/obj/item/clothing/under/rank/medical/black
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
icon_state = "scrubsblack"
item_state = "bl_suit"
worn_state = "scrubsblack"
/obj/item/clothing/under/rank/medical/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "zeng_phys"
item_state = "zeng_phys"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "nt_phys"
item_state = "nt_phys"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_phys"
item_state = "epmc_phys"
contained_sprite = TRUE
icon_state = "pmc_phys"
item_state = "pmc_phys"
// Intern
/obj/item/clothing/under/rank/medical/intern
name = "medical intern's jumpsuit"
desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is a medical intern."
icon_state = "nt_intern"
worn_state = "nt_intern"
/obj/item/clothing/under/rank/medical/intern/zeng
icon_state = "zeng_intern"
item_state = "zeng_intern"
/obj/item/clothing/under/rank/medical/intern/pmc
icon_state = "pmc_intern"
// First Responder
/obj/item/clothing/under/rank/medical/first_responder
name = "first responder jumpsuit"
desc = "A jumpsuit that denotes the wearer as a Nanotrasen First Responder."
icon = 'icons/clothing/kit/first_responder.dmi'
contained_sprite = TRUE
icon_state = "firstresponderjumpsuit"
item_state = "firstresponderjumpsuit"
worn_state = "firstresponderjumpsuit"
/obj/item/clothing/under/rank/medical/first_responder/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "zeng_emt"
item_state = "zeng_emt"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/first_responder/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for first responders."
icon_state = "nt_emt"
item_state = "nt_emt"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/first_responder/zeng
icon_state = "zeng_emt"
item_state = "zeng_emt"
/obj/item/clothing/under/rank/medical/first_responder/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_emt"
item_state = "epmc_emt"
contained_sprite = TRUE
icon_state = "pmc_emt"
item_state = "pmc_emt"
/obj/item/clothing/under/rank/medical/surgeon/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "zeng_surgeon"
item_state = "zeng_surgeon"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/surgeon/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
// Surgeon
/obj/item/clothing/under/rank/medical/surgeon
name = "surgeon's scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. Specially fitted to ensure surgical precision."
icon_state = "nt_surgeon"
item_state = "nt_surgeon"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/surgeon/zeng
icon_state = "zeng_surgeon"
item_state = "zeng_surgeon"
/obj/item/clothing/under/rank/medical/surgeon/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_surgeon"
item_state = "epmc_surgeon"
contained_sprite = TRUE
icon_state = "pmc_surgeon"
item_state = "pmc_surgeon"
/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
// Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily.
/obj/item/clothing/under/rank/medical/surgeon/zavod
icon_state = "zavod_surgeon"
item_state = "zavod_surgeon"
/obj/item/clothing/under/rank/medical/surgeon/idris
icon_state = "idris_surgeon"
item_state = "idris_surgeon"
// Psychiatrist
/obj/item/clothing/under/rank/medical/psych
name = "psychiatrist's jumpsuit"
icon_state = "psych"
item_state = "w_suit"
worn_state = "psych"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a psychiatrist."
icon_state = "nt_psych"
worn_state = "nt_psych"
/obj/item/clothing/under/rank/psych/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
/obj/item/clothing/under/rank/medical/psych/zeng
icon_state = "zeng_psych"
item_state = "zeng_psych"
contained_sprite = TRUE
/obj/item/clothing/under/rank/psych/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "nt_psych"
item_state = "nt_psych"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/psych/pmc
icon_state = "pmc_psych"
item_state = "pmc_psych"
/obj/item/clothing/under/rank/psych/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_psych"
item_state = "epmc_psych"
contained_sprite = TRUE
// Pharmacist
/obj/item/clothing/under/rank/pharmacist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it."
/obj/item/clothing/under/rank/medical/pharmacist
name = "pharmacist's jumpsuit"
icon_state = "chemistry"
item_state = "w_suit"
worn_state = "chemistry"
permeability_coefficient = 0.50
armor = list(
bio = ARMOR_BIO_MINOR
)
/obj/item/clothing/under/rank/pharmacist/zeng
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "zeng_chemist"
item_state = "zeng_chemist"
contained_sprite = TRUE
/obj/item/clothing/under/rank/pharmacist/nt
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
desc = "It's made of a special fiber that gives special protection against biohazards. It has markings that denote the wearer as a pharmacist."
icon_state = "nt_chemist"
item_state = "nt_chemist"
contained_sprite = TRUE
/obj/item/clothing/under/rank/pharmacist/pmc
icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
icon_state = "epmc_chemist"
item_state = "epmc_chemist"
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/pharmacist/zeng
icon_state = "zeng_chemist"
item_state = "zeng_chemist"
/obj/item/clothing/under/rank/medical/pharmacist/pmc
icon_state = "pmc_chemist"
item_state = "pmc_chemist"
code/modules/clothing/under/jobs/security.dm
+25 -81
View File
@@ -12,68 +12,62 @@
/obj/item/clothing/under/rank/security
name = "security officer's uniform"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
icon_state = "officer_standard"
worn_state = "officer_standard"
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_officer"
worn_state = "nt_officer"
armor = list(
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
contained_sprite = TRUE
/obj/item/clothing/under/rank/security/zavod
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "zav_officer"
item_state = "zav_officer"
contained_sprite = TRUE
/obj/item/clothing/under/rank/security/idris
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "idris_officer"
item_state = "idris_officer"
contained_sprite = TRUE
/obj/item/clothing/under/rank/security/pmc
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "epmc_officer"
item_state = "epmc_officer"
contained_sprite = TRUE
icon_state = "pmc_officer"
item_state = "pmc_officer"
/obj/item/clothing/under/rank/cadet
name = "security cadet's uniform"
desc = "It's made of a slightly sturdier material, to allow for robust protection."
icon_state = "cadet_standard"
worn_state = "cadet_standard"
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_cadet"
worn_state = "nt_cadet"
armor = list(
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
contained_sprite = TRUE
/obj/item/clothing/under/rank/cadet/zavod
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "zav_cadet"
item_state = "zav_cadet"
contained_sprite = TRUE
/obj/item/clothing/under/rank/cadet/idris
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "idris_cadet"
item_state = "idris_cadet"
contained_sprite = TRUE
/obj/item/clothing/under/rank/cadet/pmc
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "epmc_cadet"
item_state = "epmc_cadet"
contained_sprite = TRUE
icon_state = "pmc_cadet"
item_state = "pmc_cadet"
/obj/item/clothing/under/rank/warden
name = "warden's uniform"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
icon_state = "warden_standard"
worn_state = "warden_standard"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_warden"
worn_state = "nt_warden"
armor = list(
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
contained_sprite = TRUE
/obj/item/clothing/under/rank/warden/remote
name = "remote warden's uniform"
@@ -85,22 +79,16 @@
sensor_mode = 0
/obj/item/clothing/under/rank/warden/zavod
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "zav_warden"
item_state = "zav_warden"
contained_sprite = TRUE
/obj/item/clothing/under/rank/warden/idris
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "idris_warden"
item_state = "idris_warden"
contained_sprite = TRUE
/obj/item/clothing/under/rank/warden/pmc
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "epmc_warden"
item_state = "epmc_warden"
contained_sprite = TRUE
icon_state = "pmc_warden"
item_state = "pmc_warden"
/*
* Detective / Forensics
@@ -109,45 +97,26 @@
/obj/item/clothing/under/det
name = "investigator's uniform"
desc = "Someone who wears this means business."
icon_state = "detective_standard"
worn_state = "detective_standard"
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_invest"
item_state = "nt_invest"
armor = list(
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
/obj/item/clothing/under/det/black
name = "hard-worn suit"
icon_state = "detective_black"
worn_state = "detective_black"
/obj/item/clothing/under/det/classic
name = "hard-worn suit"
icon_state = "detective_classic"
worn_state = "detective_classic"
/obj/item/clothing/under/det/forensics
name = "grey investigator's uniform"
icon_state = "forensic_standard"
worn_state = "forensic_standard"
contained_sprite = TRUE
/obj/item/clothing/under/det/zavod
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "zav_invest"
item_state = "zav_invest"
contained_sprite = TRUE
/obj/item/clothing/under/det/idris
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "idris_invest"
item_state = "idris_invest"
contained_sprite = TRUE
/obj/item/clothing/under/det/pmc
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "epmc_invest"
item_state = "epmc_invest"
contained_sprite = TRUE
icon_state = "pmc_invest"
item_state = "pmc_invest"
/*
* Head of Security
@@ -163,28 +132,3 @@
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
/*
* Contractors
*/
/obj/item/clothing/under/rank/security/zavodskoi
name = "Zavodskoi Interstellar security uniform"
desc = "A uniform worn by Zavodskoi Interstellar security forces."
icon_state = "necro_sec"
worn_state = "necro_sec"
/obj/item/clothing/under/rank/security/zavodskoi/alt
icon_state = "necro_sec_alt"
worn_state = "necro_sec_alt"
/obj/item/clothing/under/rank/security/eridani
name = "Eridani PMC uniform"
desc = "A uniform worn by contracted Eridani security forces."
icon_state = "erisec"
worn_state = "erisec"
/obj/item/clothing/under/rank/security/eridani/alt
icon_state = "erisec_alt"
worn_state = "erisec_alt"
code/modules/clothing/under/jobs/sol.dm
-21
View File
@@ -20,27 +20,6 @@
item_state = "marine_fatigue"
contained_sprite = 1
/obj/item/clothing/under/rank/fatigues/Initialize()
.=..()
rolled_sleeves = 0
/obj/item/clothing/under/rank/fatigues/rollsleeves()
set name = "Roll Up Sleeves"
set category = "Object"
set src in usr
if (use_check(usr, USE_DISALLOW_SILICONS))
return
rolled_sleeves = !rolled_sleeves
if(rolled_sleeves)
body_parts_covered &= ~(ARMS|HANDS)
item_state = "[item_state]_r_s"
else
body_parts_covered = initial(body_parts_covered)
item_state = initial(item_state)
update_clothing_icon()
/obj/item/clothing/under/rank/service //navy personnel service unniform
name = "sol navy service uniform"
desc = "A military service uniform issued to Sol Alliance naval personnel, to be worn in environments where a utility uniform is unfitting."
code/modules/clothing/under/miscellaneous.dm
-5
View File
@@ -87,9 +87,6 @@
worn_state = "scc_agent"
contained_sprite = TRUE
rolled_down = FALSE
rolled_sleeves = FALSE
/obj/item/clothing/under/rank/scc/executive
name = "Stellar Corporate Conglomerate executive uniform"
desc = "A stylish purple uniform worn by executive agents of the Stellar Corporate Conglomerate."
@@ -606,5 +603,3 @@
desc = "An utility uniform worn by Elyran navy officers serving aboard ships and in the field."
icon_state = "elyran_commander"
item_state = "elyran_commander"
code/modules/clothing/under/skirts.dm
+1 -2
View File
@@ -9,7 +9,6 @@
item_state = "skirt_casual"
worn_state = "skirt_casual"
body_parts_covered = LOWER_TORSO
rolled_sleeves = -1
contained_sprite = TRUE
/obj/item/clothing/under/skirt/puffy
@@ -106,4 +105,4 @@
desc_fluff = "You could achieve the same effect with two aprons, we're pretty sure."
icon_state = "skirt_jumper_highcut"
worn_state = "skirt_jumper_highcut"
item_state = "skirt_jumper_highcut"
item_state = "skirt_jumper_highcut"
code/modules/clothing/under/xenos/unathi.dm
+1 -4
View File
@@ -7,9 +7,6 @@
item_state = "tunic"
contained_sprite = TRUE
rolled_down = FALSE
rolled_sleeves = FALSE
/obj/item/clothing/under/unathi/jizixi
name = "jizixi dress"
desc = "A striking, modern dress typically worn by Moghean women of high birth."
@@ -104,4 +101,4 @@
var/image/belt = image(mob_icon, null, "himation_un_belt")
belt.appearance_flags = RESET_COLOR
I.add_overlay(belt)
return I
return I
code/modules/customitems/item_defines.dm
+1 -48
View File
@@ -718,53 +718,6 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = "mira_uniform"
contained_sprite = TRUE
/obj/item/clothing/under/fluff/mira_uniform/Initialize()
. = ..()
rolled_sleeves = 0
rolled_down = 0
/obj/item/clothing/under/fluff/mira_uniform/rollsuit()
set name = "Roll Down Jumpsuit"
set category = "Object"
set src in usr
if (use_check_and_message(usr, USE_DISALLOW_SILICONS))
return
if(rolled_sleeves)
to_chat(usr, "<span class='warning'>You must roll up your [src]'s sleeves first!</span>")
return
rolled_down = !rolled_down
if(rolled_down)
body_parts_covered &= LOWER_TORSO|LEGS|FEET
item_state = "[item_state]_d"
else
body_parts_covered = initial(body_parts_covered)
item_state = initial(item_state)
update_clothing_icon()
/obj/item/clothing/under/fluff/mira_uniform/rollsleeves()
set name = "Roll Up Sleeves"
set category = "Object"
set src in usr
if (use_check_and_message(usr, USE_DISALLOW_SILICONS))
return
if(rolled_down)
to_chat(usr, "<span class='warning'>You must roll up your [src] first!</span>")
return
rolled_sleeves = !rolled_sleeves
if(rolled_sleeves)
body_parts_covered &= ~(ARMS|HANDS)
item_state = "[item_state]_r"
else
body_parts_covered = initial(body_parts_covered)
item_state = initial(item_state)
update_clothing_icon()
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/mira_robes //Junior Alchemist Robes - Mira Akhandi - ladyfowl
name = "junior alchemist robes"
desc = "A robe with a light silky gold colored belt around the waist. Placed upon the print is two red jewels pinned to it neatly."
@@ -2453,4 +2406,4 @@ All custom items with worn sprites must follow the contained sprite system: http
/obj/item/reagent_containers/food/snacks/fluff/taffy/blue
name = "blue taffy"
icon_state = "blue_taffy"
reagent_data = list(/decl/reagent/nutriment = list("salty-sweet, tangy taffy" = 1))
reagent_data = list(/decl/reagent/nutriment = list("salty-sweet, tangy taffy" = 1))
code/modules/ghostroles/spawner/human/emergencypod.dm
+10 -6
View File
@@ -149,18 +149,22 @@
/datum/outfit/admin/pod/rep
name = "RescuePod - IdrisRep"
uniform = /obj/item/clothing/under/rank/idris
head = /obj/item/clothing/head/beret/corporate/idris
uniform = /obj/item/clothing/under/rank/liaison/idris
suit = /obj/item/clothing/suit/storage/liaison/idris
id = /obj/item/card/id/idris
pda = /obj/item/modular_computer/handheld/pda/civilian/lawyer
shoes = /obj/item/clothing/shoes/laceup
glasses = /obj/item/clothing/glasses/sunglasses/big
l_hand = /obj/item/storage/briefcase
accessory = /obj/item/clothing/accessory/tie/corporate/idris
suit_accessory = /obj/item/clothing/accessory/pin/corporate/idris
backpack_contents = list(
/obj/item/clothing/head/beret/centcom/liaison = 1,
/obj/item/device/camera = 1,
/obj/item/gun/energy/pistol = 1,
/obj/item/device/oxycandle = 1,
/obj/item/airbubble = 1
/obj/item/airbubble = 1,
/obj/item/stamp/idris = 1
)
/datum/outfit/admin/pod/rep/get_id_assignment()
@@ -231,7 +235,7 @@
/datum/outfit/admin/pod/pmc
name = "RescuePod - EPMC Sergeant"
name = "RescuePod - PMCG Sergeant"
head = /obj/item/clothing/head/helmet/space/void/cruiser
suit = /obj/item/clothing/suit/space/void/cruiser
suit_store = /obj/item/tank/oxygen
@@ -239,10 +243,10 @@
id = /obj/item/card/id/pmc
pda = /obj/item/modular_computer/handheld/pda/security
belt = /obj/item/gun/energy/gun/nuclear
uniform = /obj/item/clothing/under/rank/security/eridani
uniform = /obj/item/clothing/under/rank/security/pmc
/datum/outfit/admin/pod/pmc/get_id_assignment()
return "Security Officer (EPMC)"
return "Security Officer (PMCG)"
/datum/outfit/admin/pod/pmc/get_id_rank()
return "Security Officer"
code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm
+2 -2
View File
@@ -14,7 +14,7 @@
short_name = "eridanileader"
mob_name_prefix = "Ldr. "
max_count = 1
desc = "The leader of the EPMC Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly."
desc = "The leader of the PMCG Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly."
outfit = /datum/outfit/admin/ert/ap_eridani/lead
possible_species = list(SPECIES_HUMAN)
@@ -23,7 +23,7 @@
short_name = "eridanidoctor"
mob_name_prefix = "Dr. "
max_count = 1
desc = "A highly trained Eridani medical officer and the second in command of the EPMC Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run."
desc = "A highly trained Eridani medical officer and the second in command of the PMCG Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run."
outfit = /datum/outfit/admin/ert/ap_eridani/doctor
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_SHELL)
code/modules/ghostroles/spawner/human/zenghu.dm
+1 -2
View File
@@ -23,9 +23,8 @@
/datum/outfit/admin/zenghu_survivor
name = "Zeng-Hu Employee"
uniform = /obj/item/clothing/under/rank/zeng
uniform = /obj/item/clothing/under/rank/scientist
shoes = /obj/item/clothing/shoes/white
belt = /obj/item/storage/belt/utility/full
id = /obj/item/card/id/zeng_hu
r_hand = /obj/item/device/flashlight
code/modules/item_worth/worths_list.dm
+1 -3
View File
@@ -517,7 +517,6 @@ var/list/worths = list(
/obj/item/clothing/head/helmet/ert = 1000,
/obj/item/clothing/head/helmet/hos = 800,
/obj/item/clothing/head/hos = 100,
/obj/item/clothing/head/hos/corp = 100,
/obj/item/clothing/head/helmet = 250,
/obj/item/clothing/head/culthood = 150,
/obj/item/clothing/head/caphat/hop = 100,
@@ -558,8 +557,7 @@ var/list/worths = list(
/obj/item/clothing/accessory = 15,
//UNDERS,
/obj/item/clothing/under/rank/captain = 100,
/obj/item/clothing/under/rank/head_of_personnel = 60,
/obj/item/clothing/under/rank/head_of_personnel_whimsy = 80,
/obj/item/clothing/under/rank/xo = 60,
/obj/item/clothing/under/rank/chief_engineer = 95,
/obj/item/clothing/under/rank/research_director = 60,
/obj/item/clothing/under/rank/chief_medical_officer = 65,
code/modules/mining/abandonedcrates.dm
-7
View File
@@ -120,13 +120,6 @@
new /obj/item/clothing/head/helmet/space/void/zavodskoi(src)
new /obj/item/flag/zavodskoi/l(src)
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/gloves/white(src)
new /obj/item/clothing/mask/gas/mime(src)
new /obj/item/clothing/head/beret/red(src)
new /obj/item/clothing/accessory/suspenders(src)
new /obj/item/pen/crayon/mime(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
if(96)
new/obj/item/vampiric(src)