Merge remote-tracking branch 'upstream/master'

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -87,7 +87,7 @@
 /obj/machinery/atmospherics/unary/freezer/tgui_act(action, params)
 	if(..())
 		return TRUE
-	
+
 	. = TRUE
 	switch(action)
 		if("toggleStatus")
@@ -173,3 +173,5 @@
 	. = ..()
 	if(panel_open)
 		. += "The maintenance hatch is open."
+
+#undef FREEZER_PERF_MULT

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -160,3 +160,5 @@
 	. = ..()
 	if(panel_open)
 		. += "The maintenance hatch is open."
+
+#undef HEATER_PERF_MULT

code/__defines/SDQL_2.dm

@@ -0,0 +1,2 @@
+#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc")
+#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive")

code/__defines/action.dm

@@ -0,0 +1,5 @@
+#define AB_CHECK_RESTRAINED 1
+#define AB_CHECK_STUNNED 2
+#define AB_CHECK_LYING 4
+#define AB_CHECK_ALIVE 8
+#define AB_CHECK_INSIDE 16

code/__defines/airlock_control.dm

@@ -0,0 +1 @@
+#define AIRLOCK_CONTROL_RANGE 22

code/__defines/ammunition.dm

@@ -0,0 +1,4 @@
+//Gun loading types
+#define SINGLE_CASING 	1	//The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
+#define SPEEDLOADER 	2	//Transfers casings from the mag to the gun when used.
+#define MAGAZINE 		4	//The magazine item itself goes inside the gun

code/__defines/assemblies.dm

@@ -0,0 +1,2 @@
+#define IC_COMPONENTS_BASE		20
+#define IC_COMPLEXITY_BASE		60

code/__defines/blueprints.dm

@@ -0,0 +1,5 @@
+//TG blueprints.
+#define AREA_ERRNONE 0
+#define AREA_STATION 1
+#define AREA_SPACE 2
+#define AREA_SPECIAL 3

code/__defines/circuitboard.dm

@@ -0,0 +1,2 @@
+//Define a macro that we can use to assemble all the circuit board names
+#define T_BOARD(name)	"circuit board (" + (name) + ")"

code/__defines/cloning.dm

@@ -0,0 +1 @@
+#define CLONE_BIOMASS 30 //VOREstation Edit

code/__defines/construction_datum.dm

@@ -0,0 +1,2 @@
+#define FORWARD -1
+#define BACKWARD 1

code/__defines/dna.dm

@@ -74,3 +74,67 @@ var/HALLUCINATIONBLOCK = 0
 var/NOPRINTSBLOCK      = 0
 var/SHOCKIMMUNITYBLOCK = 0
 var/SMALLSIZEBLOCK     = 0
