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

Fixes #9967

Browse Source 
Pulling someone through space or an area without gravity will no longer
deal damage to them
This commit is contained in:
Kelenius
2015-07-15 18:27:27 +03:00
parent a6ec43f0b1
commit b8a354467e
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,27 +410,30 @@
var/atom/movable/t = M.pulling var/atom/movable/t = M.pulling
M.stop_pulling() M.stop_pulling()
//this is the gay blood on floor shit -- Added back -- Skie if(!istype(M.loc, /turf/space))
if (M.lying && (prob(M.getBruteLoss() / 6))) var/area/A = get_area(M)
var/turf/location = M.loc if(A.has_gravity)
if (istype(location, /turf/simulated)) //this is the gay blood on floor shit -- Added back -- Skie
location.add_blood(M) if (M.lying && (prob(M.getBruteLoss() / 6)))
//pull damage with injured people var/turf/location = M.loc
if(prob(25)) if (istype(location, /turf/simulated))
M.adjustBruteLoss(1) location.add_blood(M)
visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!</span>") //pull damage with injured people
if(M.pull_damage()) if(prob(25))
if(prob(25)) M.adjustBruteLoss(1)
M.adjustBruteLoss(2) visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!</span>")
visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>") if(M.pull_damage())
var/turf/location = M.loc if(prob(25))
if (istype(location, /turf/simulated)) M.adjustBruteLoss(2)
location.add_blood(M) visible_message("<span class='danger'>\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>")
if(ishuman(M)) var/turf/location = M.loc
var/mob/living/carbon/H = M if (istype(location, /turf/simulated))
var/blood_volume = round(H:vessel.get_reagent_amount("blood")) location.add_blood(M)
if(blood_volume > 0) if(ishuman(M))
H:vessel.remove_reagent("blood",1) var/mob/living/carbon/H = M
var/blood_volume = round(H:vessel.get_reagent_amount("blood"))
if(blood_volume > 0)
H:vessel.remove_reagent("blood",1)
step(pulling, get_dir(pulling.loc, T)) step(pulling, get_dir(pulling.loc, T))