cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
This commit is contained in:
mwerezak
2015-09-09 13:39:18 -04:00
committed by HarpyEagle
parent 9ef3df66e3
commit deb215d262
9 changed files with 280 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/item_attack.dm
View File

@@ -74,7 +74,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
return 1
//Called when a weapon is used to make a successful melee attack on a mob.
//Called when a weapon is used to make a successful melee attack on a mob. Returns the blocked result
/obj/item/proc/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
if(hitsound)
playsound(loc, hitsound, 50, 1, -1)