Skip to content

Commit

Permalink
Angle Grinder Balance (#3585)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
R-windows take less time to grind
blast doors can now be grinded
grinders slow you down way less now. 
Grinder noise is less grating
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
It's not
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: Angle grinders can now grind blast doors. reinforced windows
are now less bad to grind down.
balance: angle grinder packs now slow you down less
balance: angle grinders now sound less Screechy
balance: angle grinders can now be safely used with a Bowman headset.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
  • Loading branch information
Erikafox and Erikafox authored Oct 26, 2024
1 parent 2f0381b commit d2f464e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
11 changes: 11 additions & 0 deletions code/game/machinery/doors/poddoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

/obj/machinery/door/poddoor/attackby(obj/item/W, mob/user, params)
. = ..()
if(resistance_flags & INDESTRUCTIBLE)
return FALSE
if((resistance_flags & INDESTRUCTIBLE) && W.tool_behaviour == TOOL_SCREWDRIVER) // This makes it so ERT members cannot cheese by opening their blast doors.
to_chat(user, span_warning("You can't find the panel!"))
return
Expand Down Expand Up @@ -56,6 +58,15 @@
else if(W.use_tool(src, user, 10 SECONDS, volume=50))
deconstruct(TRUE)

if(W.tool_behaviour == TOOL_DECONSTRUCT)
if(!(machine_stat & NOPOWER))
do_sparks(5, TRUE, src)
electrocute_mob(user, get_area(src), src, 1, TRUE) //zorp
close()
to_chat(user, span_notice("You start to cut [src] apart"))
if (W.use_tool(src, user, 15 SECONDS, volume = 75))
deconstruct(TRUE)

/obj/machinery/door/poddoor/examine(mob/user)
. = ..()
. += span_notice("The maintenance panel is [panel_open ? "opened" : "closed"].")
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/structures/poddoor_assembly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@
return
created_name = new_name

else if(item_used.tool_behaviour == TOOL_DECONSTRUCT)
if(!item_used.tool_start_check(user, amount=0))
return
user.visible_message(span_notice("[user] cuts apart [src]."), span_notice("You start to slice apart [src]..."))
if(item_used.use_tool(src, user, 4 SECONDS, volume=50))
to_chat(user, span_notice("You disassemble [src]."))
deconstruct(TRUE)

else if(item_used.tool_behaviour == TOOL_WELDER)
if(!item_used.tool_start_check(user, amount=0))
return
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/structures/window.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
var/decon_time = 5 SECONDS
var/decon_time = 3 SECONDS
flags_ricochet = RICOCHET_HARD
ricochet_chance_mod = 0.4

Expand Down Expand Up @@ -409,7 +409,7 @@
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_HEAVY_INSULATION
ricochet_chance_mod = 0.8
decon_time = 20 SECONDS
decon_time = 6 SECONDS

//this is shitcode but all of construction is shitcode and needs a refactor, it works for now
//If you find this like 4 years later and construction still hasn't been refactored, I'm so sorry for this
Expand Down Expand Up @@ -542,7 +542,7 @@
damage_deflection = 11 //WS Edit - Weakens R-Windows
explosion_block = 2
glass_type = /obj/item/stack/sheet/plasmarglass
decon_time = 25 SECONDS
decon_time = 15 SECONDS

//entirely copypasted code
//take this out when construction is made a component or otherwise modularized in some way
Expand Down Expand Up @@ -758,7 +758,7 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
decon_time = 30 SECONDS
decon_time = 10 SECONDS

/obj/structure/window/plasma/reinforced/plastitanium/unanchored
anchored = FALSE
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mining/equipment/angle_grinder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
gear_handle_type = /obj/item/gear_handle/anglegrinder
slowdown = 0.3
drag_slowdown = 0.3

/obj/item/gear_handle/anglegrinder
name = "angle grinder"
Expand All @@ -26,7 +28,7 @@
usesound = 'sound/weapons/anglegrinder.ogg'
tool_behaviour = null // is set to TOOL_DECONSTRUCT once wielded
toolspeed = 1
wall_decon_damage = 200
wall_decon_damage = 250
usecost = 5
pack = /obj/item/gear_pack/anglegrinder
var/startsound = 'sound/weapons/chainsawhit.ogg'
Expand Down Expand Up @@ -68,7 +70,7 @@
. = ..()
AddComponent(/datum/component/butchering, 30, 100, 0, startsound, TRUE)
AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound=startsound)
AddElement(/datum/element/tool_bang, 2)
AddElement(/datum/element/tool_bang, 1)

/// triggered on wield of two handed item
/obj/item/gear_handle/anglegrinder/proc/on_wield(obj/item/source, mob/user)
Expand Down
Binary file modified sound/weapons/anglegrinder.ogg
Binary file not shown.

0 comments on commit d2f464e

Please sign in to comment.