cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some on_hit fixes (#36741)

Browse Source 
* more stuff

* Update silicon.dm

* stuff

* Update code/modules/spells/aoe_turf/conjure/forcewall.dm

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>

---------

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>
This commit is contained in:
boy2mantwicethefam
2024-07-09 15:55:48 +03:00
committed by GitHub
parent 7aa4f81f9c
commit 6b73f4f15a
8 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/complex/combat.dm
View File

@@ -6,8 +6,8 @@
/mob/living/carbon/complex/bullet_act(var/obj/item/projectile/P, var/def_zone)
if(check_shields(P.damage, P))
P.on_hit(src, 2)
return 2
P.on_hit(src, 100)
return PROJECTILE_COLLISION_BLOCKED
return (..(P , def_zone))
/mob/living/carbon/complex/attack_hand(mob/living/M)
@@ -80,4 +80,4 @@
if(!talked)
target.drop_item()
visible_message("<span class='danger'>[src] has disarmed [target]!</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)