mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -51,8 +51,6 @@
|
||||
#define HELMET_MAX_HEAT_PROTECITON_TEMPERATURE 600 //For normal helmets
|
||||
#define ARMOR_MIN_COLD_PROTECITON_TEMPERATURE 160 //For armor
|
||||
#define ARMOR_MAX_HEAT_PROTECITON_TEMPERATURE 600 //For armor
|
||||
#define FIRESUIT_MIN_COLD_PROTECITON_TEMPERATURE 50 //These need better cold protect
|
||||
#define SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE 5000 //These need better heat protect
|
||||
|
||||
#define GLOVES_MIN_COLD_PROTECITON_TEMPERATURE 2.0 //For some gloves (black and)
|
||||
#define GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE 1500 //For some gloves
|
||||
@@ -71,11 +69,8 @@
|
||||
#define DOOR_CRUSH_DAMAGE 10
|
||||
|
||||
// Factor of how fast mob nutrition decreases
|
||||
#define HUNGER_FACTOR 0.05
|
||||
#define REAGENTS_METABOLISM 0.02
|
||||
// By defining the effect multiplier this way, it'll exactly adjust
|
||||
// all effects according to how they originally were with the 0.4 metabolism
|
||||
#define REAGENTS_EFFECT_MULTIPLIER REAGENTS_METABOLISM / 0.4
|
||||
#define HUNGER_FACTOR 0.1
|
||||
#define REAGENTS_METABOLISM 0.4
|
||||
|
||||
#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
|
||||
//Minimum ratio of air that must move to/from a tile to suspend group processing
|
||||
@@ -110,7 +105,7 @@
|
||||
#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile
|
||||
#define FIRE_GROWTH_RATE 40000 //For small fires
|
||||
|
||||
#define WATER_BOIL_TEMP 393
|
||||
//#define WATER_BOIL_TEMP 393
|
||||
|
||||
// Fire Damage
|
||||
#define CARBON_LIFEFORM_FIRE_RESISTANCE 200+T0C
|
||||
@@ -127,16 +122,6 @@
|
||||
#define T20C 293.15 // 20degC
|
||||
#define TCMB 2.7 // -270.3degC
|
||||
|
||||
#define SPECIFIC_HEAT_TOXIN 200
|
||||
#define SPECIFIC_HEAT_AIR 20
|
||||
#define SPECIFIC_HEAT_CDO 30
|
||||
#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \
|
||||
(carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN)
|
||||
|
||||
#define MINIMUM_HEAT_CAPACITY 0.0003
|
||||
#define QUANTIZE(variable) (round(variable,0.0001))
|
||||
#define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer
|
||||
|
||||
var/turf/space/Space_Tile = locate(/turf/space) // A space tile to reference when atmos wants to remove excess heat.
|
||||
|
||||
#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) // Tank starts leaking
|
||||
@@ -549,7 +534,7 @@ var/list/liftable_structures = list(\
|
||||
#define INVISIBILITY_MAXIMUM 100
|
||||
|
||||
//Object specific defines
|
||||
//#define CANDLE_LUM 3 //For how bright candles are //Why is this here? Moved to candle.dm (brightness_on) -SweeperM
|
||||
#define CANDLE_LUM 3 //For how bright candles are
|
||||
|
||||
|
||||
//Some mob defines below
|
||||
@@ -572,8 +557,13 @@ var/list/TAGGERLOCATIONS = list("Disposals",
|
||||
"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
|
||||
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics")
|
||||
|
||||
#define MIN_PLAYER_AGE 19
|
||||
#define MAX_PLAYER_AGE 60
|
||||
#define HOSTILE_STANCE_IDLE 1
|
||||
#define HOSTILE_STANCE_ALERT 2
|
||||
#define HOSTILE_STANCE_ATTACK 3
|
||||
#define HOSTILE_STANCE_ATTACKING 4
|
||||
#define HOSTILE_STANCE_TIRED 5
|
||||
|
||||
#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
|
||||
|
||||
//Damage things
|
||||
|
||||
@@ -607,14 +597,6 @@ var/list/TAGGERLOCATIONS = list("Disposals",
|
||||
#define ORGAN_SPLINTED 256
|
||||
#define SALVED 512
|
||||
|
||||
#define HOSTILE_STANCE_IDLE 1
|
||||
#define HOSTILE_STANCE_ALERT 2
|
||||
#define HOSTILE_STANCE_ATTACK 3
|
||||
#define HOSTILE_STANCE_ATTACKING 4
|
||||
#define HOSTILE_STANCE_TIRED 5
|
||||
#define LEFT 1
|
||||
#define RIGHT 2
|
||||
|
||||
#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
|
||||
|
||||
|
||||
@@ -692,3 +674,6 @@ var/list/be_special_flags = list(
|
||||
#define LANGUAGE_OTHER 32768
|
||||
|
||||
#define LANGUAGE_UNIVERSAL 65535
|
||||
|
||||
#define LEFT 1
|
||||
#define RIGHT 2
|
||||
|
||||
Reference in New Issue
Block a user