Merge remote-tracking branch 'upstream/master' into loadout-json

code/__DEFINES/DNA.dm

@@ -171,6 +171,7 @@
 #define ORGAN_SLOT_HEART_AID "heartdrive"
 #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
+#define ORGAN_SLOT_BRAIN_ROBOT_RADSHIELDING "brain_robot_radshielding"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
 #define ORGAN_SLOT_WOMB "womb"

code/__DEFINES/_flags/_flags.dm

@@ -162,3 +162,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 		REMOVE_TRAIT(x, TRAIT_KEEP_TOGETHER, KEEP_TOGETHER_ORIGINAL);\
 	else if(!HAS_TRAIT(x, TRAIT_KEEP_TOGETHER))\
 	 	x.appearance_flags &= ~KEEP_TOGETHER
+
+/// 33554431 (2^24 - 1) is the maximum value our bitflags can reach.
+#define MAX_BITFLAG_DIGITS 8

code/__DEFINES/_protect.dm

@@ -7,4 +7,4 @@
 }\
 ##Path/CanProcCall(procname){\
 	return FALSE;\
-}
+}

code/__DEFINES/_readme.dm

@@ -11,4 +11,4 @@
 	and most importantly,
 	how to undo your changes if you screw it up.
 	- Sayu
-*/
+*/

code/__DEFINES/cinematics.dm

@@ -10,4 +10,4 @@
 #define CINEMATIC_NUKE_NO_CORE 10
 #define CINEMATIC_NUKE_FAR 11
 #define CINEMATIC_NUKE_CLOWNOP 12
-#define CINEMATIC_CULT_NUKE 13
+#define CINEMATIC_CULT_NUKE 13

code/__DEFINES/citadel_defines.dm

@@ -114,3 +114,17 @@
 
 //special species definitions
 #define MINIMUM_MUTANT_COLOR	"#202020" //this is how dark players mutant parts and skin can be
+
+//defines for different matrix sections
+#define MATRIX_RED			"red"
+#define MATRIX_GREEN		"green"
+#define MATRIX_BLUE			"blue"
+#define MATRIX_RED_GREEN	"red_green"
+#define MATRIX_RED_BLUE		"red_blue"
+#define MATRIX_GREEN_BLUE	"green_blue"
+#define MATRIX_ALL			"red_green_blue"
+#define MATRIX_NONE			"none"
+
+//defines for the two colour schemes, advanced and old
+#define OLD_CHARACTER_COLORING			"old_color_system"
+#define ADVANCED_CHARACTER_COLORING		"advanced_color_system"

code/__DEFINES/clockcult.dm

@@ -96,4 +96,4 @@ GLOBAL_LIST_EMPTY(all_clockwork_rites) //a list containing all clockwork rites.
 
 #define ARK_SCREAM_COOLDOWN 300 //This much time has to pass between instances of the Ark taking damage before it will "scream" again
 
-#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes
+#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes

code/__DEFINES/combat.dm

@@ -11,6 +11,12 @@
 #define STAMINA 	"stamina"
 #define BRAIN		"brain"
 
+//Toxins damage 'typeflag' - is this normal toxins damage or does it have to do with systems corruption (ROBOTIC_ORGANISM species trait)
+
+#define TOX_DEFAULT 1 //For normal toxins damage / healing (toxins, etc), adjustToxLoss() defaults to this
+#define TOX_SYSCORRUPT 2 //For toxins damage causing adverse effects to robotic organisms, up to and including fatal corruption, or healing that damage
+#define TOX_OMNI 3 //For tox damage / healing that affects both organics and robotic organisms. Used by very few things, e.g. aheals / by default setToxLoss()
+
 //bitflag damage defines used for suicide_act
 #define BRUTELOSS 		(1<<0)
 #define FIRELOSS 		(1<<1)

code/__DEFINES/contracts.dm

@@ -41,4 +41,4 @@
 #define BANISH_FUNERAL_GARB "funeral"
 
 #define LORE 1
-#define LAW 2
+#define LAW 2

code/__DEFINES/cult.dm

