From 1f461fe2d21526d607befc5390c71fed31059ad2 Mon Sep 17 00:00:00 2001 From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Date: Tue, 19 Aug 2025 18:13:41 +0500 Subject: [PATCH] Nullify all armor that is equal to armor = null (#30116) * nullifier * manually remove identical vars --- code/game/machinery/doors/airlock_types.dm | 2 +- code/game/objects/items/RSF.dm | 1 - code/game/objects/items/weapons/kitchen.dm | 2 +- code/game/objects/items/weapons/shields.dm | 2 +- code/modules/clothing/clothing.dm | 2 -- code/modules/clothing/head/helmet.dm | 6 +++--- code/modules/clothing/head/misc_special.dm | 5 ++--- code/modules/clothing/masks/misc_masks.dm | 1 - code/modules/clothing/suits/misc_suits.dm | 1 - code/modules/clothing/suits/wiz_robe.dm | 8 ++++---- code/modules/clothing/under/jobs/medical_jumpsuits.dm | 8 -------- code/modules/clothing/under/jobs/rnd.dm | 1 - code/modules/holiday/christmas.dm | 1 - code/modules/mod/mod_clothes.dm | 4 ---- code/modules/mod/mod_control.dm | 1 - 15 files changed, 12 insertions(+), 33 deletions(-) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 2f2c2418354..78e35cda0a2 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -643,7 +643,7 @@ desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state." normal_integrity = 150 damage_deflection = 5 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null ////////////////////////////////// /* diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 03d13645aff..0a73abf89b9 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -8,7 +8,6 @@ icon = 'icons/obj/tools.dmi' icon_state = "rsf" item_state = "rsf" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) var/atom/currently_dispensing var/power_mode = POWER_NONE diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 34da3ee34ad..1edfea83fdb 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -160,7 +160,7 @@ materials = list() origin_tech = "biotech=3;combat=2" attack_verb = list("shanked", "shivved") - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null /obj/item/kitchen/knife/butcher name = "butcher's cleaver" diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 109ca4b2941..69534c53b60 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -50,7 +50,7 @@ /obj/item/shield/riot/roman/fake desc = "Bears an inscription on the inside: \"Romanes venio domus\". It appears to be a bit flimsy." - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 0, acid = 0) + armor = null /obj/item/shield/riot/roman/fake/add_parry_component() return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index bde456622ab..430b2b00677 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -755,7 +755,6 @@ name = "suit" icon = 'icons/obj/clothing/suits.dmi' allowed = list(/obj/item/tank/internals/emergency_oxygen) - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' slot_flags = ITEM_SLOT_OUTER_SUIT @@ -1012,7 +1011,6 @@ name = "under" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS slot_flags = ITEM_SLOT_JUMPSUIT - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 9bdf60c5b8a..408f91402fa 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -172,7 +172,7 @@ /obj/item/clothing/head/helmet/roman/fake desc = "A shoddily-crafted cosplay helmet made of plastic. Protects against jack and shit, if you're lucky." - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null /obj/item/clothing/head/helmet/roman/legionaire name = "centurion helmet" @@ -182,7 +182,7 @@ /obj/item/clothing/head/helmet/roman/legionaire/fake desc = "A shoddily-crafted cosplay helmet made of plastic. This particular specimen has what appears to be the head of a broom crudely taped to the top." - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null /obj/item/clothing/head/helmet/gladiator name = "gladiator helmet" @@ -294,7 +294,7 @@ /obj/item/clothing/head/helmet/fake name = "replica helmet" desc = "A replica of a mass-produced protective helmet used by security personnel across the sector. Made of cheap plastic and provides no protection." - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null cold_protection = FALSE heat_protection = FALSE diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index cc63e73be96..5c1cd8634f1 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -61,7 +61,6 @@ desc = "It's tasty looking!" icon_state = "cake0" flags_cover = HEADCOVERSEYES - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) var/onfire = FALSE 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 @@ -151,7 +150,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH dog_fashion = null light_color = "#fff2bf" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null brightness_on = 2 //luminosity when on /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin @@ -169,7 +168,7 @@ icon_state = "hardhat0_reindeer" item_state = "hardhat0_reindeer" item_color = "reindeer" - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null brightness_on = 1 //luminosity when on dog_fashion = /datum/dog_fashion/head/reindeer diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index 15a9b6b58a6..c07374389b5 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -181,7 +181,6 @@ flags_cover = MASKCOVERSMOUTH gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) actions_types = list(/datum/action/item_action/adjust) can_toggle = TRUE diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index c219819f00c..a56f9a4e7b4 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -400,7 +400,6 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) sprite_sheets = list( "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index cca29baf0e7..9951f87d2f2 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -48,7 +48,7 @@ icon_state = "wizard-fake" gas_transfer_coefficient = 1 permeability_coefficient = 1 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null magical = FALSE resistance_flags = FLAMMABLE sprite_sheets = list( @@ -153,21 +153,21 @@ icon_state = "wizard-fake" gas_transfer_coefficient = 1 permeability_coefficient = 1 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null resistance_flags = FLAMMABLE magical = FALSE /obj/item/clothing/head/wizard/marisa/fake gas_transfer_coefficient = 1 permeability_coefficient = 1 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null resistance_flags = FLAMMABLE magical = FALSE /obj/item/clothing/suit/wizrobe/marisa/fake gas_transfer_coefficient = 1 permeability_coefficient = 1 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = null resistance_flags = FLAMMABLE magical = FALSE diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm index 9efc5f69293..da896543a62 100644 --- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm @@ -1,6 +1,5 @@ /obj/item/clothing/under/rank/medical icon = 'icons/obj/clothing/under/medical.dmi' - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) sprite_sheets = list( "Human" = 'icons/mob/clothing/under/medical.dmi', @@ -17,7 +16,6 @@ item_state = "cmo" item_color = "cmo" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/cmo/skirt name = "chief medical officer's skirt" @@ -41,7 +39,6 @@ item_state = "medical" item_color = "medical" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/doctor/sensor sensor_mode = SENSOR_COORDS @@ -61,7 +58,6 @@ item_state = "virology" item_color = "virology" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/virologist/skirt name = "virologist's jumpskirt" @@ -76,7 +72,6 @@ item_state = "nursesuit" item_color = "nursesuit" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/nurse name = "nurse's dress" @@ -85,7 +80,6 @@ item_state = "nurse" item_color = "nurse" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/orderly name = "orderly's uniform" @@ -94,7 +88,6 @@ item_state = "orderly" item_color = "orderly" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/scrubs name = "blue medical scrubs" @@ -173,4 +166,3 @@ item_state = "medicalgown" item_color = "medicalgown" body_parts_covered = UPPER_TORSO|LOWER_TORSO - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index 069078e4ea1..d54b12377bd 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -74,7 +74,6 @@ item_state = "genetics" item_color = "genetics" permeability_coefficient = 0.50 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/rnd/geneticist/skirt name = "geneticist's jumpskirt" diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm index ad1d2802331..4e4386617d5 100644 --- a/code/modules/holiday/christmas.dm +++ b/code/modules/holiday/christmas.dm @@ -67,4 +67,3 @@ icon_state = "xmashat" desc = "A crappy paper hat that you are REQUIRED to wear." flags_inv = 0 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm index 37a2ed722a6..423a46fad86 100644 --- a/code/modules/mod/mod_clothes.dm +++ b/code/modules/mod/mod_clothes.dm @@ -6,7 +6,6 @@ base_icon_state = "helmet" item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi' icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi' - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) heat_protection = HEAD cold_protection = HEAD permeability_coefficient = 0.01 @@ -32,7 +31,6 @@ /obj/item/flashlight, /obj/item/tank/jetpack/oxygen/captain, ) - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) body_parts_covered = UPPER_TORSO|LOWER_TORSO heat_protection = UPPER_TORSO|LOWER_TORSO cold_protection = UPPER_TORSO|LOWER_TORSO @@ -55,7 +53,6 @@ base_icon_state = "gauntlets" item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi' icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi' - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) body_parts_covered = HANDS|ARMS heat_protection = HANDS|ARMS cold_protection = HANDS|ARMS @@ -76,7 +73,6 @@ base_icon_state = "boots" item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi' icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi' - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) body_parts_covered = FEET|LEGS heat_protection = FEET|LEGS cold_protection = FEET|LEGS diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 6501d303b44..31c5ed258bc 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -14,7 +14,6 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK strip_delay = 10 SECONDS - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) actions_types = list( /datum/action/item_action/mod/deploy, /datum/action/item_action/mod/activate,