cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Hand Raising (#24223)

Browse Source 
* pick me pick me!

* quick fix

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* contra tweak

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* contra refactor help

* copy paste moment

* missed one lul

* contra review

* tab hell tab hell tab hell

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
matttheficus
2024-03-24 14:10:21 -04:00
committed by GitHub
parent 1fe7819c1b
commit 261b53d17c
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+4 -14
View File
@@ -268,24 +268,14 @@
/mob/living/run_pointed(atom/A)
if(!..())
return FALSE
var/obj/item/hand_item = get_active_hand()
if(istype(hand_item) && hand_item.run_pointed_on_item(src, A))
return TRUE
var/pointed_object = "\the [A]"
if(A.loc in src)
pointed_object += " inside [A.loc]"
var/obj/item/hand_item = get_active_hand()
if(!QDELETED(hand_item) && istype(hand_item) && 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
A.visible_message("<span class='danger'>[src] points [hand_item] at [pointed_object]!</span>",
"<span class='userdanger'>[src] points [hand_item] at you!</span>")
SEND_SOUND(A, sound('sound/weapons/targeton.ogg'))
return TRUE
if(istype(hand_item, /obj/item/toy/russian_revolver/trick_revolver) && A != hand_item)
var/obj/item/toy/russian_revolver/trick_revolver/trick = hand_item
visible_message("<span class='danger'>[src] points [trick] at- and [trick] goes off in their hand!</span>")
trick.shoot_gun(src)
visible_message("<b>[src]</b> points to [pointed_object]")
return TRUE