cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nullify all armor that is equal to armor = null (#30116)

Browse Source 
* nullifier

* manually remove identical vars
This commit is contained in:
kyunkyunkyun
2025-08-19 13:13:41 +00:00
committed by GitHub
parent f68676267c
commit 1f461fe2d2
15 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
-2
View File
@@ -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'
code/modules/clothing/head/helmet.dm
+3 -3
View File
@@ -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
code/modules/clothing/head/misc_special.dm
+2 -3
View File
@@ -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
code/modules/clothing/masks/misc_masks.dm
-1
View File
@@ -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
code/modules/clothing/suits/misc_suits.dm
-1
View File
@@ -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',
code/modules/clothing/suits/wiz_robe.dm
+4 -4
View File
@@ -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
code/modules/clothing/under/jobs/medical_jumpsuits.dm
-8
View File
@@ -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)
code/modules/clothing/under/jobs/rnd.dm
-1
View File
@@ -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"
code/modules/holiday/christmas.dm
-1
View File
@@ -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)
code/modules/mod/mod_clothes.dm
-4
View File
@@ -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
code/modules/mod/mod_control.dm
-1
View File
@@ -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,