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

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
This commit is contained in:
Ccomp5950
2014-01-30 12:14:44 -06:00
parent a05e016aae aabec7f8a5
commit 975433f898
20 changed files with 164 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/item_attack.dm
View File

@@ -140,7 +140,7 @@
if(istype(M, /mob/living/carbon/human))
M:attacked_by(src, user, def_zone)
return M:attacked_by(src, user, def_zone)
else
switch(damtype)
if("brute")