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

NPC clowns should actually die in space now.

Browse Source 
Mechas now protect from space again (credit to Aranclanos, though I totally helped with this)

Mecha occupants now finally get some feedback/notification when they toggle their airtank lights(credit to Aranclanos)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4736 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Kortgstation@gmail.com
2012-09-21 21:34:05 +00:00
parent 7fc77b0bc5
commit 37cd7537a5
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/mecha/mecha.dm
View File

@@ -948,7 +948,8 @@
lights = !lights lights = !lights
if(lights) SetLuminosity(luminosity + lights_power) if(lights) SetLuminosity(luminosity + lights_power)
else SetLuminosity(luminosity - lights_power) else SetLuminosity(luminosity - lights_power)
log_message("Toggled lights.") src.occupant_message("Toggled lights [lights?"on":"off"].")
log_message("Toggled lights [lights?"on":"off"].")
return return
@@ -960,6 +961,7 @@
if(usr!=src.occupant) if(usr!=src.occupant)
return return
use_internal_tank = !use_internal_tank use_internal_tank = !use_internal_tank
src.occupant_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].")
src.log_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].") src.log_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].")
return return

5
code/modules/mob/living/carbon/human/life.dm
View File

@@ -532,7 +532,10 @@
if(!environment) if(!environment)
return return
var/loc_temp = T0C var/loc_temp = T0C
if(istype(get_turf(src), /turf/space)) if(istype(loc, /obj/mecha))
var/obj/mecha/M = loc
loc_temp = M.return_temperature()
else if(istype(get_turf(src), /turf/space))
var/turf/heat_turf = get_turf(src) var/turf/heat_turf = get_turf(src)
loc_temp = heat_turf.temperature loc_temp = heat_turf.temperature
else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))

6
code/modules/mob/living/simple_animal/clown.dm
View File

@@ -36,7 +36,11 @@
max_co2 = 5 max_co2 = 5
min_n2 = 0 min_n2 = 0
max_n2 = 0 max_n2 = 0
minbodytemp = 0 minbodytemp = 270
maxbodytemp = 370
heat_damage_per_tick = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp
cold_damage_per_tick = 10 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
unsuitable_atoms_damage = 10
var/hostile = 0 var/hostile = 0