+
+// Define block bounds (off-low,off-high,on-low,on-high)
+// Used in setupgame.dm
+#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
+#define DNA_HARDER_BOUNDS  list(1,3049,3050,4095)
+#define DNA_HARD_BOUNDS    list(1,3490,3500,4095)
+
+// UI Indices (can change to mutblock style, if desired)
+#define DNA_UI_HAIR_R      1
+#define DNA_UI_HAIR_G      2
+#define DNA_UI_HAIR_B      3
+#define DNA_UI_BEARD_R     4
+#define DNA_UI_BEARD_G     5
+#define DNA_UI_BEARD_B     6
+#define DNA_UI_SKIN_TONE   7
+#define DNA_UI_SKIN_R      8
+#define DNA_UI_SKIN_G      9
+#define DNA_UI_SKIN_B      10
+#define DNA_UI_EYES_R      11
+#define DNA_UI_EYES_G      12
+#define DNA_UI_EYES_B      13
+#define DNA_UI_GENDER      14
+#define DNA_UI_BEARD_STYLE 15
+#define DNA_UI_HAIR_STYLE  16
+#define DNA_UI_EAR_STYLE   17 // VOREStation snippet.
+#define DNA_UI_TAIL_STYLE  18
+#define DNA_UI_PLAYERSCALE 19
+#define DNA_UI_TAIL_R      20
+#define DNA_UI_TAIL_G      21
+#define DNA_UI_TAIL_B      22
+#define DNA_UI_TAIL2_R     23
+#define DNA_UI_TAIL2_G     24
+#define DNA_UI_TAIL2_B     25
+#define DNA_UI_TAIL3_R     26
+#define DNA_UI_TAIL3_G     27
+#define DNA_UI_TAIL3_B     28
+#define DNA_UI_EARS_R      29
+#define DNA_UI_EARS_G      30
+#define DNA_UI_EARS_B      31
+#define DNA_UI_EARS2_R     32
+#define DNA_UI_EARS2_G     33
+#define DNA_UI_EARS2_B     34
+#define DNA_UI_EARS3_R     35
+#define DNA_UI_EARS3_G     36
+#define DNA_UI_EARS3_B     37
+#define DNA_UI_WING_STYLE  38
+#define DNA_UI_WING_R      39
+#define DNA_UI_WING_G      40
+#define DNA_UI_WING_B      41
+#define DNA_UI_WING2_R     42
+#define DNA_UI_WING2_G     43
+#define DNA_UI_WING2_B     44
+#define DNA_UI_WING3_R     45
+#define DNA_UI_WING3_G     46
+#define DNA_UI_WING3_B     47 // VOREStation snippet end.
+#define DNA_UI_LENGTH      47 // VOREStation Edit - Needs to match the highest number above.
+
+#define DNA_SE_LENGTH 49 // VOREStation Edit (original was UI+11)
+
+//DNA modifiers
+// Buffer datatype flags.
+#define DNA2_BUF_UI 1
+#define DNA2_BUF_UE 2
+#define DNA2_BUF_SE 4

code/__defines/economy_misc.dm

@@ -0,0 +1,24 @@
+
+#define RIOTS 1
+#define WILD_ANIMAL_ATTACK 2
+#define INDUSTRIAL_ACCIDENT 3
+#define BIOHAZARD_OUTBREAK 4
+#define PIRATES 6
+#define CORPORATE_ATTACK 7
+#define ALIEN_RAIDERS 8
+#define AI_LIBERATION 9
+#define MOURNING 10
+#define CULT_CELL_REVEALED 11
+#define SECURITY_BREACH 12
+#define ANIMAL_RIGHTS_RAID 13
+#define FESTIVAL 14
+
+#define SECURITY 1
+#define FOOD 2
+#define ANIMALS 3
+#define MINERALS 4
+#define EMERGENCY 5
+#define GASEOUS 6
+#define MAINTENANCE 7
+#define ROBOTICS 8
+#define BIOMEDICAL 9

code/__defines/equipment_vendor.dm

@@ -0,0 +1,2 @@
+
+#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p)

code/modules/gamemaster/defines.dm → code/__defines/events.dm

@@ -1,3 +1,3 @@
 #define EVENT_CHAOS_THRESHOLD_HIGH_IMPACT		25
 #define EVENT_CHAOS_THRESHOLD_MEDIUM_IMPACT		50
-#define EVENT_CHAOS_THRESHOLD_LOW_IMPACT		100
+#define EVENT_CHAOS_THRESHOLD_LOW_IMPACT		100

code/__defines/holder.dm

@@ -0,0 +1 @@
+#define PROCESS_REACTION_ITER 5 //when processing a reaction, iterate this many times

code/__defines/implant.dm

@@ -0,0 +1,2 @@
+#define MALFUNCTION_TEMPORARY 1
+#define MALFUNCTION_PERMANENT 2

code/__defines/job_controller.dm

@@ -0,0 +1,3 @@
+#define GET_RANDOM_JOB 0
+#define BE_ASSISTANT 1
+#define RETURN_TO_LOBBY 2

code/__defines/jukebox.dm

@@ -0,0 +1,4 @@
+#define JUKEMODE_NEXT        1 // Advance to next song in the track list
+#define JUKEMODE_RANDOM      2 // Not shuffle, randomly picks next each time.
+#define JUKEMODE_REPEAT_SONG 3 // Play the same song over and over
+#define JUKEMODE_PLAY_ONCE   4 // Play, then stop.

