Merge branch 'master' into fairylights

code/__DEFINES/dcs/signals.dm

@@ -736,6 +736,9 @@
 ///from datum/action/cyborg_small_sprite and sends when a cyborg changes modules
 #define COMSIG_CYBORG_MODULE_CHANGE "cyborg_module_change"
 
+// /datum/element/ventcrawling signals
+#define COMSIG_HANDLE_VENTCRAWL "handle_ventcrawl"							//when atom with ventcrawling element attempts to ventcrawl
+#define COMSIG_CHECK_VENTCRAWL "check_ventcrawl"							//to check an atom's ventcrawling element tier (if applicable)
 
 /* Attack signals. They should share the returned flags, to standardize the attack chain. */
 /// tool_act -> pre_attack -> target.attackby (item.attack) -> afterattack

code/__DEFINES/hyper_arousal.dm

@@ -0,0 +1,8 @@
+#define BELLY_MIN_SIZE 0
+#define BELLY_MAX_SIZE 8
+
+#define BELLY_STRAIN_SIZE 3 // for flavor text
+#define BELLY_STRETCH_SIZE 6 // for flavor text
+
+#define BUTT_MIN_SIZE 0
+#define BUTT_MAX_SIZE 5

code/__DEFINES/mobs.dm

@@ -285,3 +285,7 @@
 #define HUMAN_CARRY_SLOWDOWN 0
 
 #define TYPING_INDICATOR_TIMEOUT 10 MINUTES
+
+//Gremlins
+#define NPC_TAMPER_ACT_FORGET 1 //Don't try to tamper with this again
+#define NPC_TAMPER_ACT_NOMSG  2 //Don't produce a visible message

code/__DEFINES/radiation.dm

@@ -36,6 +36,7 @@ Ask ninjanomnom if they're around
 #define RAD_MEDIUM_INSULATION  0.7					// What common walls have
 #define RAD_HEAVY_INSULATION 0.6					// What reinforced walls have
 #define RAD_EXTREME_INSULATION 0.5					// What rad collectors have
+#define RAD_NEAR_FULL_INSULATION 0.2				// What radiation shutters and specialised walls for the RBMK use.
 #define RAD_FULL_INSULATION 0						// Unused
 
 // WARNING: The deines below could have disastrous consequences if tweaked incorrectly. See: The great SM purge of Oct.6.2017

code/__DEFINES/say.dm

@@ -58,6 +58,7 @@
 #define SPAN_COMMAND "command_headset"
 #define SPAN_CLOWN "clown"
 #define SPAN_SINGING "singing"
+#define SPAN_SMALL "small"
 
 //bitflag #defines for return value of the radio() proc.
 #define ITALICS 1

code/__DEFINES/traits.dm

@@ -206,6 +206,8 @@
 
 #define TRAIT_ZAOCORP_NOGUNS	"zao_no_guns"
 
+#define INNATE_TRAIT "innate"
+
 // common trait sources
 #define TRAIT_GENERIC "generic"
 #define EYE_DAMAGE "eye_damage"