cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a gamebreaking bug

Browse Source 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/life.dm
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
d3athrow
2014-03-22 06:22:55 -04:00
committed by ZomgPonies
parent cf8348c25d
commit 68012f5017
8 changed files with 10257 additions and 9887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+3
View File
@@ -209,6 +209,9 @@
if (istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_initialized)
stat("Energy Charge", (wear_suit:cell:charge))
if(istype(loc, /obj/spacepod)) // Spacdpods!
var/obj/spacepod/S = loc
stat("Spacepod Charge", "[istype(S.battery) ? "[(S.battery.charge / S.battery.maxcharge) * 100]" : "No cell detected"]")
/mob/living/carbon/human/ex_act(severity)
if(!blinded)
code/modules/mob/living/carbon/human/life.dm
+3
View File
@@ -601,6 +601,9 @@
if(istype(loc, /obj/mecha))
var/obj/mecha/M = loc
loc_temp = M.return_temperature()
if(istype(loc, /obj/spacepod))
var/obj/spacepod/S = loc
loc_temp = S.return_temperature()
//else if(istype(get_turf(src), /turf/space))
else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
loc_temp = loc:air_contents.temperature