From caca8869d6411ef52dac3440b7c1719ded96aa5a Mon Sep 17 00:00:00 2001 From: TemporalOroboros Date: Tue, 11 Jan 2022 02:44:25 -0800 Subject: [PATCH] Gives a bunch of table sized and/or shaped things (#63964) You can't reach over/around/through a whole bunch of objects that look small enough/low enough to imply that you can. This grants people the ability to do so. Hydroponics trays look roughly table sized and shaped and you can't reach past them, which is irritating. Now you can, which is not. Ditto for crates, the cooking grill, and the chaplain's altar. Plumbing input/output/dev/null machines and chemical heaters take up maybe 1/4 of the turf and block attempts to reach past them. Being able to is less irritating. --- code/game/objects/structures/crates_lockers/crates.dm | 1 + code/game/objects/structures/crates_lockers/crates/cardboard.dm | 1 + code/game/objects/structures/crates_lockers/crates/large.dm | 1 + code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 1 + code/modules/food_and_drinks/kitchen_machinery/griddle.dm | 1 + code/modules/food_and_drinks/kitchen_machinery/grill.dm | 1 + code/modules/food_and_drinks/kitchen_machinery/oven.dm | 1 + code/modules/hydroponics/hydroponics.dm | 1 + code/modules/plumbing/plumbers/_plumb_machinery.dm | 2 ++ code/modules/plumbing/plumbers/destroyer.dm | 1 + code/modules/plumbing/plumbers/plumbing_buffer.dm | 1 + code/modules/reagents/chemistry/machinery/chem_heater.dm | 1 + code/modules/religion/religion_structures.dm | 2 +- 13 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 956ada45e30..824b30e6353 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -16,6 +16,7 @@ close_sound_volume = 50 drag_slowdown = 0 door_anim_time = 0 // no animation + pass_flags_self = PASSSTRUCTURE | LETPASSTHROW var/crate_climb_time = 20 var/obj/item/paper/fluff/jobs/cargo/manifest/manifest diff --git a/code/game/objects/structures/crates_lockers/crates/cardboard.dm b/code/game/objects/structures/crates_lockers/crates/cardboard.dm index c42b73a7ee7..9e50b556483 100644 --- a/code/game/objects/structures/crates_lockers/crates/cardboard.dm +++ b/code/game/objects/structures/crates_lockers/crates/cardboard.dm @@ -1,6 +1,7 @@ /obj/structure/closet/crate/cardboard name = "cardboard box" desc = "A box, in which you can place things. Revolutionary, I know." + pass_flags_self = PASSSTRUCTURE material_drop = /obj/item/stack/sheet/cardboard material_drop_amount = 4 icon_state = "cardboard" diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 7bbd2f4acbb..9819481c9d2 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -3,6 +3,7 @@ desc = "A hefty wooden crate. You'll need a crowbar to get it open." icon_state = "largecrate" density = TRUE + pass_flags_self = PASSSTRUCTURE material_drop = /obj/item/stack/sheet/mineral/wood material_drop_amount = 4 delivery_icon = "deliverybox" diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 7b7b4174f47..20a945d587d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -16,6 +16,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( icon = 'icons/obj/kitchen.dmi' icon_state = "fryer_off" density = TRUE + pass_flags_self = PASSMACHINE | LETPASSTHROW use_power = IDLE_POWER_USE idle_power_usage = 5 layer = BELOW_OBJ_LAYER diff --git a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm index 32375d92e8a..9abcd0db196 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/machines/kitchenmachines.dmi' icon_state = "griddle1_off" density = TRUE + pass_flags_self = PASSMACHINE | PASSTABLE| LETPASSTHROW // It's roughly the height of a table. use_power = IDLE_POWER_USE idle_power_usage = 5 layer = BELOW_OBJ_LAYER diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 6ed23b42972..d2d12f8db45 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -9,6 +9,7 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "grill_open" density = TRUE + pass_flags_self = PASSMACHINE | LETPASSTHROW layer = BELOW_OBJ_LAYER use_power = NO_POWER_USE var/grill_fuel = 0 diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm index 6bda3281b56..8cc23986ac9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm @@ -14,6 +14,7 @@ icon = 'icons/obj/machines/kitchenmachines.dmi' icon_state = "oven_off" density = TRUE + pass_flags_self = PASSMACHINE | LETPASSTHROW use_power = IDLE_POWER_USE idle_power_usage = 5 layer = BELOW_OBJ_LAYER diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index e49d50ae6c2..406b7e62676 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hydrotray" density = TRUE + pass_flags_self = PASSMACHINE | LETPASSTHROW pixel_z = 8 obj_flags = CAN_BE_HIT | UNIQUE_RENAME circuit = /obj/item/circuitboard/machine/hydroponics diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index b583bda128d..d0ef91a3095 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -58,6 +58,7 @@ name = "input gate" desc = "Can be manually filled with reagents from containers." icon_state = "pipe_input" + pass_flags_self = PASSMACHINE | LETPASSTHROW // Small reagent_flags = TRANSPARENT | REFILLABLE /obj/machinery/plumbing/input/Initialize(mapload, bolt, layer) @@ -69,6 +70,7 @@ name = "output gate" desc = "A manual output for plumbing systems, for taking reagents directly into containers." icon_state = "pipe_output" + pass_flags_self = PASSMACHINE | LETPASSTHROW // Small reagent_flags = TRANSPARENT | DRAINABLE /obj/machinery/plumbing/output/Initialize(mapload, bolt, layer) diff --git a/code/modules/plumbing/plumbers/destroyer.dm b/code/modules/plumbing/plumbers/destroyer.dm index 4560cee67d1..cce5d122f71 100644 --- a/code/modules/plumbing/plumbers/destroyer.dm +++ b/code/modules/plumbing/plumbers/destroyer.dm @@ -2,6 +2,7 @@ name = "chemical disposer" desc = "Breaks down chemicals and annihilates them." icon_state = "disposal" + pass_flags_self = PASSMACHINE | LETPASSTHROW // Small ///we remove 5 reagents per second var/disposal_rate = 5 diff --git a/code/modules/plumbing/plumbers/plumbing_buffer.dm b/code/modules/plumbing/plumbers/plumbing_buffer.dm index 45550bf1e3e..6d706abf0bf 100644 --- a/code/modules/plumbing/plumbers/plumbing_buffer.dm +++ b/code/modules/plumbing/plumbers/plumbing_buffer.dm @@ -6,6 +6,7 @@ name = "automatic buffer" desc = "A chemical holding tank that waits for neighbouring automatic buffers to complete before allowing a withdrawal. Connect/reset by screwdrivering" icon_state = "buffer" + pass_flags_self = PASSMACHINE | LETPASSTHROW // It looks short enough. buffer = 200 var/datum/buffer_net/buffer_net diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index ff363852302..0c9b9d5cf7c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -11,6 +11,7 @@ /obj/machinery/chem_heater name = "reaction chamber" //Maybe this name is more accurate? density = TRUE + pass_flags_self = PASSMACHINE | LETPASSTHROW icon = 'icons/obj/chemical.dmi' icon_state = "mixer0b" base_icon_state = "mixer" diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 62c130ab18f..c44b852542e 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -6,7 +6,7 @@ density = TRUE anchored = TRUE layer = TABLE_LAYER - pass_flags_self = LETPASSTHROW + pass_flags_self = PASSSTRUCTURE | PASSTABLE | LETPASSTHROW can_buckle = TRUE buckle_lying = 90 //we turn to you! ///Avoids having to check global everytime by referencing it locally.