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

Merge pull request #10195 from Kelenius/ofSpaceAndWounds

Browse Source 
Of space and wounds
This commit is contained in:
PsiOmegaDelta
2015-07-18 20:04:39 +02:00
parent 2035b8179d 4e2049ccaf
commit 8b769c5d24
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mob/living/living.dm
View File

@@ -410,6 +410,9 @@
var/atom/movable/t = M.pulling var/atom/movable/t = M.pulling
M.stop_pulling() M.stop_pulling()
if(!istype(M.loc, /turf/space))
var/area/A = get_area(M)
if(A.has_gravity)
//this is the gay blood on floor shit -- Added back -- Skie //this is the gay blood on floor shit -- Added back -- Skie
if (M.lying && (prob(M.getBruteLoss() / 6))) if (M.lying && (prob(M.getBruteLoss() / 6)))
var/turf/location = M.loc var/turf/location = M.loc
@@ -427,10 +430,10 @@
if (istype(location, /turf/simulated)) if (istype(location, /turf/simulated))
location.add_blood(M) location.add_blood(M)
if(ishuman(M)) if(ishuman(M))
var/mob/living/carbon/H = M var/mob/living/carbon/human/H = M
var/blood_volume = round(H:vessel.get_reagent_amount("blood")) var/blood_volume = round(H.vessel.get_reagent_amount("blood"))
if(blood_volume > 0) if(blood_volume > 0)
H:vessel.remove_reagent("blood",1) H.vessel.remove_reagent("blood", 1)
step(pulling, get_dir(pulling.loc, T)) step(pulling, get_dir(pulling.loc, T))