@@ -20,4 +20,4 @@
 #define DEFAULT_TOOLTIP "6:-29,5:-2"
 //misc
 #define SOULS_TO_REVIVE 3
-#define BLOODCULT_EYE "f00"
+#define BLOODCULT_EYE "f00"

code/__DEFINES/dcs/flags.dm

@@ -82,4 +82,4 @@
 /// combat mode is active.
 #define COMBAT_MODE_ACTIVE					(1<<1)
 /// combat mode is not active
-#define COMBAT_MODE_INACTIVE				(1<<2)
+#define COMBAT_MODE_INACTIVE				(1<<2)

code/__DEFINES/dcs/helpers.dm

@@ -13,4 +13,4 @@
 #define RemoveElement(arguments...) _RemoveElement(list(##arguments))
 
 /// A wrapper for _AddComponent that allows us to pretend we're using normal named arguments
-#define AddComponent(arguments...) _AddComponent(list(##arguments))
+#define AddComponent(arguments...) _AddComponent(list(##arguments))

code/__DEFINES/exports.dm

@@ -1,4 +1,4 @@
 #define EXPORT_CARGO 1
 #define EXPORT_EMAG 2
 #define EXPORT_CONTRABAND 4
-#define EXPORT_PIRATE 8
+#define EXPORT_PIRATE 8

code/__DEFINES/fantasy_affixes.dm

@@ -2,4 +2,4 @@
 #define AFFIX_SUFFIX 		(1 << 1)
 
 #define AFFIX_GOOD 			(1 << 0)
-#define AFFIX_EVIL 			(1 << 1)
+#define AFFIX_EVIL 			(1 << 1)

code/__DEFINES/is_helpers.dm

@@ -188,6 +188,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define islandmine(A) (istype(A, /obj/effect/mine))
 
+#define issupplypod(A) (istype(A, /obj/structure/closet/supplypod))
+
 #define isammocasing(A) (istype(A, /obj/item/ammo_casing))
 
 #define isidcard(I) (istype(I, /obj/item/card/id))

code/__DEFINES/machines.dm

@@ -120,4 +120,4 @@
 
 #define CLONEPOD_GET_MIND		1
 #define CLONEPOD_POLL_MIND		2
-#define CLONEPOD_NO_MIND		3
+#define CLONEPOD_NO_MIND		3

code/__DEFINES/materials.dm

@@ -12,4 +12,4 @@
 #define MATERIAL_ADD_PREFIX (1<<1)
 #define MATERIAL_AFFECT_STATISTICS (1<<2)
 
-#define MATERIAL_SOURCE(mat) "[mat.name]_material"
+#define MATERIAL_SOURCE(mat) "[mat.name]_material"

code/__DEFINES/medal.dm

@@ -26,4 +26,4 @@
 //Misc medals
 #define MEDAL_METEOR 	"Your Life Before Your Eyes"
 #define MEDAL_PULSE 	"Jackpot"
-#define MEDAL_TIMEWASTE "Overextended The Joke"
+#define MEDAL_TIMEWASTE "Overextended The Joke"

code/__DEFINES/melee.dm

@@ -8,4 +8,4 @@
 #define MARTIALART_KRAVMAGA "krav maga"
 #define MARTIALART_CQC "CQC"
 #define MARTIALART_PLASMAFIST "plasma fist"
-#define MARTIALART_RISINGBASS "rising bass"
+#define MARTIALART_RISINGBASS "rising bass"

code/__DEFINES/menu.dm

@@ -1,3 +1,3 @@
 #define CHECKBOX_NONE 0
 #define CHECKBOX_GROUP 1
-#define CHECKBOX_TOGGLE 2
+#define CHECKBOX_TOGGLE 2

code/__DEFINES/misc.dm

@@ -159,6 +159,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 #define BLOOD_COLOR_LIZARD			"#db004D"
 #define BLOOD_COLOR_UNIVERSAL		"#db3300"
 #define BLOOD_COLOR_BUG				"#a37c0f"
