Merge pull request #9282 from Ghommie/Ghommie-cit193

Fixed a few dozen suits' body coverage inconsistencies.
This commit is contained in:
kevinz000
2019-09-21 01:43:52 -07:00
committed by GitHub
7 changed files with 28 additions and 14 deletions
+1
View File
@@ -5,6 +5,7 @@
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
slot_flags = ITEM_SLOT_OCLOTHING slot_flags = ITEM_SLOT_OCLOTHING
body_parts_covered = CHEST
var/blood_overlay_type = "suit" var/blood_overlay_type = "suit"
var/togglename = null var/togglename = null
var/suittoggled = FALSE var/suittoggled = FALSE
-1
View File
@@ -1,6 +1,5 @@
/obj/item/clothing/suit/armor /obj/item/clothing/suit/armor
allowed = null allowed = null
body_parts_covered = CHEST
cold_protection = CHEST|GROIN cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN heat_protection = CHEST|GROIN
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "qmcloak" icon_state = "qmcloak"
item_state = "qmcloak" item_state = "qmcloak"
w_class = WEIGHT_CLASS_SMALL w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS body_parts_covered = CHEST|LEGS|ARMS
/obj/item/clothing/head/cloakhood /obj/item/clothing/head/cloakhood
name = "cloak hood" name = "cloak hood"
@@ -62,7 +62,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|ARMS|LEGS
/obj/item/clothing/head/hooded/cloakhood/goliath /obj/item/clothing/head/hooded/cloakhood/goliath
name = "goliath cloak hood" name = "goliath cloak hood"
+2
View File
@@ -153,6 +153,7 @@
icon = 'icons/obj/clothing/belts.dmi' icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders" icon_state = "suspenders"
blood_overlay_type = "armor" //it's the less thing that I can put here blood_overlay_type = "armor" //it's the less thing that I can put here
body_parts_covered = NONE
//Security //Security
/obj/item/clothing/suit/security/officer /obj/item/clothing/suit/security/officer
@@ -215,3 +216,4 @@
item_state = "techpriesthood" item_state = "techpriesthood"
body_parts_covered = HEAD body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS flags_inv = HIDEHAIR|HIDEEARS
mutantrace_variation = MUTANTRACE_VARIATION
+20 -11
View File
@@ -67,6 +67,7 @@
item_state = "death" item_state = "death"
flags_1 = CONDUCT_1 flags_1 = CONDUCT_1
fire_resist = T0C+5200 fire_resist = T0C+5200
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|FEET
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -75,6 +76,7 @@
desc = "this pretty much looks ridiculous" //Needs no fixing desc = "this pretty much looks ridiculous" //Needs no fixing
icon_state = "justice" icon_state = "justice"
item_state = "justice" item_state = "justice"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|FEET
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -100,14 +102,14 @@
desc = "A fancy purple apron for a stylish person." desc = "A fancy purple apron for a stylish person."
icon_state = "purplebartenderapron" icon_state = "purplebartenderapron"
item_state = "purplebartenderapron" item_state = "purplebartenderapron"
body_parts_covered = CHEST|GROIN|LEGS body_parts_covered = CHEST
/obj/item/clothing/suit/syndicatefake /obj/item/clothing/suit/syndicatefake
name = "black and red space suit replica" name = "black and red space suit replica"
icon_state = "syndicate-black-red" icon_state = "syndicate-black-red"
item_state = "syndicate-black-red" item_state = "syndicate-black-red"
desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
w_class = WEIGHT_CLASS_NORMAL body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET|HANDS
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = NONE resistance_flags = NONE
@@ -154,7 +156,7 @@
icon_state = "owl_wings" icon_state = "owl_wings"
item_state = "owl_wings" item_state = "owl_wings"
togglename = "wings" togglename = "wings"
body_parts_covered = ARMS|CHEST body_parts_covered = ARMS
actions_types = list(/datum/action/item_action/toggle_wings) actions_types = list(/datum/action/item_action/toggle_wings)
/obj/item/clothing/suit/toggle/owlwings/Initialize() /obj/item/clothing/suit/toggle/owlwings/Initialize()
@@ -209,6 +211,7 @@
desc = "Your classic, non-racist poncho." desc = "Your classic, non-racist poncho."
icon_state = "classicponcho" icon_state = "classicponcho"
item_state = "classicponcho" item_state = "classicponcho"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/poncho/green /obj/item/clothing/suit/poncho/green
name = "green poncho" name = "green poncho"
@@ -245,7 +248,7 @@
desc = "A costume made from 'synthetic' carp scales, it smells." desc = "A costume made from 'synthetic' carp scales, it smells."
icon_state = "carp_casual" icon_state = "carp_casual"
item_state = "labcoat" item_state = "labcoat"
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET
cold_protection = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun) allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun)
@@ -265,9 +268,7 @@
desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
icon_state = "ian" icon_state = "ian"
item_state = "labcoat" item_state = "labcoat"
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET
//cold_protection = CHEST|GROIN|ARMS
//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list() allowed = list()
hoodtype = /obj/item/clothing/head/hooded/ian_hood hoodtype = /obj/item/clothing/head/hooded/ian_hood
dog_fashion = /datum/dog_fashion/back dog_fashion = /datum/dog_fashion/back
@@ -277,8 +278,6 @@
desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits." desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
icon_state = "ian" icon_state = "ian"
body_parts_covered = HEAD body_parts_covered = HEAD
//cold_protection = HEAD
//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags_inv = HIDEHAIR|HIDEEARS flags_inv = HIDEHAIR|HIDEEARS
/obj/item/clothing/suit/hooded/bee_costume // It's Hip! /obj/item/clothing/suit/hooded/bee_costume // It's Hip!
@@ -304,7 +303,7 @@
desc = "A horribly bloated suit made from human skins." desc = "A horribly bloated suit made from human skins."
icon_state = "lingspacesuit" icon_state = "lingspacesuit"
item_state = "labcoat" item_state = "labcoat"
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET|HANDS
allowed = list() allowed = list()
actions_types = list(/datum/action/item_action/toggle_human_head) actions_types = list(/datum/action/item_action/toggle_human_head)
hoodtype = /obj/item/clothing/head/hooded/human_head hoodtype = /obj/item/clothing/head/hooded/human_head
@@ -345,18 +344,21 @@
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." 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" icon_state = "ianshirt"
item_state = "ianshirt" item_state = "ianshirt"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/nerdshirt /obj/item/clothing/suit/nerdshirt
name = "gamer shirt" name = "gamer shirt"
desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would anyone wear this?" desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would anyone wear this?"
icon_state = "nerdshirt" icon_state = "nerdshirt"
item_state = "nerdshirt" item_state = "nerdshirt"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat. /obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat.
name = "Vape Naysh shirt" name = "Vape Naysh shirt"
desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironically?" desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironically?"
icon_state = "vapeshirt" icon_state = "vapeshirt"
item_state = "vapeshirt" item_state = "vapeshirt"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/jacket /obj/item/clothing/suit/jacket
name = "bomber jacket" name = "bomber jacket"
@@ -364,7 +366,7 @@
icon_state = "bomberjacket" icon_state = "bomberjacket"
item_state = "brownjsuit" item_state = "brownjsuit"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|ARMS
cold_protection = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -389,6 +391,7 @@
desc = "A thick jacket with a rubbery, water-resistant shell." desc = "A thick jacket with a rubbery, water-resistant shell."
icon_state = "pufferjacket" icon_state = "pufferjacket"
item_state = "hostrench" item_state = "hostrench"
body_parts_covered = CHEST|GROIN|ARMS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 0) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/suit/jacket/puffer/vest /obj/item/clothing/suit/jacket/puffer/vest
@@ -436,18 +439,21 @@
desc = "Looks like this belongs in a very old movie set." desc = "Looks like this belongs in a very old movie set."
icon_state = "draculacoat" icon_state = "draculacoat"
item_state = "draculacoat" item_state = "draculacoat"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/drfreeze_coat /obj/item/clothing/suit/drfreeze_coat
name = "doctor freeze's labcoat" name = "doctor freeze's labcoat"
desc = "A labcoat imbued with the power of features and freezes." desc = "A labcoat imbued with the power of features and freezes."
icon_state = "drfreeze_coat" icon_state = "drfreeze_coat"
item_state = "drfreeze_coat" item_state = "drfreeze_coat"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/suit/gothcoat /obj/item/clothing/suit/gothcoat
name = "gothic coat" name = "gothic coat"
desc = "Perfect for those who want stalk in a corner of a bar." desc = "Perfect for those who want stalk in a corner of a bar."
icon_state = "gothcoat" icon_state = "gothcoat"
item_state = "gothcoat" item_state = "gothcoat"
body_parts_covered = CHEST|ARMS|HAND_LEFT //peculiar
/obj/item/clothing/suit/xenos /obj/item/clothing/suit/xenos
name = "xenos suit" name = "xenos suit"
@@ -586,6 +592,7 @@
name = "spooky ghost" name = "spooky ghost"
desc = "This is obviously just a bedsheet, but maybe try it on?" desc = "This is obviously just a bedsheet, but maybe try it on?"
icon_state = "bedsheet" icon_state = "bedsheet"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD
user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
@@ -594,6 +601,7 @@
desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice."
icon = 'icons/obj/clothing/clockwork_garb.dmi' icon = 'icons/obj/clothing/clockwork_garb.dmi'
icon_state = "clockwork_cuirass_old" icon_state = "clockwork_cuirass_old"
body_parts_covered = CHEST|GROIN|LEGS
armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20) armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
/obj/item/clothing/suit/ghost_sheet /obj/item/clothing/suit/ghost_sheet
@@ -606,4 +614,5 @@
throw_range = 2 throw_range = 2
w_class = WEIGHT_CLASS_TINY w_class = WEIGHT_CLASS_TINY
flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD
alternate_worn_layer = UNDER_HEAD_LAYER alternate_worn_layer = UNDER_HEAD_LAYER
@@ -12,6 +12,7 @@
icon_state = "hostrench" icon_state = "hostrench"
item_state = "hostrench" item_state = "hostrench"
mutantrace_variation = NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
body_parts_covered = CHEST|ARMS|LEGS
/obj/item/clothing/suit/hooded/cloak/david /obj/item/clothing/suit/hooded/cloak/david
name = "red cloak" name = "red cloak"
@@ -447,6 +447,7 @@
item_state = "kimono" item_state = "kimono"
icon = 'icons/obj/custom.dmi' icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/commjacket /obj/item/clothing/suit/commjacket
@@ -456,6 +457,7 @@
item_state = "commjacket" item_state = "commjacket"
icon = 'icons/obj/custom.dmi' icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/mw2_russian_para /obj/item/clothing/under/mw2_russian_para