cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[TWEAK/FIX] Fixes hurting people you intend to help while performing surgery or repairing IPCs (#25704)

Browse Source 
* Addresses (https://github.com/ParadiseSS13/Paradise/issues/25655)

* Update code/_onclick/item_attack.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Spaghetti-bit
2024-06-06 19:26:42 +00:00
committed by GitHub
co-authored by Luc
parent 220cee4edd
commit ef557d7743
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/item_attack.dm
+4
View File
@@ -61,6 +61,10 @@
if(flags & (NOBLUDGEON))
return FALSE
if((is_surgery_tool_by_behavior(src) || is_organ(src) || tool_behaviour) && user.a_intent == INTENT_HELP && on_operable_surface(M) && M != user)
to_chat(user, "<span class='info'>You don't want to harm the person you're trying to help!</span>")
return
if(force && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return