code/__defines/life.dm

@@ -0,0 +1,20 @@
+//Note that gas heat damage is only applied once every FOUR ticks.
+#define HEAT_GAS_DAMAGE_LEVEL_1 2 //Amount of damage applied when the current breath's temperature just passes the 360.15k safety point
+#define HEAT_GAS_DAMAGE_LEVEL_2 4 //Amount of damage applied when the current breath's temperature passes the 400K point
+#define HEAT_GAS_DAMAGE_LEVEL_3 8 //Amount of damage applied when the current breath's temperature passes the 1000K point
+
+#define COLD_GAS_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
+#define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
+#define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point
+
+#define COLD_ALERT_SEVERITY_LOW         1 // Constants passed to the cold and heat alerts.
+#define COLD_ALERT_SEVERITY_MODERATE    2
+#define COLD_ALERT_SEVERITY_MAX         3
+#define ENVIRONMENT_COMFORT_MARKER_COLD 1
+
+#define HOT_ALERT_SEVERITY_LOW          1
+#define HOT_ALERT_SEVERITY_MODERATE     2
+#define HOT_ALERT_SEVERITY_MAX          3
+#define ENVIRONMENT_COMFORT_MARKER_HOT  2
+
+#define TECHNOMANCER_INSTABILITY_MIN_GLOW			10		// When above this number, the entity starts glowing, affecting others.

code/__defines/lighting_vr.dm

@@ -5,4 +5,9 @@
 
 //Fake ambient occlusion filter
 #undef AMBIENT_OCCLUSION
-#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals.
+#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals.
+
+#define LIGHT_OK 0
+#define LIGHT_EMPTY 1
+#define LIGHT_BROKEN 2
+#define LIGHT_BURNED 3

code/__defines/map.dm

@@ -13,3 +13,5 @@
 
 // Misc map defines.
 #define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge.	//VOREStation Edit
+
+#define CELL_ALIVE(VAL) (VAL == cell_live_value)

code/__defines/mecha.dm

@@ -0,0 +1,26 @@
+#define MECHA_INT_FIRE 1
+#define MECHA_INT_TEMP_CONTROL 2
+#define MECHA_INT_SHORT_CIRCUIT 4
+#define MECHA_INT_TANK_BREACH 8
+#define MECHA_INT_CONTROL_LOST 16
+
+#define MECHA_PROC_MOVEMENT 1
+#define MECHA_PROC_DAMAGE   2
+#define MECHA_PROC_INT_TEMP 4
+
+#define MELEE 1
+#define RANGED 2
+
+#define MECH_FACTION_NT "nano"
+#define MECH_FACTION_SYNDI "syndi"
+#define MECH_FACTION_NONE "none"
+
+//Mecha Equipment
+#define EQUIP_HULL		"hull"
+#define EQUIP_WEAPON	"weapon"
+#define EQUIP_UTILITY	"utility"
+#define EQUIP_SPECIAL	"core"
+//VOREStation Addition begin: MICROMECHS
+#define EQUIP_MICRO_UTILITY	"micro_utility"
+#define EQUIP_MICRO_WEAPON	"micro_weapon"
+//VOREStation Addition end: MICROMECHS

code/__defines/mobs_vr.dm

@@ -54,3 +54,6 @@
 #define MARKING_NONDIGI_ONLY 		(1 << 0)
 #define MARKING_DIGITIGRADE_ONLY 	(1 << 1)
 #define MARKING_ALL_LEGS 			MARKING_NONDIGI_ONLY|MARKING_DIGITIGRADE_ONLY
+
+//Grabs
+#define UPGRADE_COOLDOWN	40

code/__defines/objects.dm

@@ -49,3 +49,5 @@
 #define MECH_ARMOR		"Plating"
 #define MECH_GAS		"Life Support"
 #define MECH_ELECTRIC	"Firmware"
