cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos

Browse Source 
Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm
This commit is contained in:
AndrewJacksonThe2nd
2016-09-02 15:51:26 -07:00
parent 0ada3764ae 32ef285db9
commit 082b4e4821
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_defines.dm
+2
View File
@@ -71,5 +71,7 @@
var/blood_volume = 0 //how much blood the mob has
var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
var/slipping = FALSE
var/slipping = FALSE