diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index 9ac351e6c2f..229bc979c37 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -70,7 +70,7 @@ var/global/max_secret_rooms = 6
walltypes = list(/turf/simulated/wall/cult=3,/turf/simulated/mineral/random/high_chance=1)
floortypes = list(/turf/simulated/floor/engine/cult)
treasureitems = list(/obj/item/device/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2,
- /obj/item/clothing/suit/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
+ /obj/item/clothing/suit/hooded/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2,
/obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/ectoplasm=3,
/obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1)
@@ -209,4 +209,4 @@ var/global/max_secret_rooms = 6
emptyturfs -= T
//log_to_dd("The [theme] themed [T.loc] has been created!")
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index f6d87a1b60c..6b2639cabec 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -43,16 +43,18 @@
icon_state = "cult_hoodalt"
item_state = "cult_hoodalt"
-/obj/item/clothing/suit/cultrobes/alt
+/obj/item/clothing/suit/hooded/cultrobes/alt
icon_state = "cultrobesalt"
item_state = "cultrobesalt"
+ hoodtype = /obj/item/clothing/head/culthood/alt
-/obj/item/clothing/suit/cultrobes
+/obj/item/clothing/suit/hooded/cultrobes
name = "cult robes"
desc = "A set of armored robes worn by the followers of Nar-Sie"
icon_state = "cultrobes"
item_state = "cultrobes"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/culthood
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0)
flags_inv = HIDEJUMPSUIT
@@ -90,4 +92,4 @@
desc = "A bulky suit of armour, bristling with spikes. It looks space proof."
w_class = 3
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank)
- armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
\ No newline at end of file
+ armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index c62408eddd5..09b4c76db21 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -1032,8 +1032,7 @@ var/list/sacrificed = list()
usr.visible_message("\red The rune disappears with a flash of red light, and a set of armor appears on [usr]...", \
"\red You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.")
- user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head)
- user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit)
+ user.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
user.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back)
//the above update their overlay icons cache but do not call update_icons()
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 4dc42aacb4f..a2843a28a48 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -493,8 +493,7 @@ var/global/list/multiverse = list()
M.equip_to_slot_or_del(sword, slot_r_hand)
if("cultist")
- M.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(M), slot_head)
- M.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(sword, slot_r_hand)
@@ -867,4 +866,4 @@ var/global/list/multiverse = list()
target.adjust_fire_stacks(20)
target.IgniteMob()
GiveHint(target,1)
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
index ba971914f24..7c58f4a2b1a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
@@ -13,10 +13,8 @@
..()
new /obj/item/clothing/under/rank/chaplain(src)
new /obj/item/clothing/shoes/black(src)
- new /obj/item/clothing/suit/nun(src)
- new /obj/item/clothing/head/nun_hood(src)
- new /obj/item/clothing/suit/chaplain_hoodie(src)
- new /obj/item/clothing/head/chaplain_hood(src)
+ new /obj/item/clothing/suit/hooded/nun(src)
+ new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/clothing/suit/holidaypriest(src)
new /obj/item/clothing/under/wedding/bride_white(src)
new /obj/item/weapon/storage/backpack/cultpack (src)
@@ -28,4 +26,4 @@
new /obj/item/clothing/gloves/ring/silver(src)
new /obj/item/clothing/gloves/ring/silver(src)
new /obj/item/clothing/gloves/ring/gold(src)
- new /obj/item/clothing/gloves/ring/gold(src)
\ No newline at end of file
+ new /obj/item/clothing/gloves/ring/gold(src)
diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm
index e392f8a4087..b86d5c44ed1 100644
--- a/code/modules/client/preference/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference/loadout/loadout_accessories.dm
@@ -61,4 +61,35 @@
/datum/gear/accessory/scarf/stripedblue
display_name = "scarf, striped blue"
- path = /obj/item/clothing/accessory/stripedbluescarf
\ No newline at end of file
+ path = /obj/item/clothing/accessory/stripedbluescarf
+
+/datum/gear/accessory/holobadge
+ display_name = "holobadge, pin"
+ path = /obj/item/clothing/accessory/holobadge
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/holobadge_n
+ display_name = "holobadge, cord"
+ path = /obj/item/clothing/accessory/holobadge/cord
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/tieblue
+ display_name = "tie, blue"
+ path = /obj/item/clothing/accessory/blue
+
+/datum/gear/accessory/tiered
+ display_name = "tie, red"
+ path = /obj/item/clothing/accessory/red
+
+/datum/gear/accessory/tieblack
+ display_name = "tie, black"
+ path = /obj/item/clothing/accessory/black
+
+/datum/gear/accessory/tiehorrible
+ display_name = "tie, vomit green"
+ path = /obj/item/clothing/accessory/horrible
+
+/datum/gear/accessory/stethoscope
+ display_name = "stethoscope"
+ path = /obj/item/clothing/accessory/stethoscope
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician")
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index 9266dc6ebf0..459c784b300 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -1,3 +1,50 @@
/datum/gear/dice
- display_name = "d20"
- path = /obj/item/weapon/dice/d20
\ No newline at end of file
+ display_name = "a d20"
+ path = /obj/item/weapon/dice/d20
+
+/datum/gear/uplift
+ display_name = "a pack of Uplifts"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
+
+/datum/gear/robust
+ display_name = "a pack of Robusts"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust
+
+/datum/gear/carp
+ display_name = "a pack of Carps"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp
+
+/datum/gear/midori
+ display_name = "a pack of Midoris"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori
+
+/datum/gear/lighter
+ display_name = "a cheap lighter"
+ path = /obj/item/weapon/lighter
+
+/datum/gear/cigar
+ cost = 5
+ display_name = "a cigar"
+ path = /obj/item/clothing/mask/cigarette/cigar
+
+/datum/gear/flask
+ cost = 3
+ display_name = "a flask"
+ path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
+
+/datum/gear/rock
+ display_name = "a pet rock"
+ path = /obj/item/toy/pet_rock
+
+/datum/gear/pipe
+ display_name = "a smoking pipe"
+ path = /obj/item/clothing/mask/cigarette/pipe
+
+/datum/gear/pai
+ display_name = "a pAI card"
+ path = /obj/item/device/paicard
+
+/datum/gear/sechud
+ display_name = "a classic security HUD"
+ path = /obj/item/clothing/glasses/hud/security
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
new file mode 100644
index 00000000000..38d491ecc5a
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -0,0 +1,94 @@
+/datum/gear/hat
+ subtype_path = /datum/gear/hat
+ slot = slot_head
+ sort_category = "Headwear"
+
+/datum/gear/hat/hhat_yellow
+ display_name = "hardhat, yellow"
+ path = /obj/item/clothing/head/hardhat
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_orange
+ display_name = "hardhat, orange"
+ path = /obj/item/clothing/head/hardhat/orange
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_blue
+ display_name = "hardhat, blue"
+ path = /obj/item/clothing/head/hardhat/dblue
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/that
+ display_name = "top hat"
+ path = /obj/item/clothing/head/that
+
+/datum/gear/hat/flatcap
+ display_name = "flat cap"
+ path = /obj/item/clothing/head/flatcap
+
+/datum/gear/hat/fez
+ display_name = "fez"
+ path = /obj/item/clothing/head/fez
+
+/datum/gear/hat/bfedora
+ display_name = "fedora, black"
+ path = /obj/item/clothing/head/fedora
+
+/datum/gear/hat/wfedora
+ display_name = "fedora, white"
+ path = /obj/item/clothing/head/fedora/whitefedora
+
+/datum/gear/hat/brfedora
+ display_name = "fedora, brown"
+ path = /obj/item/clothing/head/fedora/brownfedora
+
+/datum/gear/hat/beretsec
+ display_name = "security beret"
+ path = /obj/item/clothing/head/beret/sec
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capcsec
+ display_name = "security corporate cap"
+ path = /obj/item/clothing/head/soft/sec/corp
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capsec
+ display_name = "security cap"
+ path = /obj/item/clothing/head/soft/sec
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capred
+ display_name = "cap, red"
+ path = /obj/item/clothing/head/soft/red
+
+/datum/gear/hat/capblue
+ display_name = "cap, blue"
+ path = /obj/item/clothing/head/soft/blue
+
+/datum/gear/hat/capgreen
+ display_name = "cap, green"
+ path = /obj/item/clothing/head/soft/green
+
+/datum/gear/hat/capblack
+ display_name = "cap, black"
+ path = /obj/item/clothing/head/soft/black
+
+/datum/gear/hat/cappurple
+ display_name = "cap, purple"
+ path = /obj/item/clothing/head/soft/purple
+
+/datum/gear/hat/capwhite
+ display_name = "cap, white"
+ path = /obj/item/clothing/head/soft/mime
+
+/datum/gear/hat/caporange
+ display_name = "cap, orange"
+ path = /obj/item/clothing/head/soft/orange
+
+/datum/gear/hat/capgrey
+ display_name = "cap, grey"
+ path = /obj/item/clothing/head/soft/grey
+
+/datum/gear/hat/capyellow
+ display_name = "cap, yellow"
+ path = /obj/item/clothing/head/soft/yellow
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
new file mode 100644
index 00000000000..c3abd056a29
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -0,0 +1,100 @@
+/datum/gear/suit
+ subtype_path = /datum/gear/suit
+ slot = slot_wear_suit
+ sort_category = "External Wear"
+
+//WINTER COATS
+/datum/gear/suit/coat
+ subtype_path = /datum/gear/suit/coat
+
+/datum/gear/suit/coat/grey
+ display_name = "winter coat"
+ path = /obj/item/clothing/suit/hooded/wintercoat
+
+/datum/gear/suit/coat/sec
+ display_name = "winter coat, security"
+ path = /obj/item/clothing/suit/hooded/wintercoat/security
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/suit/coat/captain
+ display_name = "winter coat, captain"
+ path = /obj/item/clothing/suit/hooded/wintercoat/captain
+ allowed_roles = list("Captain")
+
+/datum/gear/suit/coat/med
+ display_name = "winter coat, medical"
+ path = /obj/item/clothing/suit/hooded/wintercoat/medical
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician")
+
+/datum/gear/suit/coat/sci
+ display_name = "winter coat, science"
+ path = /obj/item/clothing/suit/hooded/wintercoat/science
+ allowed_roles = list("Scientist", "Research Director")
+
+/datum/gear/suit/coat/engi
+ display_name = "winter coat, engineering"
+ path = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic")
+
+/datum/gear/suit/coat/atmos
+ display_name = "winter coat, atmospherics"
+ path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+ allowed_roles = list("Chief Engineer", "Life Support Specialist")
+
+/datum/gear/suit/coat/hydro
+ display_name = "winter coat, hydroponics"
+ path = /obj/item/clothing/suit/hooded/wintercoat/hydro
+ allowed_roles = list("Botanist")
+
+/datum/gear/suit/coat/cargo
+ display_name = "winter coat, cargo"
+ path = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ allowed_roles = list("Quartermaster", "Cargo Technician")
+
+/datum/gear/suit/coat/miner
+ display_name = "winter coat, miner"
+ path = /obj/item/clothing/suit/hooded/wintercoat/miner
+ allowed_roles = list("Quartermaster", "Miner")
+//LABCOATS
+/datum/gear/suit/labcoat_emt
+ display_name = "labcoat, paramedic"
+ path = /obj/item/clothing/suit/storage/labcoat/emt
+ allowed_roles = list("Chief Medical Officer", "Paramedic")
+
+//JACKETS
+/datum/gear/suit/leather_jacket
+ display_name = "leather jacket"
+ path = /obj/item/clothing/suit/jacket/leather
+
+/datum/gear/suit/br_tcoat
+ display_name = "trenchcoat, brown"
+ path = /obj/item/clothing/suit/browntrenchcoat
+
+/datum/gear/suit/bl_tcoat
+ display_name = "trenchcoat, black"
+ path = /obj/item/clothing/suit/blacktrenchcoat
+
+/datum/gear/suit/bomber_jacket
+ display_name = "bomber jacket"
+ path = /obj/item/clothing/suit/jacket
+
+/datum/gear/suit/ol_miljacket
+ display_name = "military jacket, olive"
+ path = /obj/item/clothing/suit/jacket/miljacket
+
+/datum/gear/suit/nv_miljacket
+ display_name = "military jacket, navy"
+ path = /obj/item/clothing/suit/jacket/miljacket/navy
+
+/datum/gear/suit/ds_miljacket
+ display_name = "military jacket, desert"
+ path = /obj/item/clothing/suit/jacket/miljacket/desert
+
+/datum/gear/suit/wh_miljacket
+ display_name = "military jacket, white"
+ path = /obj/item/clothing/suit/jacket/miljacket/white
+
+/datum/gear/suit/secjacket
+ display_name = "security jacket"
+ path = /obj/item/clothing/suit/armor/secjacket
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 826cc7d5838..6855e7728b7 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -96,4 +96,37 @@
/datum/gear/uniform/skirt/job/head_of_security
display_name = "skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
- allowed_roles = list("Head of Security")
\ No newline at end of file
+ allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/formal
+ subtype_path = /datum/gear/uniform/formal
+
+/datum/gear/uniform/formal/security
+ display_name = "formal uniform, security"
+ path = /obj/item/clothing/under/rank/security/formal
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/formal/warden
+ display_name = "formal uniform, warden"
+ path = /obj/item/clothing/under/rank/warden/formal
+ allowed_roles = list("Warden")
+
+/datum/gear/uniform/formal/head_of_security
+ display_name = "formal uniform, hos"
+ path = /obj/item/clothing/under/rank/head_of_security/formal
+ allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/corporatesec
+ display_name = "corporate security uniform"
+ path = /obj/item/clothing/under/rank/security/corp
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/dispatchsec
+ display_name = "dispatcher's uniform"
+ path = /obj/item/clothing/under/rank/dispatch
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/casualsec
+ display_name = "casual security uniform"
+ path = /obj/item/clothing/under/rank/security2
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot")
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index ea811f68be6..bf04bbdcb5d 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,10 +8,6 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/armor/vest
name = "armor"
@@ -19,7 +15,7 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/vest/jacket
@@ -35,7 +31,7 @@
icon_state = "armor-combat"
item_state = "bulletproof"
blood_overlay_type = "armor"
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
@@ -88,8 +84,20 @@
desc = "A vest drenched in the blood of Greytide. It has seen better days."
icon_state = "bloody_armor"
item_state = "bloody_armor"
- species_fit = null
- sprite_sheets = null
+
+/obj/item/clothing/suit/armor/secjacket
+ name = "security jacket"
+ desc = "A sturdy black jacket with reinforced fabric. Bears insignia of NT corporate security."
+ icon_state = "secjacket_open"
+ item_state = "hos"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ armor = list(melee = 20, bullet = 15, laser = 20, energy = 5, bomb = 15, bio = 0, rad = 0)
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ ignore_suitadjust = 0
+ suit_adjusted = 1
+ action_button_name = "Open/Close Jacket"
+ adjust_flavour = "unzip"
/obj/item/clothing/suit/armor/hos
name = "armored coat"
@@ -120,8 +128,6 @@
icon_state = "jensencoat"
item_state = "jensencoat"
flags_inv = 0
- species_fit = null
- sprite_sheets = null
/obj/item/clothing/suit/armor/vest/warden
name = "Warden's armored jacket"
@@ -158,7 +164,6 @@
flags_inv = HIDEJUMPSUIT
strip_delay = 80
put_on_delay = 60
- hide_tail_by_species = list("Vox")
/obj/item/clothing/suit/armor/riot/knight
name = "plate armour"
@@ -217,7 +222,7 @@
icon_state = "detective-armor"
item_state = "armor"
blood_overlay_type = "armor"
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
@@ -239,25 +244,22 @@
return 0
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob)
- active = !(active)
- if(active)
- to_chat(user, "The reactive armor is now active.")
- icon_state = "reactive"
- item_state = "reactive"
+ src.active = !( src.active )
+ if (src.active)
+ to_chat(user, "\blue The reactive armor is now active.")
+ src.icon_state = "reactive"
+ src.item_state = "reactive"
else
- to_chat(user, "The reactive armor is now inactive.")
- icon_state = "reactiveoff"
- item_state = "reactiveoff"
- add_fingerprint(user)
- user.update_inv_wear_suit()
+ to_chat(user, "\blue The reactive armor is now inactive.")
+ src.icon_state = "reactiveoff"
+ src.item_state = "reactiveoff"
+ src.add_fingerprint(user)
+ return
/obj/item/clothing/suit/armor/reactive/emp_act(severity)
active = 0
- icon_state = "reactiveoff"
- item_state = "reactiveoff"
-
- var/mob/living/carbon/human/user = usr
- user.update_inv_wear_suit()
+ src.icon_state = "reactiveoff"
+ src.item_state = "reactiveoff"
..()
@@ -276,8 +278,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- species_fit = null
- sprite_sheets = null
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
/obj/item/clothing/suit/armor/heavy
@@ -292,7 +292,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 3
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- hide_tail_by_species = list("Vox")
/obj/item/clothing/suit/armor/tdome
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
@@ -301,7 +300,6 @@
flags = THICKMATERIAL
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- hide_tail_by_species = list("Vox")
/obj/item/clothing/suit/armor/tdome/red
name = "Red Thunderdome Armor"
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
new file mode 100644
index 00000000000..8bd4305bc78
--- /dev/null
+++ b/code/modules/clothing/suits/hood.dm
@@ -0,0 +1,68 @@
+//Hoods for winter coats and chaplain hoodie etc
+
+/obj/item/clothing/suit/hooded
+ action_button_name = "Adjust hood"
+ var/obj/item/clothing/head/hood
+ var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this
+
+/obj/item/clothing/suit/hooded/New()
+ MakeHood()
+ verbs -= /obj/item/clothing/suit/verb/openjacket //you can't unbutton those, deal with it
+ ..()
+
+/obj/item/clothing/suit/hooded/Destroy()
+ qdel(hood)
+ return ..()
+
+/obj/item/clothing/suit/hooded/proc/MakeHood()
+ if(!hood)
+ var/obj/item/clothing/head/W = new hoodtype(src)
+ hood = W
+
+/obj/item/clothing/suit/hooded/ui_action_click()
+ ToggleHood()
+
+/obj/item/clothing/suit/hooded/equipped(mob/user, slot)
+ if(slot != slot_wear_suit)
+ RemoveHood()
+ ..()
+
+/obj/item/clothing/suit/hooded/proc/RemoveHood()
+ src.icon_state = "[initial(icon_state)]"
+ suit_adjusted = 0
+ if(ishuman(hood.loc))
+ var/mob/living/carbon/H = hood.loc
+ H.unEquip(hood, 1)
+ H.update_inv_wear_suit()
+ hood.loc = src
+
+/obj/item/clothing/suit/hooded/dropped()
+ ..()
+ RemoveHood()
+
+/obj/item/clothing/suit/hooded/verb/Hooderize(var/mob/user)
+ set name = "Adjust the hood"
+ set category = "Object"
+ set src in usr
+ if(!isliving(usr))
+ return
+ if(usr.stat)
+ return
+ ToggleHood()
+
+/obj/item/clothing/suit/hooded/proc/ToggleHood()
+ if(!suit_adjusted)
+ if(ishuman(src.loc))
+ var/mob/living/carbon/human/H = src.loc
+ if(H.wear_suit != src)
+ to_chat(H,"You must be wearing [src] to put up the hood!")
+ return
+ if(H.head)
+ to_chat(H,"You're already wearing something on your head!")
+ return
+ else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1))
+ suit_adjusted = 1
+ src.icon_state = "[initial(icon_state)]_hood"
+ H.update_inv_wear_suit()
+ else
+ RemoveHood()
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 1288d02cbf4..7d76d68716a 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -25,10 +25,6 @@
/obj/item/device/healthanalyzer, /obj/item/device/flashlight, \
/obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen,/obj/item/device/rad_laser)
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
//Botonist
/obj/item/clothing/suit/apron
@@ -52,7 +48,7 @@
item_state = "bio_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
sprite_sheets = list(
@@ -73,12 +69,13 @@
)
//Chaplain
-/obj/item/clothing/suit/chaplain_hoodie
+/obj/item/clothing/suit/hooded/chaplain_hoodie
name = "chaplain hoodie"
desc = "This suit says to you 'hush'!"
icon_state = "chaplain_hoodie"
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/chaplain_hood
allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
sprite_sheets = list(
@@ -86,12 +83,13 @@
)
//Chaplain
-/obj/item/clothing/suit/nun
+/obj/item/clothing/suit/hooded/nun
name = "nun robe"
desc = "Maximum piety in this star system."
icon_state = "nun"
item_state = "nun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ hoodtype = /obj/item/clothing/head/nun_hood
flags_inv = HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
@@ -123,6 +121,10 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list(/obj/item/weapon/kitchen/knife)
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
//Detective
/obj/item/clothing/suit/storage/det_suit
@@ -136,7 +138,7 @@
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -173,11 +175,7 @@
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_size = ONESIZEFITSALL
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
+ flags = ONESIZEFITSALL
//Engineering
/obj/item/clothing/suit/storage/hazardvest
@@ -193,12 +191,6 @@
)
//Lawyer
-/obj/item/clothing/suit/storage/lawyer
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
-
/obj/item/clothing/suit/storage/lawyer/blackjacket
name = "black suit jacket"
desc = "A snappy dress jacket."
@@ -243,10 +235,6 @@
suit_adjusted = 1
action_button_name = "Button/Unbutton Jacket"
adjust_flavour = "unbutton"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/storage/ntrep
name = "\improper NanoTrasen Representative jacket"
@@ -258,10 +246,6 @@
ignore_suitadjust = 0
action_button_name = "Button/Unbutton Jacket"
adjust_flavour = "unbutton"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
//Medical
/obj/item/clothing/suit/storage/fr_jacket
@@ -276,10 +260,6 @@
suit_adjusted = 1
action_button_name = "Button/Unbutton Jacket"
adjust_flavour = "unbutton"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
//Mime
/obj/item/clothing/suit/suspenders
@@ -288,7 +268,3 @@
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
blood_overlay_type = "armor" //it's the less thing that I can put here
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 6926105541d..c640ef6e008 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -56,3 +56,12 @@
desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
icon_state = "labcoat_mort_open"
item_state = "labcoat_mort_open"
+
+/obj/item/clothing/suit/storage/labcoat/emt
+ name = "EMT labcoat"
+ desc = "A comfortable suit for paramedics. Has dark colours."
+ icon_state = "labcoat_emt_open"
+ item_state = "labcoat_emt_open"
+ species_fit = null
+ sprite_sheets = null
+
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index a88fdd6f970..9663acce6e7 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -2,6 +2,7 @@
* Contains:
* Lasertag
* Costume
+ * Winter Coats
* Misc
*/
@@ -16,10 +17,6 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/redtag
name = "red laser tag armour"
@@ -29,10 +26,6 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/*
* Costume
@@ -42,20 +35,13 @@
desc = "Yarr."
icon_state = "pirate_old"
item_state = "pirate_old"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/pirate_black
name = "black pirate coat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
+
/obj/item/clothing/suit/hgpirate
name = "pirate captain coat"
@@ -114,10 +100,7 @@
item_state = "wcoat"
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
+
/obj/item/clothing/suit/apron/overalls
name = "coveralls"
@@ -251,10 +234,6 @@
desc = "Your classic, non-racist poncho."
icon_state = "classicponcho"
item_state = "classicponcho"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/poncho/green
name = "green poncho"
@@ -282,6 +261,115 @@
item_state = "lingspacesuit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+/*
+ * Winter coats
+ */
+
+/obj/item/clothing/suit/hooded/wintercoat
+ name = "winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs."
+ icon_state = "wintercoat"
+ item_state = "labcoat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/toy, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/lighter)
+
+/obj/item/clothing/head/winterhood
+ name = "winter hood"
+ desc = "A hood attached to a heavy winter jacket."
+ icon_state = "winterhood"
+ body_parts_covered = HEAD
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ flags = NODROP
+ flags_inv = HIDEEARS
+
+/obj/item/clothing/suit/hooded/wintercoat/captain
+ name = "captain's winter coat"
+ icon_state = "wintercoat_captain"
+ armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
+ allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
+ hoodtype = /obj/item/clothing/head/winterhood/captain
+
+/obj/item/clothing/head/winterhood/captain
+ icon_state = "winterhood_captain"
+
+/obj/item/clothing/suit/hooded/wintercoat/security
+ name = "security winter coat"
+ icon_state = "wintercoat_sec"
+ armor = list(melee = 15, bullet = 10, laser = 20, energy = 5, bomb = 15, bio = 0, rad = 0) //worse stats than normal armor, but this one protects arms and makes space hurt less, CHOICES!
+ allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
+ hoodtype = /obj/item/clothing/head/winterhood/security
+
+/obj/item/clothing/head/winterhood/security
+ icon_state = "winterhood_sec"
+
+/obj/item/clothing/suit/hooded/wintercoat/medical
+ name = "medical winter coat"
+ icon_state = "wintercoat_med"
+ allowed = list(/obj/item/device/analyzer, /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/paper, /obj/item/weapon/melee/classic_baton/telescopic)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/medical
+
+/obj/item/clothing/head/winterhood/medical
+ icon_state = "winterhood_med"
+
+/obj/item/clothing/suit/hooded/wintercoat/science
+ name = "science winter coat"
+ icon_state = "wintercoat_sci"
+ allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/paper, /obj/item/weapon/melee/classic_baton/telescopic)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/science
+
+/obj/item/clothing/head/winterhood/science
+ icon_state = "winterhood_sci"
+
+/obj/item/clothing/suit/hooded/wintercoat/engineering
+ name = "engineering winter coat"
+ icon_state = "wintercoat_engi"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
+ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/weapon/rcd)
+ hoodtype = /obj/item/clothing/head/winterhood/engineering
+
+/obj/item/clothing/head/winterhood/engineering
+ icon_state = "winterhood_engi"
+
+/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+ name = "atmospherics winter coat"
+ icon_state = "wintercoat_atmos"
+ hoodtype = /obj/item/clothing/head/winterhood/engineering/atmos
+
+/obj/item/clothing/head/winterhood/engineering/atmos
+ icon_state = "winterhood_atmos"
+
+/obj/item/clothing/suit/hooded/wintercoat/hydro
+ name = "hydroponics winter coat"
+ icon_state = "wintercoat_hydro"
+ allowed = list(/obj/item/weapon/reagent_containers/spray, /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/hatchet, /obj/item/weapon/storage/bag/plants)
+ hoodtype = /obj/item/clothing/head/winterhood/hydro
+
+/obj/item/clothing/head/winterhood/hydro
+ item_state = "winterhood_hydro"
+
+/obj/item/clothing/suit/hooded/wintercoat/cargo
+ name = "cargo winter coat"
+ icon_state = "wintercoat_cargo"
+ hoodtype = /obj/item/clothing/head/winterhood/cargo
+
+/obj/item/clothing/head/winterhood/cargo
+ icon_state = "winterhood_cargo"
+
+/obj/item/clothing/suit/hooded/wintercoat/miner
+ name = "mining winter coat"
+ icon_state = "wintercoat_miner"
+ allowed = list(/obj/item/weapon/pickaxe, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/toy, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/lighter)
+ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/miner
+
+/obj/item/clothing/head/winterhood/miner
+ icon_state = "winterhood_miner"
/*
* Misc
@@ -294,7 +382,7 @@
item_state = "straight_jacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
strip_delay = 60
/obj/item/clothing/suit/ianshirt
@@ -302,10 +390,6 @@
desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
icon_state = "ianshirt"
item_state = "ianshirt"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
//pyjamas
//originally intended to be pinstripes >.>
@@ -349,20 +433,12 @@
desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it."
icon_state = "brtrenchcoat"
item_state = "brtrenchcoat"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/blacktrenchcoat
name = "black trench coat"
desc = "That shade of black just makes you look a bit more evil. Good for those mafia types."
icon_state = "bltrenchcoat"
item_state = "bltrenchcoat"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
//actual suits
@@ -437,7 +513,7 @@
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
//swimsuit
/obj/item/clothing/under/swimsuit/
@@ -480,7 +556,7 @@
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
@@ -507,10 +583,6 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
action_button_name = "Zip/Unzip Jacket"
adjust_flavour = "unzip"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/jacket/pilot
name = "security bomber jacket"
@@ -525,7 +597,7 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
- flags_size = ONESIZEFITSALL
+ flags = ONESIZEFITSALL
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
//End of inheritance from Security armour.
@@ -542,26 +614,12 @@
desc = "A classy clown officer's overcoat, also designed by Hugo Boss."
icon_state = "officersuit"
item_state = "officersuit"
- ignore_suitadjust = 0
- action_button_name = "Button/Unbutton Jacket"
- adjust_flavour = "unbutton"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/soldiercoat
name = "Clown Soldier's Coat"
desc = "An overcoat for the clown soldier, to keep him warm during those cold winter nights on the front."
icon_state = "soldiersuit"
item_state = "soldiersuit"
- ignore_suitadjust = 0
- action_button_name = "Button/Unbutton Jacket"
- adjust_flavour = "unbutton"
- species_fit = list("Vox")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
- )
/obj/item/clothing/suit/toggle/owlwings
name = "owl cloak"
@@ -657,4 +715,4 @@
if(user.reagents.get_reagent_amount("syndicate_nanites") < 15)
user.reagents.add_reagent("syndicate_nanites", 15)
else
- processing_objects.Remove(src)
\ No newline at end of file
+ processing_objects.Remove(src)
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 6cbe31a7ed9..1b1788eb1a1 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -296,9 +296,7 @@
if(20)
//arcane clothing
apply_prefix = 0
- var/list/possible_spawns = list(/obj/item/clothing/head/culthood,
- /obj/item/clothing/head/magus,
- /obj/item/clothing/head/culthood/alt,
+ var/list/possible_spawns = list(/obj/item/clothing/head/magus,
/obj/item/clothing/head/helmet/space/cult)
var/new_type = pick(possible_spawns)
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 6703c61b1b7..6bbe15ba0a6 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index e162c42a531..73a18672061 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3c2ea5a0990..7674574a1c5 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 378de746198..f6a2500fd1d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 3f06e7152d2..bffcc60025c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1125,6 +1125,8 @@
#include "code\modules\client\preference\loadout\loadout.dm"
#include "code\modules\client\preference\loadout\loadout_accessories.dm"
#include "code\modules\client\preference\loadout\loadout_general.dm"
+#include "code\modules\client\preference\loadout\loadout_hat.dm"
+#include "code\modules\client\preference\loadout\loadout_suit.dm"
#include "code\modules\client\preference\loadout\loadout_uniform.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\glasses\glasses.dm"
@@ -1177,6 +1179,7 @@
#include "code\modules\clothing\suits\alien.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
+#include "code\modules\clothing\suits\hood.dm"
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"