cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into water_act

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
This commit is contained in:
Tigercat2000
2015-05-10 05:41:52 -07:00
parent 27442f9539 73838ac55d
commit b7b13f15a4
27 changed files with 420 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+8
View File
@@ -488,6 +488,14 @@ emp_act
..()
return
/mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction)
if(shoes)
if(istype(shoes,/obj/item/clothing/shoes/magboots)) //TODO: Make a not-shit shoe var system to negate airflow.
var/obj/item/clothing/shoes/magboots/MB = shoes
if(MB.magpulse)
return 0
..()
/mob/living/carbon/human/water_act(volume, temperature, source)
..()