mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-21 15:42:35 +00:00
59584ae772
- Fixes #1630 -fix juggernauts breaking the shit out of door real fast -fix trays having literaly no delay when smacking someone with one - Fixes #1628 -changes the recipe of sbiten, because it makes literaly zero sense for it to use vodka instead of mead, also added a bottle of it, spritted by datberry -fixed bottles spawning without a name and icons on the cargo spawn, the base objects for bottles are just empty bottles now -fix missing eye tape on mob sprite -remove the last bit of "you can't fire a gun on help intent"
27 lines
770 B
Plaintext
27 lines
770 B
Plaintext
/mob/living/proc/trigger_aiming(var/trigger_type)
|
|
if(!aimed.len)
|
|
return
|
|
for(var/obj/aiming_overlay/AO in aimed)
|
|
if(AO.aiming_at == src)
|
|
AO.update_aiming()
|
|
if(AO.aiming_at == src)
|
|
AO.trigger(trigger_type)
|
|
AO.update_aiming_deferred()
|
|
|
|
/obj/aiming_overlay/proc/trigger(var/perm)
|
|
if(!owner || !aiming_with || !aiming_at || !locked)
|
|
return
|
|
if(perm && (target_permissions & perm))
|
|
return
|
|
if(!owner.canClick())
|
|
return
|
|
owner.setClickCooldown(5) // Spam prevention, essentially.
|
|
owner.visible_message("<span class='danger'>\The [owner] pulls the trigger reflexively!</span>")
|
|
var/obj/item/weapon/gun/G = aiming_with
|
|
if(istype(G))
|
|
G.Fire(aiming_at, owner)
|
|
|
|
/mob/living/ClickOn(var/atom/A, var/params)
|
|
. = ..()
|
|
trigger_aiming(TARGET_CAN_CLICK)
|