Skip to content

Commit

Permalink
Deconstructing walls without repairing them (#6094)
Browse files Browse the repository at this point in the history
# About the pull request

You now need to have disarm or above to slice through walls, and help
intent to repair walls.

# Explain why it's good for the game

Comtechs now don't need to spend 30 seconds repairing a wall, waste like
5 units of welding fuel only to deconstruct it. Now you can have choice
in what you do! :D

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

it works trust

</details>


# Changelog

:cl:
qol: Now needs help intent to repair walls
qol: Now needs disarm, grab and harm intent to deconstruct walls
/:cl:

---------

Co-authored-by: ihatethisengine <[email protected]>
  • Loading branch information
HumiliatedGoblin and ihatethisengine committed May 1, 2024
1 parent e74e9c4 commit 0f67b3a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions code/game/turfs/walls/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
var/hull = 0
var/walltype = WALL_METAL
/// when walls smooth with one another, the type of junction each wall is.
var/junctiontype
var/junctiontype
var/thermite = 0
var/melting = FALSE
var/claws_minimum = CLAW_TYPE_SHARP
Expand All @@ -24,7 +24,7 @@

var/damage = 0
/// Wall will break down to girders if damage reaches this point
var/damage_cap = HEALTH_WALL
var/damage_cap = HEALTH_WALL

var/damage_overlay
var/global/damage_overlays[8]
Expand All @@ -38,7 +38,7 @@
var/d_state = 0 //Normal walls are now as difficult to remove as reinforced walls

/// the acid hole inside the wall
var/obj/effect/acid_hole/acided_hole
var/obj/effect/acid_hole/acided_hole
var/acided_hole_dir = SOUTH

var/special_icon = 0
Expand Down Expand Up @@ -178,7 +178,7 @@

switch(d_state)
if(WALL_STATE_WELD)
. += SPAN_INFO("The outer plating is intact. A blowtorch should slice it open.")
. += SPAN_INFO("The outer plating is intact. If you are not on help intent, a blowtorch should slice it open.")
if(WALL_STATE_SCREW)
. += SPAN_INFO("The outer plating has been sliced open. A screwdriver should remove the support lines.")
if(WALL_STATE_WIRECUTTER)
Expand Down Expand Up @@ -482,6 +482,8 @@
/turf/closed/wall/proc/try_weldingtool_usage(obj/item/W, mob/user)
if(!damage || !iswelder(W))
return FALSE
if(user.a_intent != INTENT_HELP)
return FALSE

var/obj/item/tool/weldingtool/WT = W
if(WT.remove_fuel(0, user))
Expand All @@ -504,6 +506,8 @@
if(!(WT.remove_fuel(0, user)))
to_chat(user, SPAN_WARNING("You need more welding fuel!"))
return
if(user.a_intent == INTENT_HELP)
return

playsound(src, 'sound/items/Welder.ogg', 25, 1)
user.visible_message(SPAN_NOTICE("[user] begins slicing through the outer plating."),
Expand Down

0 comments on commit 0f67b3a

Please sign in to comment.