Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT

code/__DEFINES/mobs.dm

@@ -64,7 +64,6 @@
 #define DEFAULT_BODYPART_ICON 'icons/mob/human_parts.dmi'
 #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi'
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
-#define DEFAULT_BODYPART_ICON_CITADEL 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
 
 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
@@ -333,4 +332,4 @@
 /// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine()
 #define EXAMINE_MORE_TIME	1 SECONDS
 
-#define SILENCE_RANGED_MESSAGE (1<<0) 
+#define SILENCE_RANGED_MESSAGE (1<<0)

code/__DEFINES/rockpaperscissors.dm

@@ -0,0 +1,7 @@
+#define ROCKPAPERSCISSORS_RANGE				3
+#define ROCKPAPERSCISSORS_TIME_LIMIT		20 SECONDS
+
+#define ROCKPAPERSCISSORS_LOSE				"lose"
+#define ROCKPAPERSCISSORS_WIN				"win"
+#define ROCKPAPERSCISSORS_TIE				"tie"
+#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"

code/__DEFINES/storage/volumetrics.dm

@@ -24,7 +24,10 @@ GLOBAL_LIST_INIT(default_weight_class_to_volume, list(
 // Let's keep all of this in one place. given what we put above anyways..
 
 // volume amount for items
+/// volume for a data disk
 #define ITEM_VOLUME_DISK					1
+/// volume for a shotgun stripper clip holding 4 shells
+#define ITEM_VOLUME_STRIPPER_CLIP			(DEFAULT_VOLUME_NORMAL * 0.5)
 
 // #define SAMPLE_VOLUME_AMOUNT 2
 

code/__DEFINES/subsystems.dm

@@ -145,11 +145,11 @@
 #define SSAIR_EQUALIZE 8
 #define SSAIR_ACTIVETURFS 9
 
+// |= on overlays is not actually guaranteed to not add same appearances but we're optimistically using it anyway.
 #define COMPILE_OVERLAYS(A)\
 	if (TRUE) {\
 		var/list/ad = A.add_overlays;\
 		var/list/rm = A.remove_overlays;\
-		var/list/po = A.priority_overlays;\
 		if(LAZYLEN(rm)){\
 			A.overlays -= rm;\
 			A.remove_overlays = null;\
@@ -158,11 +158,5 @@
 			A.overlays |= ad;\
 			A.add_overlays = null;\
 		}\
-		if(LAZYLEN(po)){\
-			A.overlays |= po;\
-		}\
-		else{\
-			A.priority_overlays = null;\
-		}\
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
 	}