+#define BLOOD_COLOR_PLANT			"#3d610e"
 
 
 //suit sensors: sensor_mode defines

code/__DEFINES/radiation.dm

@@ -18,6 +18,8 @@ Ask ninjanomnom if they're around
 #define RAD_BURN_THRESHOLD 1000						// Applied radiation must be over this to burn
 
 #define RAD_MOB_SAFE 500							// How much stored radiation in a mob with no ill effects
+#define RAD_DEFAULT_ROBOT_SAFE 250					// Like above, except for robotic carbons. Far more susceptible to corruption from radiation.
+#define RAD_UPGRADED_ROBOT_SAFE 750					// If the robot has been upgraded via an implant, their radiation threshold is raised to be somewhat above that of organics.
 
 #define RAD_MOB_HAIRLOSS 800						// How much stored radiation to check for hair loss
 

code/__DEFINES/rockpaperscissors.dm

@@ -4,4 +4,4 @@
 #define ROCKPAPERSCISSORS_LOSE				"lose"
 #define ROCKPAPERSCISSORS_WIN				"win"
 #define ROCKPAPERSCISSORS_TIE				"tie"
-#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"
+#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.7"
+#define TGS_DMAPI_VERSION "5.2.8"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/__DEFINES/tgui.dm

@@ -32,4 +32,4 @@
 	url_encode(json_encode(list( \
 		"type" = type, \
 		"payload" = payload, \
-	))))
+	))))

code/__DEFINES/traits.dm

@@ -118,6 +118,8 @@
 #define TRAIT_NOLIMBDISABLE		"no_limb_disable"
 #define TRAIT_EASYLIMBDISABLE	"easy_limb_disable"
 #define TRAIT_TOXINLOVER		"toxinlover"
+#define TRAIT_ROBOTIC_ORGANISM	"robotic_organism"
+#define TRAIT_ROBOT_RADSHIELDING	"robot_radshielding"
 #define TRAIT_NOBREATH			"no_breath"
 #define TRAIT_ANTIMAGIC			"anti_magic"
 #define TRAIT_HOLY				"holy"
@@ -203,7 +205,7 @@
 #define TRAIT_THERMAL_VISION    "thermal_vision"
 #define TRAIT_NO_TELEPORT		"no-teleport" //you just can't
 #define TRAIT_NO_INTERNALS		"no-internals"
-#define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
+#define TRAIT_TOXIC_ALCOHOL		"alcohol_intolerance"
 #define TRAIT_MUTATION_STASIS			"mutation_stasis" //Prevents processed genetics mutations from processing.
 #define TRAIT_FAST_PUMP				"fast_pump"
 #define TRAIT_NO_PROCESS_FOOD	"no-process-food" // You don't get benefits from nutriment, nor nutrition from reagent consumables
@@ -307,6 +309,7 @@
 #define LOCKED_HELMET_TRAIT "locked-helmet"
 #define NINJA_SUIT_TRAIT "ninja-suit"
 #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
+#define ROBOT_RADSHIELDING_IMPLANT_TRAIT "robot-radshielding-implant"
 #define MARTIAL_ARTIST_TRAIT "martial_artist"
 #define SLEEPING_CARP_TRAIT "sleeping_carp"
 #define RISING_BASS_TRAIT "rising_bass"
@@ -318,6 +321,7 @@
 #define MEGAFAUNA_TRAIT "megafauna"
 #define DEATHSQUAD_TRAIT "deathsquad"
 #define SLIMEPUDDLE_TRAIT "slimepuddle"
+#define CORRUPTED_SYSTEM "corrupted-system"
 /// This trait is added by the active directional block system.
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.

code/__DEFINES/turf_flags.dm

@@ -3,4 +3,4 @@
 #define CHANGETURF_FORCEOP			4
 #define CHANGETURF_SKIP				8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE
 #define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR
-#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.
+#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.

code/__DEFINES/vehicles.dm

@@ -6,4 +6,4 @@
 
 
 //Car trait flags
-#define CAN_KIDNAP 1
+#define CAN_KIDNAP 1