cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decals now do not decline your action (#21055)

Browse Source 
* decal location melee attack chain added

* supports hulk, simple animals, hand attack(touches)
This commit is contained in:
HMBGERDO
2023-06-02 17:36:50 +01:00
committed by GitHub
parent f2ef07239f
commit 214b6d39ee
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effects.dm
+14 -3
View File
@@ -12,9 +12,6 @@
/obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
return
/obj/effect/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
return FALSE
/obj/effect/singularity_act()
qdel(src)
return FALSE
@@ -104,6 +101,20 @@
/obj/effect/decal/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks))
scoop(I, user)
else if(issimulatedturf(loc))
I.melee_attack_chain(user, loc)
/obj/effect/decal/attack_animal(mob/living/simple_animal/M)
if(issimulatedturf(loc))
loc.attack_animal(M)
/obj/effect/decal/attack_hand(mob/living/user)
if(issimulatedturf(loc))
loc.attack_hand(user)
/obj/effect/decal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(issimulatedturf(loc))
loc.attack_hulk(user, does_attack_animation)
/obj/effect/decal/proc/scoop(obj/item/I, mob/user)
if(reagents && I.reagents && !no_scoop)