diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index d55417c5f5..1d2ae0061b 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -35,6 +35,7 @@
desc = "A hood worn by the followers of Nar-Sie."
flags_inv = HIDEFACE
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+ body_parts_covered = HEAD|EYES
armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
@@ -68,6 +69,7 @@
desc = "A helm worn by the followers of Nar-Sie."
flags_inv = HIDEFACE
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+ body_parts_covered = HEAD|FACE|EYES
armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0
@@ -77,7 +79,7 @@
icon_state = "magusred"
item_state = "magusred"
flags = FPRINT | TABLEPASS
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
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 = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -92,6 +94,7 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0
+
/obj/item/clothing/suit/space/cult
name = "cult armour"
icon_state = "cult_armour"
@@ -101,4 +104,5 @@
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
- siemens_coefficient = 0
\ No newline at end of file
+ siemens_coefficient = 0
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
\ No newline at end of file
diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm
index 72d42318e6..9203fa15e9 100644
--- a/code/game/gamemodes/events/holidays/Christmas.dm
+++ b/code/game/gamemodes/events/holidays/Christmas.dm
@@ -59,5 +59,6 @@
desc = "A crappy paper hat that you are REQUIRED to wear."
flags_inv = 0
flags = FPRINT|TABLEPASS
+ body_parts_covered = 0
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index a7c6056f44..9858616386 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -71,6 +71,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/lastHolder = null
var/smoketime = 300
var/chem_volume = 15
+ body_parts_covered = 0
/obj/item/clothing/mask/cigarette/New()
..()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f6681f9d22..548f41d8ed 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -36,9 +36,9 @@
switch(target_species)
if("Human", "Skrell") //humanoid bodytypes
species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox")
- else
+ else
species_restricted = list(target_species)
-
+
if (sprite_sheets_obj && (target_species in sprite_sheets_obj))
icon = sprite_sheets_obj[target_species]
@@ -48,9 +48,9 @@
species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox")
if("Human")
species_restricted = list("exclude","Skrell","Unathi","Tajaran","Diona","Vox")
- else
+ else
species_restricted = list(target_species)
-
+
if (sprite_sheets_obj && (target_species in sprite_sheets_obj))
icon = sprite_sheets_obj[target_species]
@@ -188,6 +188,7 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = SLOT_MASK
+ body_parts_covered = FACE|EYES
sprite_sheets = list("Vox" = 'icons/mob/species/vox/masks.dmi')
//Shoes
@@ -211,6 +212,7 @@ BLIND // can't see anything
name = "suit"
var/fire_resist = T0C+100
flags = FPRINT | TABLEPASS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
allowed = list(/obj/item/weapon/tank/emergency_oxygen)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING
@@ -230,6 +232,7 @@ BLIND // can't see anything
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ body_parts_covered = HEAD|FACE|EYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 8ae0d2aa63..712265bbb2 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -9,6 +9,7 @@
//var/darkness_view = 0//Base human is 2
//var/invisa_view = 0
var/prescription = 0
+ body_parts_covered = EYES
/obj/item/clothing/glasses/meson
name = "Optical Meson Scanner"
@@ -42,12 +43,14 @@
desc = "Yarr."
icon_state = "eyepatch"
item_state = "eyepatch"
+ body_parts_covered = 0
/obj/item/clothing/glasses/monocle
name = "monocle"
desc = "Such a dapper eyepiece!"
icon_state = "monocle"
item_state = "headset" // lol
+ body_parts_covered = 0
/obj/item/clothing/glasses/material
name = "Optical Material Scanner"
@@ -63,6 +66,7 @@
icon_state = "glasses"
item_state = "glasses"
prescription = 1
+ body_parts_covered = 0
/obj/item/clothing/glasses/regular/hipster
name = "Prescription Glasses"
@@ -75,12 +79,14 @@
name = "3D glasses"
icon_state = "3d"
item_state = "3d"
+ body_parts_covered = 0
/obj/item/clothing/glasses/gglasses
name = "Green Glasses"
desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme."
icon_state = "gglasses"
item_state = "gglasses"
+ body_parts_covered = 0
/obj/item/clothing/glasses/sunglasses
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
@@ -111,12 +117,14 @@
src.up = !src.up
src.flags |= GLASSESCOVERSEYES
flags_inv |= HIDEEYES
+ body_parts_covered |= EYES
icon_state = initial(icon_state)
usr << "You flip \the [src] down to protect your eyes."
else
src.up = !src.up
src.flags &= ~HEADCOVERSEYES
flags_inv &= ~HIDEEYES
+ body_parts_covered &= ~EYES
icon_state = "[initial(icon_state)]up"
usr << "You push \the [src] up out of your face."
@@ -193,12 +201,14 @@
desc = "A monocle thermal."
icon_state = "thermoncle"
flags = null //doesn't protect eyes because it's a monocle, duh
+ body_parts_covered = 0
/obj/item/clothing/glasses/thermal/eyepatch
name = "Optical Thermal Eyepatch"
desc = "An eyepatch with built-in thermal optics"
icon_state = "eyepatch"
item_state = "eyepatch"
+ body_parts_covered = 0
/obj/item/clothing/glasses/thermal/jensen
name = "Optical Thermal Implants"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index f541c837e6..1f252e4b28 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -14,7 +14,7 @@
name = "Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
-
+ body_parts_covered = 0
/obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
@@ -32,7 +32,8 @@
name = "Security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
- var/global/list/jobs[0]
+ body_parts_covered = 0
+ var/global/list/jobs[0]
/obj/item/clothing/glasses/hud/security/jensenshades
name = "Augmented shades"
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index c944fbd63b..bf20b3e952 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -15,50 +15,58 @@
name = "collectable slime cap!"
desc = "It just latches right in place!"
icon_state = "slime"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/xenom
name = "collectable xenomorph helmet!"
desc = "Hiss hiss hiss!"
icon_state = "xenom"
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/chef
name = "collectable chef's hat"
desc = "A rare Chef's Hat meant for hat collectors!"
- icon_state = "chef"
+ icon_state = "hats"
item_state = "chefhat"
/obj/item/clothing/head/collectable/paper
name = "collectable paper hat"
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
icon_state = "paper"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/tophat
name = "collectable top hat"
desc = "A top hat worn by only the most prestigious hat collectors."
icon_state = "tophat"
item_state = "that"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/captain
name = "collectable captain's hat"
desc = "A Collectable Hat that'll make you look just like a real comdom!"
icon_state = "captain"
item_state = "caphat"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/police
name = "collectable police officer's hat"
desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
icon_state = "policehelm"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/beret
name = "collectable beret"
desc = "A Collectable red Beret. It smells faintly of Garlic."
icon_state = "beret"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/welding
name = "collectable welding helmet"
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
@@ -77,18 +85,21 @@
desc = "You'd make a great Dread Syndie Roberts!"
icon_state = "pirate"
item_state = "pirate"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/kitty
name = "collectable kitty ears"
desc = "The fur feels.....a bit too realistic."
icon_state = "kitty"
item_state = "kitty"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/rabbitears
name = "collectable rabbit ears"
desc = "Not as lucky as the feet!"
icon_state = "bunny"
item_state = "bunny"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/wizard
name = "collectable wizard's hat"
@@ -100,11 +111,13 @@
desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/HoS
name = "collectable HoS hat"
desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
icon_state = "hoscap"
+ body_parts_covered = 0
/obj/item/clothing/head/collectable/thunderdome
name = "collectable Thunderdome helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 9b1bdc1e14..ba795dc06f 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -18,6 +18,7 @@
desc = "It's a special helmet issued to the Warden of a securiy force. Protects the head from impacts."
icon_state = "policehelm"
flags_inv = 0
+ body_parts_covered = 0
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
@@ -67,6 +68,7 @@
icon_state = "swathelm"
item_state = "helmet"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
flags_inv = HIDEEARS
siemens_coefficient = 0.7
\ No newline at end of file
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 692cc90b63..83a34e5c9a 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -25,9 +25,11 @@
icon_state = "capcap"
flags = FPRINT|TABLEPASS
flags_inv = 0
+ body_parts_covered = 0
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9
+ body_parts_covered = 0
//Chaplain
/obj/item/clothing/head/chaplain_hood
@@ -36,6 +38,7 @@
icon_state = "chaplain_hood"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR
siemens_coefficient = 0.9
+ body_parts_covered = HEAD|EYES
//Chaplain
/obj/item/clothing/head/nun_hood
@@ -52,6 +55,7 @@
icon_state = "beret"
flags = FPRINT | TABLEPASS
siemens_coefficient = 0.9
+ body_parts_covered = 0
//Security
/obj/item/clothing/head/beret/sec
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 32f01a10c8..cf5530b306 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -7,6 +7,7 @@
flags = FPRINT|TABLEPASS
item_state = "centhat"
siemens_coefficient = 0.9
+ body_parts_covered = 0
/obj/item/clothing/head/hairflower
name = "hair flower pin"
@@ -14,6 +15,7 @@
desc = "Smells nice."
item_state = "hairflower"
flags = FPRINT|TABLEPASS
+ body_parts_covered = 0
/obj/item/clothing/head/powdered_wig
name = "powdered wig"
@@ -28,18 +30,21 @@
item_state = "that"
flags = FPRINT|TABLEPASS
siemens_coefficient = 0.9
+ body_parts_covered = 0
/obj/item/clothing/head/redcoat
name = "redcoat's hat"
icon_state = "redcoat"
desc = "'I guess it's a redhead.'"
flags = FPRINT | TABLEPASS
+ body_parts_covered = 0
/obj/item/clothing/head/mailman
name = "mailman's hat"
icon_state = "mailman"
desc = "'Right-on-time' mail service head wear."
flags = FPRINT | TABLEPASS
+ body_parts_covered = 0
/obj/item/clothing/head/plaguedoctorhat
name = "plague doctor's hat"
@@ -48,12 +53,14 @@
flags = FPRINT | TABLEPASS
permeability_coefficient = 0.01
siemens_coefficient = 0.9
+ body_parts_covered = 0
/obj/item/clothing/head/hasturhood
name = "hastur's hood"
desc = "It's unspeakably stylish"
icon_state = "hasturhood"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/nursehat
name = "nurse's hat"
@@ -61,6 +68,7 @@
icon_state = "nursehat"
flags = FPRINT|TABLEPASS
siemens_coefficient = 0.9
+ body_parts_covered = 0
/obj/item/clothing/head/syndicatefake
name = "red space-helmet replica"
@@ -70,6 +78,7 @@
flags = FPRINT | TABLEPASS | BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
siemens_coefficient = 2.0
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/cueball
name = "cueball helmet"
@@ -78,15 +87,7 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
item_state="cueball"
flags_inv = 0
-
-/obj/item/clothing/head/that
- name = "sturdy top-hat"
- desc = "It's an amish looking armored top hat."
- icon_state = "tophat"
- item_state = "that"
- flags = FPRINT|TABLEPASS
- flags_inv = 0
-
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/greenbandana
name = "green bandana"
@@ -95,6 +96,7 @@
item_state = "greenbandana"
flags = FPRINT|TABLEPASS
flags_inv = 0
+ body_parts_covered = 0
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
@@ -103,6 +105,7 @@
item_state = "cardborg_h"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/justice
name = "justice hat"
@@ -132,6 +135,7 @@
desc = "Wearing these makes you looks useless, and only good for your sex appeal."
icon_state = "bunny"
flags = FPRINT | TABLEPASS
+ body_parts_covered = 0
/obj/item/clothing/head/flatcap
name = "flat cap"
@@ -145,12 +149,14 @@
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
+ body_parts_covered = 0
/obj/item/clothing/head/hgpiratecap
name = "pirate hat"
desc = "Yarr."
icon_state = "hgpiratecap"
item_state = "hgpiratecap"
+ body_parts_covered = 0
/obj/item/clothing/head/bandana
name = "pirate bandana"
@@ -164,6 +170,7 @@
icon_state = "bowler"
item_state = "bowler"
flags = FPRINT | TABLEPASS
+ body_parts_covered = 0
//stylish bs12 hats
@@ -173,6 +180,7 @@
item_state = "bowler_hat"
desc = "For the gentleman of distinction."
flags = FPRINT|TABLEPASS
+ body_parts_covered = 0
/obj/item/clothing/head/beaverhat
name = "beaver hat"
@@ -226,6 +234,7 @@
item_state = "chickensuit"
flags = FPRINT | TABLEPASS | BLOCKHAIR
siemens_coefficient = 2.0
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/bearpelt
name = "bear pelt hat"
@@ -243,3 +252,4 @@
flags = FPRINT | TABLEPASS | BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
siemens_coefficient = 2.0
+ body_parts_covered = HEAD|FACE|EYES
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 59d6bb36c3..f76819bc2e 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -21,6 +21,7 @@
var/up = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
+ body_parts_covered = HEAD|FACE|EYES
icon_action_button = "action_welding"
siemens_coefficient = 0.9
w_class = 3
@@ -62,6 +63,7 @@
var/status = 0
var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
var/processing = 0 //I dont think this is used anywhere.
+ body_parts_covered = EYES
/obj/item/clothing/head/cakehat/process()
if(!onfire)
@@ -123,6 +125,7 @@
item_color = "pumpkin"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ body_parts_covered = HEAD|EYES
var/brightness_on = 2 //luminosity when on
var/on = 0
w_class = 3
@@ -158,6 +161,7 @@
desc = "A pair of kitty ears. Meow!"
icon_state = "kitty"
flags = FPRINT | TABLEPASS
+ body_parts_covered = 0
var/icon/mob
var/icon/mob2
siemens_coefficient = 1.5
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 65f265f23f..320791888e 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -7,6 +7,7 @@
item_color = "cargo"
var/flipped = 0
siemens_coefficient = 0.9
+ body_parts_covered = 0
dropped()
src.icon_state = "[item_color]soft"
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 7a94a7bc94..0a3b8e08b7 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,6 +5,7 @@
item_state = "balaclava"
flags = FPRINT|TABLEPASS|BLOCKHAIR
flags_inv = HIDEFACE
+ body_parts_covered = FACE
w_class = 2
/obj/item/clothing/mask/balaclava/tactical
@@ -23,6 +24,7 @@
item_state = "luchag"
flags = FPRINT|TABLEPASS|BLOCKHAIR
flags_inv = HIDEFACE
+ body_parts_covered = HEAD|FACE
w_class = 2
siemens_coefficient = 3.0
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index f4609c4ed5..220f1daf7c 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -4,6 +4,7 @@
icon_state = "breath"
item_state = "breath"
flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKINTERNALS
+ body_parts_covered = 0
w_class = 2
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 2b4d254809..ac3638d28d 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -4,6 +4,7 @@
icon_state = "gas_alt"
flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
+ body_parts_covered = FACE|EYES
w_class = 3.0
item_state = "gas_alt"
gas_transfer_coefficient = 0.01
@@ -18,12 +19,14 @@
icon_state = "plaguedoctor"
item_state = "gas_mask"
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)
+ body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/gas/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
icon_state = "swat"
siemens_coefficient = 0.7
+ body_parts_covered = FACE|EYES
/obj/item/clothing/mask/gas/syndicate
name = "syndicate mask"
@@ -70,6 +73,7 @@
desc = "A mask used when acting as a monkey."
icon_state = "monkeymask"
item_state = "monkeymask"
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 57420bbfe0..8cc12fb172 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -4,6 +4,7 @@
icon_state = "muzzle"
item_state = "muzzle"
flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+ body_parts_covered = 0
w_class = 2
gas_transfer_coefficient = 0.90
@@ -23,6 +24,7 @@
item_state = "sterile"
w_class = 2
flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+ body_parts_covered = 0
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
@@ -33,6 +35,7 @@
icon_state = "fake-moustache"
flags = FPRINT|TABLEPASS
flags_inv = HIDEFACE
+ body_parts_covered = 0
/obj/item/clothing/mask/snorkel
name = "Snorkel"
@@ -40,6 +43,7 @@
icon_state = "snorkel"
flags = FPRINT|TABLEPASS
flags_inv = HIDEFACE
+ body_parts_covered = 0
//scarves (fit in in mask slot)
@@ -89,6 +93,7 @@
flags_inv = HIDEFACE
w_class = 2
siemens_coefficient = 0.9
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/horsehead
name = "horse head mask"
@@ -97,6 +102,7 @@
item_state = "horsehead"
flags = FPRINT|TABLEPASS|BLOCKHAIR
flags_inv = HIDEFACE
+ body_parts_covered = HEAD|FACE|EYES
w_class = 2
var/voicechange = 0
- siemens_coefficient = 0.9
+ siemens_coefficient = 0.9
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 766cc96f05..3f3fbbd877 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -56,11 +56,13 @@
name = "sandals"
icon_state = "wizard"
species_restricted = null
+ body_parts_covered = 0
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic, black shoes."
name = "magic shoes"
icon_state = "black"
+ body_parts_covered = FEET
/obj/item/clothing/shoes/galoshes
desc = "Rubber boots"
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 3719f0c7db..1b5d33c100 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -120,6 +120,7 @@
icon_state = "vox-carapace"
item_state = "vox-carapace"
desc = "A glowing visor, perhaps stolen from a depressed Cylon."
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/space/vox/carapace
name = "alien carapace armour"
@@ -161,6 +162,7 @@
icon_state = "vox-casual-1"
item_color = "vox-casual-1"
item_state = "vox-casual-1"
+ body_parts_covered = LEGS
/obj/item/clothing/under/vox/vox_robes
name = "alien robes"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index cdecadd6c8..9aa180912c 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -22,7 +22,7 @@
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
slowdown = 1.5
armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
+ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.7
@@ -50,6 +50,7 @@
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+ body_parts_covered = HEAD
/obj/item/clothing/suit/space/santa
name = "Santa's suit"
@@ -69,6 +70,7 @@
item_state = "pirate"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE
+ body_parts_covered = 0
siemens_coefficient = 0.9
/obj/item/clothing/suit/space/pirate
@@ -81,5 +83,6 @@
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.9
+ body_parts_covered = UPPER_TORSO|ARMS
diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm
index c51594e0e6..f10e55168f 100644
--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -7,6 +7,7 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
siemens_coefficient = 0.2
species_restricted = null
+ body_parts_covered = HEAD|FACE
/obj/item/clothing/suit/space/space_ninja
name = "ninja suit"
@@ -18,6 +19,7 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.2
species_restricted = null //Workaround for spawning alien ninja without internals.
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//Important parts of the suit.
var/mob/living/carbon/affecting = null//The wearer.
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index 539efcaacc..54141e9994 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -5,7 +5,7 @@
desc = "A traditional Unathi garment."
icon_state = "robe-unathi"
item_state = "robe-unathi"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/unathi/mantle
name = "hide mantle"
@@ -21,9 +21,10 @@
desc = "A traditional Zhan-Khazan garment."
icon_state = "zhan_furs"
item_state = "zhan_furs"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
/obj/item/clothing/head/tajaran/scarf
name = "headscarf"
desc = "A scarf of coarse fabric. Seems to have ear-holes."
- icon_state = "zhan_scarf"
\ No newline at end of file
+ icon_state = "zhan_scarf"
+ body_parts_covered = HEAD|FACE
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 39ff06677c..a51fc8ab85 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -31,6 +31,7 @@
desc = "An armoured jacket with silver rank pips and livery."
icon_state = "warden_jacket"
item_state = "armor"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/armor/riot
@@ -38,7 +39,7 @@
desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
icon_state = "riot"
item_state = "swat_suit"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
slowdown = 1
armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
flags_inv = HIDEJUMPSUIT
@@ -71,7 +72,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = FPRINT | TABLEPASS
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 0, rad = 0)
@@ -88,6 +89,7 @@
item_state = "det_suit"
blood_overlay_type = "coat"
flags_inv = 0
+ body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/armor/det_suit
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 64a989d6a2..e2c6ee65fa 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -7,6 +7,7 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0.9
/obj/item/clothing/suit/bio_suit
@@ -29,10 +30,11 @@
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
icon_state = "bio_general"
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/suit/bio_suit/general
icon_state = "bio_general"
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//Virology biosuit, green stripe
/obj/item/clothing/head/bio_hood/virology
@@ -40,7 +42,7 @@
/obj/item/clothing/suit/bio_suit/virology
icon_state = "bio_virology"
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//Security biosuit, grey with red stripe across the chest
/obj/item/clothing/head/bio_hood/security
@@ -48,7 +50,7 @@
/obj/item/clothing/suit/bio_suit/security
icon_state = "bio_security"
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//Janitor's biosuit, grey with purple arms
/obj/item/clothing/head/bio_hood/janitor
@@ -56,6 +58,7 @@
/obj/item/clothing/suit/bio_suit/janitor
icon_state = "bio_janitor"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//Scientist's biosuit, white with a pink-ish hue
@@ -64,11 +67,12 @@
/obj/item/clothing/suit/bio_suit/scientist
icon_state = "bio_scientist"
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
//CMO's biosuit, blue stripe
/obj/item/clothing/suit/bio_suit/cmo
icon_state = "bio_cmo"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/head/bio_hood/cmo
icon_state = "bio_cmo"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 8ad2e7751e..547464a99e 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -9,7 +9,7 @@
icon_state = "apron"
item_state = "apron"
blood_overlay_type = "armor"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO
+ body_parts_covered = 0
allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
//Captain
@@ -18,7 +18,7 @@
desc = "Worn by a Captain to show their class."
icon_state = "captunic"
item_state = "bio_suit"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
@@ -36,7 +36,7 @@
desc = "This suit says to you 'hush'!"
icon_state = "chaplain_hoodie"
item_state = "chaplain_hoodie"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|ARMS
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
//Chaplain
@@ -45,7 +45,7 @@
desc = "Maximum piety in this star system."
icon_state = "nun"
item_state = "nun"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
@@ -68,7 +68,7 @@
icon_state = "apronchef"
item_state = "apronchef"
blood_overlay_type = "armor"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO
+ body_parts_covered = 0
//Detective
/obj/item/clothing/suit/storage/det_suit
@@ -77,7 +77,7 @@
icon_state = "detective"
item_state = "det_suit"
blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
@@ -90,7 +90,7 @@
name = "jacket"
desc = "A forensics technician jacket."
item_state = "det_suit"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
@@ -114,6 +114,7 @@
allowed = list (/obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, \
/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \
/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
+ body_parts_covered = UPPER_TORSO
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
@@ -172,6 +173,7 @@
blood_overlay_type = "armor"
allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen)
+ body_parts_covered = UPPER_TORSO|ARMS
verb/toggle()
set name = "Toggle Jacket Buttons"
@@ -196,4 +198,5 @@
desc = "They suspend the illusion of the mime's play."
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
- blood_overlay_type = "armor" //it's the less thing that I can put here
\ No newline at end of file
+ blood_overlay_type = "armor" //it's the less thing that I can put here
+ body_parts_covered = 0
\ No newline at end of file
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 4cb25f57cf..c230d7defa 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -4,7 +4,7 @@
icon_state = "labcoat_open"
item_state = "labcoat"
blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ body_parts_covered = UPPER_TORSO|ARMS
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/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
@@ -91,7 +91,7 @@
src.icon_state = "labgreen_open"
usr << "You unbutton the labcoat."
else
- usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are."
+ usr << "You attempt to button-up the velcro on your [src], before promptly realising how silly you are."
return
usr.update_inv_wear_suit() //so our overlays update
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index c8abf97975..09726bb3d3 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -14,7 +14,7 @@
icon_state = "bluetag"
item_state = "bluetag"
blood_overlay_type = "armor"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO
+ body_parts_covered = UPPER_TORSO
allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
siemens_coefficient = 3.0
@@ -24,7 +24,7 @@
icon_state = "redtag"
item_state = "redtag"
blood_overlay_type = "armor"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO
+ body_parts_covered = UPPER_TORSO
allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
siemens_coefficient = 3.0
@@ -37,6 +37,7 @@
icon_state = "pirate"
item_state = "pirate"
flags = FPRINT | TABLEPASS
+ body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/hgpirate
@@ -46,6 +47,7 @@
item_state = "hgpirate"
flags = FPRINT | TABLEPASS
flags_inv = HIDEJUMPSUIT
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/suit/cyborg_suit
@@ -81,6 +83,7 @@
item_state = "justice"
flags = FPRINT | TABLEPASS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/judgerobe
@@ -120,14 +123,14 @@
flags = FPRINT | TABLEPASS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/hastur
name = "Hastur's Robes"
desc = "Robes not meant to be worn by man"
icon_state = "hastur"
item_state = "hastur"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -136,7 +139,7 @@
desc = "Have YOU killed a xenos today?"
icon_state = "imperium_monk"
item_state = "imperium_monk"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
@@ -186,7 +189,7 @@
desc = "A suit that completely restrains the wearer."
icon_state = "straight_jacket"
item_state = "straight_jacket"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
/obj/item/clothing/suit/ianshirt
@@ -194,6 +197,7 @@
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"
+ body_parts_covered = UPPER_TORSO|ARMS
//Blue suit jacket toggle
/obj/item/clothing/suit/suit/verb/toggle()
@@ -258,6 +262,8 @@
flags = FPRINT | TABLEPASS
//stripper
+/obj/item/clothing/under/stripper
+ body_parts_covered = 0
/obj/item/clothing/under/stripper/stripper_pink
name = "pink swimsuit"
@@ -299,12 +305,13 @@
desc = "A suit made out of chitinous alien hide."
icon_state = "xenos"
item_state = "xenos_helm"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
//swimsuit
/obj/item/clothing/under/swimsuit/
siemens_coefficient = 1
+ body_parts_covered = 0
/obj/item/clothing/under/swimsuit/black
name = "black swimsuit"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 033ce88419..91153fee0f 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -50,6 +50,7 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0
@@ -62,7 +63,6 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = FPRINT | TABLEPASS
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 2
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
flags_inv = HIDEJUMPSUIT|HIDETAIL
@@ -74,12 +74,13 @@
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
-
+ body_parts_covered = HEAD
/obj/item/clothing/suit/bomb_suit/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
/*
* Radiation protection
@@ -89,6 +90,7 @@
icon_state = "rad"
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+ body_parts_covered = HEAD|FACE|EYES
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
@@ -100,7 +102,7 @@
w_class = 4//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas)
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index d168edc4c1..03240b2f3c 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -4,6 +4,7 @@
icon_state = "wizard"
//Not given any special protective value since the magic robes are full-body protection --NEO
siemens_coefficient = 0.8
+ body_parts_covered = 0
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
@@ -15,6 +16,7 @@
name = "wizard hat"
desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
icon_state = "wizard-fake"
+ body_parts_covered = HEAD|FACE
/obj/item/clothing/head/wizard/marisa
name = "Witch Hat"
@@ -28,6 +30,7 @@
icon_state = "magus"
item_state = "magus"
siemens_coefficient = 0.8
+ body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/wizard/amp
name = "psychic amplifier"
@@ -48,7 +51,6 @@
item_state = "wizrobe"
gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE
permeability_coefficient = 0.01
- body_parts_covered = FULL_BODY //It's magic, I ain't gotta explain shit. --NEO
armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
allowed = list(/obj/item/weapon/teleportation_scroll)
flags_inv = HIDEJUMPSUIT
@@ -72,12 +74,14 @@
desc = "A set of armoured robes that seem to radiate a dark power"
icon_state = "magusblue"
item_state = "magusblue"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/wizrobe/magusred
name = "Magus Robe"
desc = "A set of armoured robes that seem to radiate a dark power"
icon_state = "magusred"
item_state = "magusred"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/wizrobe/psypurple
name = "purple robes"
@@ -90,13 +94,13 @@
desc = "A heavy threaded twead gray jacket. For a different sort of Gentleman."
icon_state = "gentlecoat"
item_state = "gentlecoat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"
desc = "A rather dull, blue robe meant to mimick real wizard robes."
icon_state = "wizard-fake"
item_state = "wizrobe"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 1.0
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index fe9da8744d..1cb79699c9 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -48,6 +48,7 @@
icon_state = A.icon_state
item_state = A.item_state
item_color = A.item_color
+ body_parts_covered = A.body_parts_covered
if(usr)
usr.update_inv_w_uniform() //so our overlays update.
@@ -62,6 +63,7 @@
item_color = "grey"
desc = "It looks like a plain hat, but upon closer inspection, there's an advanced holographic array installed inside. It seems to have a small dial inside."
origin_tech = "syndicate=3"
+ body_parts_covered = 0
var/list/clothing_choices = list()
New()
@@ -101,6 +103,7 @@
item_state = A.item_state
item_color = A.item_color
flags_inv = A.flags_inv
+ body_parts_covered = A.body_parts_covered
if(usr)
usr.update_inv_head() //so our overlays update.
@@ -154,6 +157,7 @@
item_state = A.item_state
item_color = A.item_color
flags_inv = A.flags_inv
+ body_parts_covered = A.body_parts_covered
if(usr)
usr.update_inv_wear_suit() //so our overlays update.
@@ -356,6 +360,7 @@
icon_state = A.icon_state
item_state = A.item_state
flags_inv = A.flags_inv
+ body_parts_covered = A.body_parts_covered
if(usr)
usr.update_inv_wear_mask() //so our overlays update.
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 0798c11bf5..dc6149562d 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -33,6 +33,7 @@
item_state = "lb_suit"
item_color = "cargo"
flags = FPRINT | TABLEPASS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/chaplain
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 3d7db9613d..17b85a02e3 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -26,7 +26,7 @@
item_color = "dress_rd"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | TABLEPASS
-
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/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."
@@ -87,6 +87,7 @@
item_color = "nursesuit"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/rank/nurse
desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -96,6 +97,7 @@
item_color = "nurse"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/rank/orderly
desc = "A white suit to be worn by orderly people who love orderly things."
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 5b37f50719..93db421035 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -36,6 +36,7 @@
item_color = "dispatch"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
siemens_coefficient = 0.9
/obj/item/clothing/under/rank/security2
@@ -105,6 +106,7 @@
allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
+ body_parts_covered = 0
/obj/item/clothing/head/det_hat/black
icon_state = "detective2"
@@ -134,8 +136,8 @@
icon_state = "hoscap"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
- flags_inv = 0
flags_inv = HIDEEARS
+ body_parts_covered = 0
siemens_coefficient = 0.8
/obj/item/clothing/suit/armor/hos
@@ -171,4 +173,5 @@
icon_state = "jensencoat"
item_state = "jensencoat"
flags_inv = 0
- siemens_coefficient = 0.6
\ No newline at end of file
+ siemens_coefficient = 0.6
+ body_parts_covered = UPPER_TORSO|ARMS
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 3e4cf1a3d1..094d76b32c 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -54,6 +54,7 @@
icon_state = "sexyclown"
item_state = "sexyclown"
item_color = "sexyclown"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/rank/vice
name = "vice officer's jumpsuit"
@@ -137,6 +138,7 @@
icon_state = "psysuit"
item_state = "psysuit"
item_color = "psysuit"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
/obj/item/clothing/under/gentlesuit
name = "Gentlemans Suit"
@@ -200,7 +202,7 @@
icon_state = "schoolgirl"
item_state = "schoolgirl"
item_color = "schoolgirl"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/overalls
name = "laborer's overalls"
@@ -215,6 +217,7 @@
icon_state = "pirate"
item_state = "pirate"
item_color = "pirate"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/soviet
name = "soviet uniform"
@@ -252,9 +255,11 @@
icon_state = "gladiator"
item_state = "gladiator"
item_color = "gladiator"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ body_parts_covered = LOWER_TORSO
//dress
+/obj/item/clothing/under/dress/
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/dress/dress_fire
name = "flame dress"
@@ -298,18 +303,21 @@
desc = "Feminine fashion for the style concious captain."
icon_state = "dress_cap"
item_color = "dress_cap"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/dress/dress_hop
name = "head of personnel dress uniform"
desc = "Feminine fashion for the style concious HoP."
icon_state = "dress_hop"
item_color = "dress_hop"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/dress/dress_hr
name = "human resources director uniform"
desc = "Superior class for the nosy H.R. Director."
icon_state = "huresource"
item_color = "huresource"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/dress/plaid_blue
name = "blue plaid skirt"
@@ -330,6 +338,8 @@
item_color = "plaid_purple"
//wedding stuff
+/obj/item/clothing/under/wedding/
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/wedding/bride_orange
name = "orange wedding dress"
@@ -365,6 +375,7 @@
icon_state = "bride_white"
item_color = "bride_white"
flags_inv = HIDESHOES
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/sundress
name = "sundress"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 9c820db026..cba0382911 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -676,18 +676,12 @@
//////////// Hats ////////////
-
-/obj/item/clothing/head/fluff/kaine_kalim_1
- name = "Formal Medical Cap"
- desc = "An unusually sterile and folded cap. It seems to bare the Nanotrasen logo."
- icon = 'icons/obj/custom_items.dmi'
- icon_state = "kainecap"
-
/obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
name = "\improper SWAT hat"
desc = "A black hat. The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\""
icon = 'icons/obj/custom_items.dmi'
icon_state = "swatcap"
+ body_parts_covered = 0
/obj/item/clothing/head/welding/fluff/alice_mccrea_1 //madmalicemccrea: Alice McCrea
name = "flame decal welding helmet"
@@ -712,6 +706,10 @@
desc = "Hey, I think we're missing a hazard vest..."
icon = 'icons/obj/custom_items.dmi'
icon_state = "taryn_kifer_1"
+ body_parts_covered = 0
+
+/obj/item/clothing/head/fluff
+ body_parts_covered = 0
/obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor
name = "Edvin's Hat"
@@ -731,6 +729,13 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "brucehachert"
+/obj/item/clothing/head/fluff/kaine_kalim_1
+ name = "Formal Medical Cap"
+ desc = "An unusually sterile and folded cap. It seems to bare the Nanotrasen logo."
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "kainecap"
+
+
/obj/item/clothing/head/beret/fluff/marine_beret //Von2531: Jack Washington
name = "colonial marine beret"
desc = "A well-worn navy blue beret. The insignia of the Martian Colonial Marine Corps is affixed to the front."
@@ -753,6 +758,7 @@
desc = "A labcoat with a few markings denoting it as the labcoat of roboticist."
icon = 'icons/obj/custom_items.dmi'
icon_state = "aeneasrinil"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
name = "pink labcoat"
@@ -781,7 +787,7 @@
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "mantle-unathi"
item_state = "mantle-unathi"
- body_parts_covered = UPPER_TORSO
+ body_parts_covered = 0
/////////////////////////////// 50_n00b - R.A.N.G.E.'s blue dress //////////////////////////
@@ -791,6 +797,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "br_dress"
item_state = "br_dress"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
//////////////////////////////// Broseph Stylin - Lombardi's Jacket ///////////////////////////
@@ -800,6 +807,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "lombardi_jacket"
item_state = "lombardi_jacket"
+ body_parts_covered = UPPER_TORSO|ARMS
verb/toggle()
set name = "Toggle Jacket Buttons"
@@ -812,7 +820,7 @@
switch(icon_state)
if("lombardi_jacket")
src.icon_state = "lombardi_jacket_open"
- usr << "You unbutton up the jacket."
+ usr << "You unbutton the jacket."
if("lombardi_jacket_open")
src.icon_state = "lombardi_jacket"
usr << "You button up the jacket."
@@ -852,6 +860,7 @@
icon_state = "lilith_uniform"
item_state = "lilith_uniform"
item_color = "lilith_uniform"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/fluff/ana_issek_1 //suethecake: Ana Issek
name = "retired uniform"
@@ -860,6 +869,7 @@
icon_state = "ana_uniform"
item_state = "ana_uniform"
item_color = "ana_uniform"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/fluff/olddressuniform //desiderium: Momiji Inubashiri
name = "retired dress uniform"
@@ -893,6 +903,7 @@
icon_state = "tian_dress"
item_state = "tian_dress"
item_color = "tian_dress"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/rank/bartender/fluff/classy //searif: Ara Al-Jazari
name = "classy bartender uniform"
@@ -978,6 +989,7 @@
icon_state = "lillian_dress"
item_state = "lillian_dress"
item_color = "lillian_dress"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
////////////// Accessories /////
@@ -1022,6 +1034,7 @@
icon = 'icons/obj/custom_items.dmi'
item_state = "head_m"
icon_state = "head_m"
+ body_parts_covered = FACE|EYES
////// Small locket - Altair An-Nasaqan - Serithi
@@ -1100,6 +1113,7 @@
flags = FPRINT|TABLEPASS
w_class = 2
slot_flags = SLOT_MASK
+ body_parts_covered = 0
//////////// Shoes ////////////
@@ -1142,6 +1156,7 @@
icon_state = "medical_short"
item_state = "medical_short"
item_color = "medical_short"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/storage/labcoat/fluff/red
name = "red labcoat"
@@ -1242,6 +1257,7 @@
icon_state = "mai_yang"
item_state = "mai_yang"
item_color = "mai_yang"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/fluff/sakura_hokkaido_kimono
name = "Sakura Kimono"
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 48c16a9983..f68c2a95ee 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -16,6 +16,7 @@ var/const/MAX_ACTIVE_TIME = 400
item_state = "facehugger"
w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | MASKINTERNALS
+ body_parts_covered = FACE|EYES
throw_range = 5
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
diff --git a/code/setup.dm b/code/setup.dm
index 13974e022e..2020e25119 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -263,21 +263,23 @@ var/MAX_EXPLOSION_RANGE = 14
// bitflags for clothing parts
#define HEAD 1
-#define UPPER_TORSO 2
-#define LOWER_TORSO 4
-#define LEG_LEFT 8
-#define LEG_RIGHT 16
-#define LEGS 24
-#define FOOT_LEFT 32
-#define FOOT_RIGHT 64
-#define FEET 96
-#define ARM_LEFT 128
-#define ARM_RIGHT 256
-#define ARMS 384
-#define HAND_LEFT 512
-#define HAND_RIGHT 1024
-#define HANDS 1536
-#define FULL_BODY 2047
+#define FACE 2
+#define EYES 4
+#define UPPER_TORSO 8
+#define LOWER_TORSO 16
+#define LEG_LEFT 32
+#define LEG_RIGHT 64
+#define LEGS 96
+#define FOOT_LEFT 128
+#define FOOT_RIGHT 256
+#define FEET 384
+#define ARM_LEFT 512
+#define ARM_RIGHT 1024
+#define ARMS 1536
+#define HAND_LEFT 2048
+#define HAND_RIGHT 4096
+#define HANDS 6144
+#define FULL_BODY 8191
// bitflags for the percentual amount of protection a piece of clothing which covers the body part offers.
// Used with human/proc/get_heat_protection() and human/proc/get_cold_protection()