+
+#define DRINK_ICON_FILE 'icons/pdrink.dmi'

code/__defines/observer.dm

@@ -0,0 +1 @@
+#define OBSERVER_EVENT_DESTROY "OnDestroy"

code/__defines/organ_internal.dm

@@ -0,0 +1 @@
+#define PROCESS_ACCURACY 10

code/__defines/paicard.dm

@@ -0,0 +1,3 @@
+#define PP_FUNCTIONAL		0
+#define PP_BROKEN			1
+#define PP_MISSING			2

code/__defines/persistence.dm

@@ -1 +1,7 @@
-#define PERSISTENCE_VARIABLE_TOKEN_LENGTH -1
+#define PERSIST_SPAWN		0x01	// Persist spawnpoint based on location of despawn/logout.
+#define PERSIST_WEIGHT		0x02	// Persist mob weight
+#define PERSIST_ORGANS		0x04	// Persist the status (normal/amputated/robotic/etc) and model (for robotic) status of organs
+#define PERSIST_MARKINGS	0x08	// Persist markings
+#define PERSIST_SIZE		0x10	// Persist size
+#define PERSIST_COUNT		5		// Number of valid bits in this bitflag.  Keep this updated!
+#define PERSIST_DEFAULT		PERSIST_SPAWN|PERSIST_ORGANS|PERSIST_MARKINGS|PERSIST_SIZE // Default setting for new folks

code/__defines/planets_vr.dm

@@ -1 +1,47 @@
-#define WEATHER_PARTY				"party"
+#define WEATHER_PARTY				"party"
+
+//Atmosphere properties
+#define VIRGO3B_ONE_ATMOSPHERE	82.4 //kPa
+#define VIRGO3B_AVG_TEMP	234 //kelvin
+
+#define VIRGO3B_PER_N2		0.16 //percent
+#define VIRGO3B_PER_O2		0.00
+#define VIRGO3B_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
+#define VIRGO3B_PER_CO2		0.12
+#define VIRGO3B_PER_PHORON	0.72
+
+//Math only beyond this point
+#define VIRGO3B_MOL_PER_TURF	(VIRGO3B_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3B_AVG_TEMP*R_IDEAL_GAS_EQUATION))
+#define VIRGO3B_MOL_N2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2)
+#define VIRGO3B_MOL_O2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_O2)
+#define VIRGO3B_MOL_N2O			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2O)
+#define VIRGO3B_MOL_CO2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_CO2)
+#define VIRGO3B_MOL_PHORON		(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_PHORON)
+
+//Turfmakers
+#define VIRGO3B_SET_ATMOS	nitrogen=VIRGO3B_MOL_N2;oxygen=VIRGO3B_MOL_O2;carbon_dioxide=VIRGO3B_MOL_CO2;phoron=VIRGO3B_MOL_PHORON;temperature=VIRGO3B_AVG_TEMP
+#define VIRGO3B_TURF_CREATE(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP;x/virgo3b/outdoors=TRUE;x/virgo3b/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
+#define VIRGO3B_TURF_CREATE_UN(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP
+
+//Atmosphere properties
+#define VIRGO3BB_ONE_ATMOSPHERE	101.325 //kPa
+#define VIRGO3BB_AVG_TEMP	293.15 //kelvin
+
+#define VIRGO3BB_PER_N2			0.78 //percent
+#define VIRGO3BB_PER_O2			0.21
+#define VIRGO3BB_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
+#define VIRGO3BB_PER_CO2		0.01
+#define VIRGO3BB_PER_PHORON		0.00
+
+//Math only beyond this point
+#define VIRGO3BB_MOL_PER_TURF	(VIRGO3BB_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3BB_AVG_TEMP*R_IDEAL_GAS_EQUATION))
+#define VIRGO3BB_MOL_N2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2)
+#define VIRGO3BB_MOL_O2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_O2)
+#define VIRGO3BB_MOL_N2O			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2O)
+#define VIRGO3BB_MOL_CO2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_CO2)
+#define VIRGO3BB_MOL_PHORON		(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_PHORON)
+
+//Turfmakers
+#define VIRGO3BB_SET_ATMOS	nitrogen=VIRGO3BB_MOL_N2;oxygen=VIRGO3BB_MOL_O2;carbon_dioxide=VIRGO3BB_MOL_CO2;phoron=VIRGO3BB_MOL_PHORON;temperature=VIRGO3BB_AVG_TEMP
+#define VIRGO3BB_TURF_CREATE(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP;x/virgo3b_better/outdoors=TRUE;x/virgo3b_better/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
+#define VIRGO3BB_TURF_CREATE_UN(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP

