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

Code relocation.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-10-11 17:20:07 +02:00
parent 070ca0adea
commit 38c6ba3a07
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__defines/atmos.dm
View File

@@ -57,15 +57,15 @@
//These control the speed at which fire burns //These control the speed at which fire burns
#define FIRE_GAS_BURNRATE_MULT 1 #define FIRE_GAS_BURNRATE_MULT 1
#define FIRE_LIQUID_BURNRATE_MULT 1 #define FIRE_LIQUID_BURNRATE_MULT 0.225
//If the fire is burning slower than this rate then the reaction is going too slow to be self sustaining and the fire burns itself out. //If the fire is burning slower than this rate then the reaction is going too slow to be self sustaining and the fire burns itself out.
//This ensures that fires don't grind to a near-halt while still remaining active forever. //This ensures that fires don't grind to a near-halt while still remaining active forever.
#define FIRE_GAS_MIN_BURNRATE 0.01 #define FIRE_GAS_MIN_BURNRATE 0.01
#define FIRE_LIQUD_MIN_BURNRATE 0.01 #define FIRE_LIQUD_MIN_BURNRATE 0.0025
//How many moles of fuel are contained within one solid/liquid fuel volume unit //How many moles of fuel are contained within one solid/liquid fuel volume unit
#define LIQUIDFUEL_AMOUNT_TO_MOL 1 //mol/volume unit #define LIQUIDFUEL_AMOUNT_TO_MOL 0.45 //mol/volume unit
// XGM gas flags. // XGM gas flags.
#define XGM_GAS_FUEL 1 #define XGM_GAS_FUEL 1

22
code/game/objects/items/weapons/tanks/tanks.dm
View File

@@ -36,7 +36,7 @@
qdel(air_contents) qdel(air_contents)
processing_objects.Remove(src) processing_objects.Remove(src)
if(istype(loc, /obj/item/device/transfer_valve)) if(istype(loc, /obj/item/device/transfer_valve))
var/obj/item/device/transfer_valve/TTV = loc var/obj/item/device/transfer_valve/TTV = loc
TTV.remove_tank(src) TTV.remove_tank(src)
@@ -120,7 +120,7 @@
location = loc.loc location = loc.loc
else if(istype(loc, /mob/living/carbon)) else if(istype(loc, /mob/living/carbon))
location = loc location = loc
var/using_internal var/using_internal
if(istype(location)) if(istype(location))
if(location.internal==src) if(location.internal==src)
@@ -267,19 +267,19 @@
var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE
explosion( explosion(
get_turf(loc), get_turf(loc),
round(min(BOMBCAP_DVSTN_RADIUS, range*0.25)), round(min(BOMBCAP_DVSTN_RADIUS, range*0.25)),
round(min(BOMBCAP_HEAVY_RADIUS, range*0.50)), round(min(BOMBCAP_HEAVY_RADIUS, range*0.50)),
round(min(BOMBCAP_LIGHT_RADIUS, range*1.00)), round(min(BOMBCAP_LIGHT_RADIUS, range*1.00)),
round(min(BOMBCAP_FLASH_RADIUS, range*1.50)), round(min(BOMBCAP_FLASH_RADIUS, range*1.50)),
) )
qdel(src) qdel(src)
else if(pressure > TANK_RUPTURE_PRESSURE) else if(pressure > TANK_RUPTURE_PRESSURE)
#ifdef FIREDBG #ifdef FIREDBG
log_debug("\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") log_debug("<span class='warning'>[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]</span>")
#endif #endif
if(integrity <= 0) if(integrity <= 0)
var/turf/simulated/T = get_turf(src) var/turf/simulated/T = get_turf(src)
if(!T) if(!T)
@@ -292,9 +292,9 @@
else if(pressure > TANK_LEAK_PRESSURE) else if(pressure > TANK_LEAK_PRESSURE)
#ifdef FIREDBG #ifdef FIREDBG
log_debug("\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") log_debug("<span class='warning'>[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]</span>")
#endif #endif
if(integrity <= 0) if(integrity <= 0)
var/turf/simulated/T = get_turf(src) var/turf/simulated/T = get_turf(src)
if(!T) if(!T)

4
code/modules/holodeck/HolodeckControl.dm
View File

@@ -42,13 +42,13 @@
dat += "<HR>Current Loaded Programs:<BR>" dat += "<HR>Current Loaded Programs:<BR>"
if(!linkedholodeck) if(!linkedholodeck)
dat += "</span class='danger'>Warning: Unable to locate holodeck.<br></span>" dat += "<span class='danger'>Warning: Unable to locate holodeck.<br></span>"
user << browse(dat, "window=computer;size=400x500") user << browse(dat, "window=computer;size=400x500")
onclose(user, "computer") onclose(user, "computer")
return return
if(!supported_programs.len) if(!supported_programs.len)
dat += "</span class='danger'>Warning: No supported holo-programs loaded.<br></span>" dat += "<span class='danger'>Warning: No supported holo-programs loaded.<br></span>"
user << browse(dat, "window=computer;size=400x500") user << browse(dat, "window=computer;size=400x500")
onclose(user, "computer") onclose(user, "computer")
return return