Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

You can no longer deconstruct tables and racks on help intent. #11594

Merged
JamieD1 merged 2 commits into from Jun 19, 2021
Merged

You can no longer deconstruct tables and racks on help intent. #11594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f120a
You can no longer deconstruct tables on help intent.
154942 Jun 13, 2021
7c34bb9
You can now use harm intent to smash racks and tables down.
154942 Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/game/objects/structures/tables_racks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@
if(istype(I, /obj/item/rsf)) // Stops RSF from placing itself instead of glasses
return
if(!(flags_1 & NODECONSTRUCT_1))
if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready)
if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready && user.a_intent != INTENT_HELP && user.a_intent != INTENT_HARM)
to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
if(I.use_tool(src, user, 20, volume=50))
deconstruct(TRUE)
return

if(I.tool_behaviour == TOOL_WRENCH && deconstruction_ready)
if(I.tool_behaviour == TOOL_WRENCH && deconstruction_ready && user.a_intent != INTENT_HELP && user.a_intent != INTENT_HARM)
to_chat(user, "<span class='notice'>You start deconstructing [src]...</span>")
if(I.use_tool(src, user, 40, volume=50))
playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
Expand Down Expand Up @@ -600,7 +600,7 @@
step(O, get_dir(O, src))

/obj/structure/rack/attackby(obj/item/W, mob/user, params)
if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && user.a_intent != INTENT_HELP && user.a_intent != INTENT_HARM)
W.play_tool_sound(src)
deconstruct(TRUE)
return
Expand Down