cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP] Fix letting you actually beat up racks with objects. (oops) (#82277)

Browse Source 
## About The Pull Request

I misjudged `item_interaction` as being a non-combat mode only proc.

https://github.com/tgstation/tgstation/blob/593f1eaee33d0016b473bd799e2b3beddd977304/code/game/atom/atom_tool_acts.dm#L2-L12
Which today I realized, well, it clearly isn't. With my changes, racks
don't let you beat them with an object even though you're in combat
mode.

Anyhow, this pr just makes it so it doesn't continue to the item placing
part when in combat mode.
## Why It's Good For The Game

Fixes an issue I caused, not letting you attack racks with objects.
## Changelog
🆑
fix: You can actually hit racks with objects when in combat mode again.
Importantly, painting them with spraycans like that works again.
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
_0Steven
2024-03-29 12:13:47 +00:00
committed by GitHub
co-authored by Ghom MrMelbert
parent 32dc8d0466
commit bf58beeb41
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -868,7 +868,7 @@
/obj/structure/rack/item_interaction(mob/living/user, obj/item/tool, list/modifiers, is_right_clicking)
. = ..()
if(. || tool.item_flags & ABSTRACT)
if(. || (tool.item_flags & ABSTRACT) || user.combat_mode)
return .
if(user.transferItemToLoc(tool, drop_location(), silent = FALSE))
return ITEM_INTERACT_SUCCESS