cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

add trait for 'gunpoint,' swap guns over to new trait. (#23494)

Browse Source 
add pointy banana, among other non-gun pointies.

Co-authored-by: Scribble-Sheep <15377810-AlyxisDrayko@users.noreply.gitlab.com>
This commit is contained in:
Sheep
2023-12-12 20:29:04 +00:00
committed by GitHub
co-authored by Scribble-Sheep
parent 0291675051
commit ec85e888e6
6 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -272,7 +272,7 @@
var/pointed_object = "\the [A]"
if(A.loc in src)
pointed_object += " inside [A.loc]"
if(istype(hand_item, /obj/item/gun) && A != hand_item)
if(HAS_TRAIT(hand_item, TRAIT_CAN_POINT_WITH) && A != hand_item)
if(a_intent == INTENT_HELP || !ismob(A))
visible_message("<b>[src]</b> points to [pointed_object] with [hand_item]")
return TRUE