mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-20 18:47:20 +01:00
Adds Hand Raising (#24223)
* 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:
co-authored by
Luc
Contrabang
parent
1fe7819c1b
commit
261b53d17c
@@ -908,3 +908,20 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
|
||||
|
||||
/obj/item/proc/get_heat()
|
||||
return
|
||||
|
||||
/obj/item/proc/run_pointed_on_item(mob/pointer_mob, atom/target_atom)
|
||||
if(!HAS_TRAIT(src, TRAIT_CAN_POINT_WITH) || target_atom == src)
|
||||
return FALSE
|
||||
|
||||
var/pointed_object = "\the [target_atom]"
|
||||
if(target_atom.loc in pointer_mob)
|
||||
pointed_object += " inside [target_atom.loc]"
|
||||
|
||||
if(pointer_mob.a_intent == INTENT_HELP || !ismob(target_atom))
|
||||
pointer_mob.visible_message("<b>[pointer_mob]</b> points to [pointed_object] with [src]")
|
||||
return TRUE
|
||||
|
||||
target_atom.visible_message("<span class='danger'>[pointer_mob] points [src] at [pointed_object]!</span>",
|
||||
"<span class='userdanger'>[pointer_mob] points [src] at you!</span>")
|
||||
SEND_SOUND(target_atom, sound('sound/weapons/targeton.ogg'))
|
||||
return TRUE
|
||||
|
||||
@@ -77,3 +77,9 @@
|
||||
creature.EyeBlind(2 SECONDS) //OH GOD MY EARS ARE RINGING
|
||||
creature.Deaf(4 SECONDS) //OH MY HEAD
|
||||
return ..()
|
||||
|
||||
/obj/item/slapper/run_pointed_on_item(mob/pointer_mob, atom/target_atom)
|
||||
if(target_atom == src)
|
||||
pointer_mob.visible_message("<b>[pointer_mob]</b> raises [pointer_mob.p_their()] hand!")
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
@@ -1239,6 +1239,13 @@
|
||||
shoot_gun(user)
|
||||
return ..()
|
||||
|
||||
/obj/item/toy/russian_revolver/trick_revolver/run_pointed_on_item(mob/pointer_mob, atom/target_atom)
|
||||
if(target_atom != src)
|
||||
pointer_mob.visible_message("<span class='danger'>[pointer_mob] points [src] at- and [src] goes off in their hand!</span>")
|
||||
shoot_gun(pointer_mob)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/*
|
||||
* Rubber Chainsaw
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user