code/__defines/power.dm

@@ -0,0 +1,2 @@
+#define I_SINGULO "singulo"
+#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators

code/__defines/preferences.dm

@@ -12,4 +12,6 @@
 #define MULTILINGUAL_DOUBLE_DELIMITER	2
 #define MULTILINGUAL_OFF				3
 
-#define MULTILINGUAL_MODE_MAX			4
+#define MULTILINGUAL_MODE_MAX			4
+
+#define SAVE_RESET -1

code/__defines/projectile.dm

@@ -0,0 +1,3 @@
+#define HOLD_CASINGS	0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour
+#define EJECT_CASINGS	1 //drop spent casings on the ground after firing
+#define CYCLE_CASINGS 	2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns

code/__defines/recipe.dm

@@ -0,0 +1,9 @@
+// Recipe type defines. Used to determine what machine makes them.
+#define MICROWAVE			0x1
+#define FRYER				0x2
+#define OVEN				0x4
+#define GRILL				0x8
+#define CANDYMAKER			0x10
+#define CEREALMAKER			0x20
+
+#define RECIPE_REAGENT_REPLACE		0 //Reagents in the ingredients are discarded.

code/__defines/request_console.dm

@@ -0,0 +1,4 @@
+//Request Console Department Types
+#define RC_ASSIST 1		//Request Assistance
+#define RC_SUPPLY 2		//Request Supplies
+#define RC_INFO   4		//Relay Info

code/__defines/robot.dm

@@ -0,0 +1 @@
+#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen"

code/__defines/simple_mob.dm

@@ -0,0 +1,8 @@
+// Flags for specifying which states we have vore icon_states for.
+#define SA_ICON_LIVING	0x01
+#define SA_ICON_DEAD	0x02
+#define SA_ICON_REST	0x04
+
+// Hivebots are tuned towards how many default lasers are needed to kill them.
+// As such, if laser damage is ever changed, you should change this define.
+#define LASERS_TO_KILL * 40

code/__defines/size.dm

@@ -0,0 +1,3 @@
+
+#define MAX_VOICE_FREQ 70000
+#define MIN_VOICE_FREQ 15000

code/__defines/spells.dm

@@ -0,0 +1,5 @@
+
+#define OFFENSIVE_SPELLS "Offensive"
+#define DEFENSIVE_SPELLS "Defensive"
+#define UTILITY_SPELLS "Utility"
+#define SUPPORT_SPELLS "Support"

code/__defines/traits.dm

@@ -0,0 +1,2 @@
+#define ORGANICS	1
+#define SYNTHETICS	2

code/__defines/update_icons.dm

@@ -0,0 +1 @@
+#define MOB_WATER_LAYER			36

code/_helpers/text.dm

@@ -52,8 +52,9 @@
 		input = copytext(input,1,max_length)
 
 	if(extra)
+		input = replacetext(input, new/regex("^\[\\n\]+|\[\\n\]+$", "g"), "")// strip leading and trailing new lines
 		var/temp_input = replace_characters(input, list("\n"="  ","\t"=" "))//one character is replaced by two
-		if(length(input) < (length(temp_input) - 6))//6 is the number of linebreaks allowed per message
+		if(length(input) < (length(temp_input) - 18))//18 is the number of linebreaks allowed per message
 			input = replace_characters(temp_input,list("  "=" "))//replace again, this time the double spaces with single ones
 
 	if(encode)