diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 5471c804ac3..7e35f4f1921 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -206,6 +206,7 @@ item_state = "rig-syndie-human" icon_state = "rig-syndie-human" species_restricted = list("Human") + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL ////////////////UNATHI///////////////////// diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 878f7d14206..c9c169ba774 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -18,7 +18,7 @@ w_class = 4 gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|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_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) slowdown = 1.5 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 095807f6232..ef3af6fe3f3 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -96,3 +96,4 @@ item_state = "paramedic-eva" desc = "A paramedic space suit. Used in the recovery of bodies from space." slowdown = 1 + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 414273afae1..436afc72c6b 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -101,6 +101,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE species_restricted = list("exclude","Unathi","Tajara","Diona","Vox") + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL //Chief Engineer's rig /obj/item/clothing/head/helmet/space/rig/elite @@ -115,7 +116,7 @@ name = "advanced hardsuit" desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish." item_state = "ce_hardsuit" - + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL //Mining rig /obj/item/clothing/head/helmet/space/rig/mining @@ -130,6 +131,7 @@ name = "mining hardsuit" desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating." item_state = "mining_hardsuit" + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL @@ -208,7 +210,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding." item_state = "medical_hardsuit" allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) - + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL //Security /obj/item/clothing/head/helmet/space/rig/security @@ -228,6 +230,7 @@ armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/baton) siemens_coefficient = 0.7 + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL /obj/item/clothing/head/helmet/space/rig/security/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/weapon/modkit/unathi)) @@ -270,3 +273,4 @@ item_state = "atmos_hardsuit" armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0) max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL \ No newline at end of file diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 2dbe3d01fcb..1ff51b4f42d 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -17,7 +17,7 @@ w_class = 4//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT | TABLEPASS | ONESIZEFITSALL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 1.0 allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 0a434dd191e..899d2bff93f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -27,6 +27,7 @@ item_state = "bio_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT + flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/suit/captunic/capjacket name = "captain's uniform jacket" @@ -85,6 +86,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|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_box,/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) + flags = FPRINT | TABLEPASS | ONESIZEFITSALL //Forensics /obj/item/clothing/suit/storage/forensics diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 03b174452ae..d77e125e6e6 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -188,6 +188,7 @@ item_state = "straight_jacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/suit/ianshirt name = "worn shirt" diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6b93a38a19c..b0460b2ef9d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -660,6 +660,17 @@ proc/get_damage_icon_part(damage_state, body_part) var/image/standing = image("icon" = dmi, "icon_state" = "[wear_suit.icon_state]") + if(FAT in mutations) + if(wear_suit.flags&ONESIZEFITSALL) + standing.icon = 'icons/mob/suit_fat.dmi' + else + src << "\red You burst out of \the [wear_suit]!" + drop_from_inventory(wear_suit) + return + else + standing.icon = 'icons/mob/suit.dmi' + + if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) ) drop_from_inventory(handcuffed) drop_l_hand() diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index 1ed6754ff1a..71df0e9bcd2 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d2ed2800b3c..62c2eb08b24 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_fat.dmi b/icons/mob/suit_fat.dmi new file mode 100644 index 00000000000..6051db37972 Binary files /dev/null and b/icons/mob/suit_fat.dmi differ