From bd60099a7efe0f439f60a0abab3b39e2dfee2815 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 3 Feb 2016 18:16:37 -0500 Subject: [PATCH] Removes unused pressure_resistance variable. This is used with FEA not ZAS Though it's kind of funny to look at what some of these values were set at. (For reference: ONE_ATMOSPHERE = 101.325) --- code/ZAS/Atom.dm | 3 --- code/game/machinery/atmoalter/canister.dm | 3 +-- code/game/objects/items.dm | 1 - code/game/objects/items/weapons/tanks/tanks.dm | 2 -- code/game/objects/structures/grille.dm | 1 - code/game/objects/structures/mop_bucket.dm | 1 - code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 - code/game/objects/structures/window.dm | 1 - code/game/objects/structures/window_spawner.dm | 1 - code/modules/holodeck/HolodeckObjects.dm | 1 - code/modules/paperwork/folders.dm | 1 - code/modules/paperwork/paper.dm | 1 - code/modules/paperwork/paper_bundle.dm | 3 +-- code/modules/paperwork/paperbin.dm | 1 - code/modules/paperwork/pen.dm | 1 - code/modules/paperwork/stamps.dm | 3 +-- code/modules/reagents/reagent_dispenser.dm | 1 - code/modules/recycling/disposal-construction.dm | 1 - code/modules/shieldgen/emergency_shield.dm | 1 - 19 files changed, 3 insertions(+), 25 deletions(-) diff --git a/code/ZAS/Atom.dm b/code/ZAS/Atom.dm index ce69ad71622..cf7193ea872 100644 --- a/code/ZAS/Atom.dm +++ b/code/ZAS/Atom.dm @@ -1,7 +1,4 @@ - -/atom/var/pressure_resistance = ONE_ATMOSPHERE - /atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) //Purpose: Determines if the object (or airflow) can pass this atom. //Called by: Movement, airflow. diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 4d40ed91c6a..5cd15d67240 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -14,7 +14,6 @@ var/canister_color = "yellow" var/can_label = 1 start_pressure = 45 * ONE_ATMOSPHERE - pressure_resistance = 7 * ONE_ATMOSPHERE var/temperature_resistance = 1000 + T0C volume = 1000 use_power = 0 @@ -453,4 +452,4 @@ update_flag ..() src.air_contents.adjust_gas("phoron", MolesForPressure()) src.update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e3d3bf80b5a..900745cf4fe 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -14,7 +14,6 @@ var/slot_flags = 0 //This is used to determine on which slots an item can fit. var/no_attack_log = 0 //If it's an item we don't want to log attack_logs with, set this to 1 pass_flags = PASSTABLE - pressure_resistance = 5 // causeerrorheresoifixthis var/obj/item/master = null diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 18596750e39..8604d17f15d 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -16,8 +16,6 @@ var/list/global/tank_gauge_cache = list() slot_flags = SLOT_BACK w_class = 3 - pressure_resistance = ONE_ATMOSPHERE*5 - force = 5.0 throwforce = 10.0 throw_speed = 1 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 0691d3d68e1..dcf500d1541 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -6,7 +6,6 @@ density = 1 anchored = 1 flags = CONDUCT - pressure_resistance = 5*ONE_ATMOSPHERE layer = 2.9 explosion_resistance = 1 var/health = 10 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index c76ca1802d6..8325b9fda5c 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -5,7 +5,6 @@ icon_state = "mopbucket" density = 1 w_class = 3 - pressure_resistance = 5 flags = OPENCONTAINER var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 3cfdae57edd..669f88110e1 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -12,7 +12,6 @@ desc = "This is used to lie in, sleep in or strap on." icon = 'icons/obj/furniture.dmi' icon_state = "bed" - pressure_resistance = 15 anchored = 1 can_buckle = 1 buckle_dir = SOUTH diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a77066c9aa6..6fc3bea3dfd 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -6,7 +6,6 @@ w_class = 3 layer = 3.2//Just above doors - pressure_resistance = 4*ONE_ATMOSPHERE anchored = 1.0 flags = ON_BORDER var/maxhealth = 14.0 diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index 6ec446511b5..c6e2d69f842 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -9,7 +9,6 @@ icon_state = "wingrille" density = 1 anchored = 1.0 - pressure_resistance = 4*ONE_ATMOSPHERE var/win_path = /obj/structure/window/basic var/activated diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index f9536420e26..3bc58ed8b63 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -115,7 +115,6 @@ icon = 'icons/obj/furniture.dmi' icon_state = "stool_padded_preview" anchored = 1.0 - pressure_resistance = 15 /obj/item/clothing/gloves/boxing/hologlove name = "boxing gloves" diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index c10b940c1e7..a14ef11720d 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "folder" w_class = 2 - pressure_resistance = 2 /obj/item/weapon/folder/blue desc = "A blue folder." diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 66ee2b39dc5..6371a57cbeb 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -14,7 +14,6 @@ throw_range = 1 throw_speed = 1 layer = 4 - pressure_resistance = 1 slot_flags = SLOT_HEAD body_parts_covered = HEAD attack_verb = list("bapped") diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index db7a0882160..f1085fc0c65 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -9,7 +9,6 @@ throw_range = 2 throw_speed = 1 layer = 4 - pressure_resistance = 1 attack_verb = list("bapped") var/page = 1 // current page var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents. @@ -240,4 +239,4 @@ if(photo) desc += "\nThere is a photo attached to it." overlays += image('icons/obj/bureaucracy.dmi', "clip") - return \ No newline at end of file + return diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 8a438e8e905..b51e3b19e11 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -7,7 +7,6 @@ w_class = 3 throw_speed = 3 throw_range = 7 - pressure_resistance = 10 layer = OBJ_LAYER - 0.1 var/amount = 30 //How much paper is in the bin. var/list/papers = new/list() //List of papers put in the bin for reference. diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 00e80500676..a3508a48ce0 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -22,7 +22,6 @@ throw_range = 15 matter = list(DEFAULT_WALL_MATERIAL = 10) var/colour = "black" //what colour the ink is! - pressure_resistance = 2 /obj/item/weapon/pen/blue diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index a6954e9e2f0..dd4c2fd2b9f 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -9,7 +9,6 @@ throw_speed = 7 throw_range = 15 matter = list(DEFAULT_WALL_MATERIAL = 60) - pressure_resistance = 2 attack_verb = list("stamped") /obj/item/weapon/stamp/captain @@ -73,4 +72,4 @@ if(chosen_stamp) name = chosen_stamp.name - icon_state = chosen_stamp.icon_state \ No newline at end of file + icon_state = chosen_stamp.icon_state diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 49b106a5343..e64b7f31269 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -7,7 +7,6 @@ icon_state = "watertank" density = 1 anchored = 0 - pressure_resistance = 2*ONE_ATMOSPHERE var/amount_per_transfer_from_this = 10 var/possible_transfer_amounts = list(10,25,50,100) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index c44220bc3f1..31e1aa48bbe 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -9,7 +9,6 @@ icon_state = "conpipe-s" anchored = 0 density = 0 - pressure_resistance = 5*ONE_ATMOSPHERE matter = list(DEFAULT_WALL_MATERIAL = 1850) level = 2 var/sortType = "" diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 9e8a752122b..106fea353de 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -120,7 +120,6 @@ density = 1 opacity = 0 anchored = 0 - pressure_resistance = 2*ONE_ATMOSPHERE req_access = list(access_engine) var/const/max_health = 100 var/health = max_health