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

Merge pull request #2811 from caelaislinn/xenoarch

Browse Source 
Xenoarch tweaks
This commit is contained in:
Chinsky
2013-05-19 04:24:15 -07:00
parent 639da5b25b 7067382f52
commit e032e3101d
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/research/xenoarchaeology/machinery/analysis_base.dm
View File

@@ -7,7 +7,7 @@
#define XENOARCH_MAX_ENERGY_TRANSFER 4000 #define XENOARCH_MAX_ENERGY_TRANSFER 4000
//How many joules of electrical energy produce how many joules of heat energy? //How many joules of electrical energy produce how many joules of heat energy?
#define XENOARCH_HEAT_COEFFICIENT 10 #define XENOARCH_HEAT_COEFFICIENT 3
/obj/machinery/anomaly /obj/machinery/anomaly
@@ -29,6 +29,7 @@
var/temperature = 273 //measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs var/temperature = 273 //measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs
//if this exceeds 600 and safety is enabled it will shutdown //if this exceeds 600 and safety is enabled it will shutdown
//temp greater than 600 also requires a safety prompt to initiate scanning //temp greater than 600 also requires a safety prompt to initiate scanning
var/max_temp = 450
/obj/machinery/anomaly/New() /obj/machinery/anomaly/New()
..() ..()
@@ -66,10 +67,12 @@
auto_use_power() auto_use_power()
//Add 200 joules when idle, or 3000 when active. This is about 0.6 degrees per tick. //Add 3000 joules when active. This is about 0.6 degrees per tick.
//May need adjustment //May need adjustment
var/heat_added = ( use_power == 1 ? active_power_usage : idle_power_usage )*XENOARCH_HEAT_COEFFICIENT if(use_power == 1)
var/heat_added = active_power_usage *XENOARCH_HEAT_COEFFICIENT
if(temperature < max_temp)
temperature += heat_added/XENOARCH_HEAT_CAPACITY temperature += heat_added/XENOARCH_HEAT_CAPACITY
var/temperature_difference = abs(environmental_temp-temperature) var/temperature_difference = abs(environmental_temp-temperature)

2
code/modules/research/xenoarchaeology/tools/gearbelt.dm
View File

@@ -22,4 +22,6 @@
"/obj/item/weapon/folder", "/obj/item/weapon/folder",
"/obj/item/weapon/clipboard", "/obj/item/weapon/clipboard",
"/obj/item/weapon/anodevice", "/obj/item/weapon/anodevice",
"/obj/item/clothing/glasses",
"/obj/item/weapon/wrench",
"/obj/item/weapon/anobattery") "/obj/item/weapon/anobattery")