cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Big tooltype decargo-culting (continued) (#95814)

Browse Source 
## About The Pull Request

Gets some instances that I caught missed by
https://github.com/tgstation/tgstation/pull/95408
This commit is contained in:
Bloop
2026-04-29 13:19:00 -04:00
committed by GitHub
parent 4fb7eaae43
commit 966d6547e8
23 changed files with 110 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/heretic/items/heretic_grenade.dm
+3 -9
View File
@@ -22,6 +22,9 @@
/obj/item/grenade/chem_grenade/rust_sower/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_MULTITOOL, TOOL_ACT_PRIMARY)
RegisterSignal(src, COMSIG_ITEM_ON_GRIND, PROC_REF(on_try_grind))
var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src)
var/obj/item/reagent_containers/cup/beaker/large/beaker_two = new(src)
@@ -39,15 +42,6 @@
playsound(src, 'sound/items/weapons/rust_sower_explode.ogg', 70, FALSE)
qdel(src)
/obj/item/grenade/chem_grenade/rust_sower/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/item/grenade/chem_grenade/rust_sower/wrench_act(mob/living/user, obj/item/tool)
return NONE
/obj/item/grenade/chem_grenade/rust_sower/multitool_act(mob/living/user, obj/item/tool)
return NONE
/// Returns -1 so that you cant extract the chems
/obj/item/grenade/chem_grenade/rust_sower/proc/on_try_grind()
SIGNAL_HANDLER
code/modules/atmospherics/machinery/components/components_base.dm
+1 -2
View File
@@ -268,8 +268,7 @@
internal_pressure = internal_pressure > airs[i].return_pressure() ? internal_pressure : airs[i].return_pressure()
if(!filled_pipe)
default_deconstruction_crowbar(tool)
return ITEM_INTERACT_SUCCESS
return default_deconstruction_crowbar(user, tool)
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
code/modules/awaymissions/mission_code/murderdome.dm
+4 -5
View File
@@ -12,11 +12,10 @@
obj_flags = CONDUCTS_ELECTRICITY
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/structure/grille/indestructible/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/structure/grille/indestructible/wirecutter_act(mob/living/user, obj/item/tool)
return NONE
/obj/structure/grille/indestructible/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_WIRECUTTER, TOOL_ACT_PRIMARY)
/obj/effect/spawner/structure/window/reinforced/indestructible
spawn_list = list(/obj/structure/grille/indestructible, /obj/structure/window/reinforced/fulltile/indestructible)
code/modules/capture_the_flag/ctf_game.dm
+4 -5
View File
@@ -461,11 +461,10 @@
/obj/structure/table/reinforced/ctf
resistance_flags = INDESTRUCTIBLE
/obj/structure/table/reinforced/ctf/wrench_act_secondary(mob/living/user, obj/item/tool)
return NONE
/obj/structure/table/reinforced/ctf/screwdriver_act_secondary(mob/living/user, obj/item/tool)
return NONE
/obj/structure/table/reinforced/ctf/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_SECONDARY)
AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_SECONDARY)
#define CTF_LOADING_UNLOADED 0
#define CTF_LOADING_LOADING 1
code/modules/holodeck/turfs.dm
+3 -2
View File
@@ -11,8 +11,9 @@
/turf/open/floor/holofloor/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
return ITEM_INTERACT_BLOCKING // Fuck you
/turf/open/floor/holofloor/crowbar_act(mob/living/user, obj/item/I)
return NONE // Fuck you
/turf/open/floor/holofloor/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY)
/turf/open/floor/holofloor/burn_tile()
return //you can't burn a hologram!
code/modules/hydroponics/biogenerator.dm
+3 -3
View File
@@ -214,14 +214,14 @@
return .
/obj/machinery/biogenerator/crowbar_act(mob/living/user, obj/item/tool)
if(!default_deconstruction_crowbar(tool))
return ITEM_INTERACT_BLOCKING
. = default_deconstruction_crowbar(user, tool)
if(!(. & ITEM_INTERACT_SUCCESS))
return
var/turf/drop_location = drop_location()
if(biomass > 0)
drop_location.visible_message(span_warning("Biomass spills from \the [src]'s biomass tank!"))
playsound(drop_location, 'sound/effects/slosh.ogg', 25, vary = TRUE)
new /obj/effect/decal/cleanable/greenglow(drop_location)
return ITEM_INTERACT_SUCCESS
/obj/machinery/biogenerator/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
if(user.combat_mode)
code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
+4 -5
View File
@@ -161,11 +161,10 @@
/obj/machinery/vending/hotdog/museum
all_products_free = TRUE
/obj/machinery/vending/hotdog/museum/screwdriver_act(mob/living/user, obj/item/attack_item)
return NONE
/obj/machinery/vending/hotdog/museum/crowbar_act(mob/living/user, obj/item/attack_item)
return NONE
/obj/machinery/vending/hotdog/museum/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY)
#define CAFE_KEYCARD_TOILETS "museum_cafe_key_toilets"
code/modules/mining/equipment/survival_pod.dm
+4 -12
View File
@@ -267,20 +267,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/survival_pod/left, 0)
max_n_of_items = 10
pixel_y = -4
/obj/machinery/smartfridge/survival_pod/welder_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/smartfridge/survival_pod/wrench_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/smartfridge/survival_pod/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/smartfridge/survival_pod/crowbar_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/smartfridge/survival_pod/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
AddElement(/datum/element/tool_blocker, TOOL_WELDER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY)
return ..()
/obj/machinery/smartfridge/survival_pod/preloaded/Initialize(mapload)
code/modules/power/thermoelectric_generator.dm
+1 -2
View File
@@ -87,8 +87,7 @@
return TRUE
/obj/machinery/power/thermoelectric_generator/crowbar_act(mob/living/user, obj/item/tool)
default_deconstruction_crowbar(tool)
return TRUE
return default_deconstruction_crowbar(user, tool)
/obj/machinery/power/thermoelectric_generator/process()
//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+6 -7
View File
@@ -13,16 +13,15 @@
///The purity of the created reagent in % (purity uses 0-1 values)
var/purity = 100
/obj/machinery/chem_dispenser/chem_synthesizer/Destroy()
/obj/machinery/chem_dispenser/chem_synthesizer/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY)
/obj/machinery/chem_dispenser/chem_synthesizer/Destroy(force)
QDEL_NULL(beaker)
return ..()
/obj/machinery/chem_dispenser/chem_synthesizer/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/chem_dispenser/chem_synthesizer/crowbar_act(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
code/modules/research/destructive_analyzer.dm
+4 -4
View File
@@ -14,6 +14,10 @@
base_icon_state = "d_analyzer"
circuit = /obj/item/circuitboard/machine/destructive_analyzer
/obj/machinery/rnd/destructive_analyzer/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY) //This allows people to put syndicate screwdrivers in the machine. Secondary act still passes.
/obj/machinery/rnd/destructive_analyzer/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
@@ -127,10 +131,6 @@
return ITEM_INTERACT_SKIP_TO_ATTACK
return NONE
//This allows people to put syndicate screwdrivers in the machine. Secondary act still passes.
/obj/machinery/rnd/destructive_analyzer/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
//We need to call default_deconstruction_screwdriver here since its parent will call screwdriver_act on this level which will stop us from ever deconstructing.
/obj/machinery/rnd/destructive_analyzer/screwdriver_act_secondary(mob/living/user, obj/item/tool)
return default_deconstruction_screwdriver(user, tool)
code/modules/shuttle/misc/special.dm
+4 -12
View File
@@ -80,18 +80,14 @@
/obj/structure/table/abductor/wabbajack/Initialize(mapload, obj/structure/table_frame/frame_used, obj/item/stack/stack_used)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_PRIMARY)
START_PROCESSING(SSobj, src)
/obj/structure/table/abductor/wabbajack/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/structure/table/abductor/wabbajack/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/structure/table/abductor/wabbajack/wrench_act(mob/living/user, obj/item/tool)
return NONE
/obj/structure/table/abductor/wabbajack/process()
if(isnull(our_statue))
our_statue = locate() in orange(4, src)
@@ -186,12 +182,8 @@
COMSIG_ATOM_ENTERED = PROC_REF(on_climbed),
)
AddElement(/datum/element/connect_loc, loc_connections)
/obj/structure/table/wood/shuttle_bar/screwdriver_act(mob/living/user, obj/item/tool)
return NONE
/obj/structure/table/wood/shuttle_bar/wrench_act(mob/living/user, obj/item/tool)
return NONE
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER)
AddElement(/datum/element/tool_blocker, TOOL_WRENCH)
/obj/structure/table/wood/shuttle_bar/proc/on_climbed(datum/source, atom/movable/AM)
SIGNAL_HANDLER
code/modules/shuttle/shuttle_consoles/syndicate.dm
+3 -2
View File
@@ -12,8 +12,9 @@
possible_destinations = "syndicate_away;syndicate_z5;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s;syndicate_custom"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/machinery/computer/shuttle/syndicate/screwdriver_act(mob/living/user, obj/item/I)
return NONE
/obj/machinery/computer/shuttle/syndicate/Initialize(mapload)
. = ..()
AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY)
/obj/machinery/computer/shuttle/syndicate/launch_check(mob/user)
. = ..()
code/modules/transport/tram/tram_controller.dm
+1 -3
View File
@@ -788,14 +788,12 @@
/obj/machinery/transport/tram_controller/hilbert
configured_transport_id = HILBERT_LINE_1
/obj/machinery/transport/tram_controller/wrench_act_secondary(mob/living/user, obj/item/tool)
return NONE
/obj/machinery/transport/tram_controller/Initialize(mapload)
. = ..()
register_context()
if(!id_tag)
id_tag = assign_random_name()
AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_SECONDARY)
/**
* Mapped or built tram cabinet isn't located on a transport module.