From f0fcd577684b254d5b98abe67108b77325519b5e Mon Sep 17 00:00:00 2001 From: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com> Date: Fri, 10 Sep 2021 21:06:14 +0200 Subject: [PATCH] removes gas_transfer_coefficent from clothing as it did nothing (#60922) it literaly does nothing --- code/game/objects/items.dm | 2 -- code/modules/clothing/chameleon.dm | 1 - code/modules/clothing/masks/_masks.dm | 2 -- code/modules/clothing/masks/breath.dm | 1 - code/modules/clothing/masks/gasmask.dm | 2 -- code/modules/clothing/masks/muzzle.dm | 2 -- code/modules/clothing/masks/surgical.dm | 1 - code/modules/clothing/spacesuits/_spacesuits.dm | 1 - code/modules/clothing/suits/armor.dm | 1 - code/modules/clothing/suits/bio.dm | 1 - code/modules/clothing/suits/jobs.dm | 1 - code/modules/clothing/suits/utility.dm | 3 --- code/modules/clothing/suits/wiz_robe.dm | 6 ------ code/modules/clothing/under/jobs/civilian/curator.dm | 1 - code/modules/clothing/under/miscellaneous.dm | 1 - .../modules/research/xenobiology/crossbreeding/_clothing.dm | 1 - 16 files changed, 27 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f2283a9fa32..68b1267049b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -113,8 +113,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e ///What body parts are covered by the clothing when you wear it var/body_parts_covered = 0 - ///Literally does nothing right now - var/gas_transfer_coefficient = 1 /// How likely a disease or chemical is to get through a piece of clothing var/permeability_coefficient = 1 /// for electrical admittance/conductance (electrocution checks and shit) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 6acf6f66d9e..e56d93e5c6e 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -540,7 +540,6 @@ armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index 17bb1a68bf5..f7e0e8fdc97 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -66,7 +66,6 @@ mask_adjusted = !mask_adjusted if(!mask_adjusted) src.icon_state = initial(icon_state) - gas_transfer_coefficient = initial(gas_transfer_coefficient) permeability_coefficient = initial(permeability_coefficient) clothing_flags |= visor_flags flags_inv |= visor_flags_inv @@ -76,7 +75,6 @@ else icon_state += "_up" to_chat(user, span_notice("You push \the [src] out of the way.")) - gas_transfer_coefficient = null permeability_coefficient = 1 clothing_flags &= ~visor_flags flags_inv &= ~visor_flags_inv diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 72f7dfe85aa..53d5b1fb3bb 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -7,7 +7,6 @@ clothing_flags = MASKINTERNALS visor_flags = MASKINTERNALS w_class = WEIGHT_CLASS_SMALL - gas_transfer_coefficient = 0.1 permeability_coefficient = 0.5 actions_types = list(/datum/action/item_action/adjust) flags_cover = MASKCOVERSMOUTH diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0e4db9b22a4..3cf3e6e2f69 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -6,7 +6,6 @@ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_NORMAL inhand_icon_state = "gas_alt" - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE @@ -94,7 +93,6 @@ inhand_icon_state = "gas_atmos" armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 10, FIRE = 20, ACID = 10) w_class = WEIGHT_CLASS_SMALL - gas_transfer_coefficient = 0.001 //cargo cult time, this var does nothing but just in case someone actually makes it do something permeability_coefficient = 0.001 resistance_flags = FIRE_PROOF max_filters = 3 diff --git a/code/modules/clothing/masks/muzzle.dm b/code/modules/clothing/masks/muzzle.dm index af8c3a1b5f2..79bf45a762a 100644 --- a/code/modules/clothing/masks/muzzle.dm +++ b/code/modules/clothing/masks/muzzle.dm @@ -6,7 +6,6 @@ clothing_flags = BLOCKS_SPEECH flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_SMALL - gas_transfer_coefficient = 0.9 equip_delay_other = 20 /obj/item/clothing/mask/muzzle/attack_paw(mob/user, list/modifiers) @@ -24,6 +23,5 @@ inhand_icon_state = "breathmuzzle" body_parts_covered = NONE clothing_flags = MASKINTERNALS | BLOCKS_SPEECH - gas_transfer_coefficient = 0.1 permeability_coefficient = 0.01 equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle diff --git a/code/modules/clothing/masks/surgical.dm b/code/modules/clothing/masks/surgical.dm index 5b436032dc5..f13bf3f6f16 100644 --- a/code/modules/clothing/masks/surgical.dm +++ b/code/modules/clothing/masks/surgical.dm @@ -8,7 +8,6 @@ flags_cover = MASKCOVERSMOUTH visor_flags_inv = HIDEFACE|HIDESNOUT visor_flags_cover = MASKCOVERSMOUTH - gas_transfer_coefficient = 0.9 permeability_coefficient = 0.01 armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 25, RAD = 0, FIRE = 0, ACID = 0) actions_types = list(/datum/action/item_action/adjust) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 18d5685c3b0..90f4b3c655d 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -30,7 +30,6 @@ icon_state = "spaceold" inhand_icon_state = "s_suit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 735496e5968..e810c5a18ad 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -246,7 +246,6 @@ icon_state = "heavy" inhand_icon_state = "swat_suit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.9 clothing_flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 3 diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 1e0b6c0d963..265aba7eb43 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -16,7 +16,6 @@ icon_state = "bio" inhand_icon_state = "bio_suit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 clothing_flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 9d5a8c84411..c5d71d0eaaf 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -37,7 +37,6 @@ desc = "An apron-jacket used by a high class chef." icon_state = "chef" inhand_icon_state = "chef" - gas_transfer_coefficient = 0.9 permeability_coefficient = 0.5 body_parts_covered = CHEST|GROIN|ARMS allowed = list(/obj/item/kitchen) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 001732ae5d8..204785336b5 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -15,7 +15,6 @@ icon_state = "fire" inhand_icon_state = "ro_suit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.9 permeability_coefficient = 0.5 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/extinguisher, /obj/item/crowbar) @@ -77,7 +76,6 @@ icon_state = "bombsuit" inhand_icon_state = "bombsuit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 clothing_flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS @@ -134,7 +132,6 @@ icon_state = RAD inhand_icon_state = "rad_suit" w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.9 permeability_coefficient = 0.5 clothing_flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 5dc5a96e4a0..cbaf04a9189 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -2,7 +2,6 @@ name = "wizard hat" desc = "Strange-looking hat-wear that most certainly belongs to a real magic user." icon_state = "wizard" - gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE permeability_coefficient = 0.01 armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 20, RAD = 20, FIRE = 100, ACID = 100, WOUND = 20) strip_delay = 50 @@ -33,7 +32,6 @@ name = "wizard hat" desc = "It has WIZZARD written across it in sequins. Comes with a cool beard." icon_state = "wizard-fake" - gas_transfer_coefficient = 1 permeability_coefficient = 1 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) resistance_flags = FLAMMABLE @@ -64,7 +62,6 @@ desc = "A magnificent, gem-lined robe that seems to radiate power." icon_state = "wizard" inhand_icon_state = "wizrobe" - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 body_parts_covered = CHEST|GROIN|ARMS|LEGS armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 20, RAD = 20, FIRE = 100, ACID = 100, WOUND = 20) @@ -122,7 +119,6 @@ desc = "A rather dull blue robe meant to mimic real wizard robes." icon_state = "wizard-fake" inhand_icon_state = "wizrobe" - gas_transfer_coefficient = 1 permeability_coefficient = 1 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) resistance_flags = FLAMMABLE @@ -131,7 +127,6 @@ name = "witch hat" desc = "Strange-looking hat-wear, makes you want to cast fireballs." icon_state = "marisa" - gas_transfer_coefficient = 1 permeability_coefficient = 1 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) resistance_flags = FLAMMABLE @@ -141,7 +136,6 @@ desc = "Magic is all about the spell power, ZE!" icon_state = "marisa" inhand_icon_state = "marisarobe" - gas_transfer_coefficient = 1 permeability_coefficient = 1 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) resistance_flags = FLAMMABLE diff --git a/code/modules/clothing/under/jobs/civilian/curator.dm b/code/modules/clothing/under/jobs/civilian/curator.dm index 08e3842d8b2..5c27c1864f0 100644 --- a/code/modules/clothing/under/jobs/civilian/curator.dm +++ b/code/modules/clothing/under/jobs/civilian/curator.dm @@ -38,7 +38,6 @@ greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_inhand_right greyscale_config_worn = /datum/greyscale_config/jumpsuit_worn w_class = WEIGHT_CLASS_BULKY - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS cold_protection = CHEST | GROIN | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f576323e4f4..3464202e8d1 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -47,7 +47,6 @@ inhand_icon_state = "bl_suit" worn_icon = 'icons/mob/clothing/under/syndicate.dmi' desc = "A cybernetically enhanced jumpsuit used for administrative duties." - gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor = list(MELEE = 100, BULLET = 100, LASER = 100,ENERGY = 100, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index c4c7d513727..7fe659016b4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -13,7 +13,6 @@ Slimecrossing Armor body_parts_covered = NONE w_class = WEIGHT_CLASS_SMALL clothing_traits = list(TRAIT_NOBREATH) - gas_transfer_coefficient = 0 permeability_coefficient = 0.5 flags_cover = MASKCOVERSMOUTH resistance_flags = NONE