Merge remote-tracking branch 'upstream/master'

.github/workflows/stale.yml

@@ -23,7 +23,7 @@ jobs:
         days-before-stale: 14
         days-before-close: 14
         stale-pr-label: 'Stale'
-        closed-pr-label: 'Closed By Stale'
+        close-pr-label: 'Closed By Stale'
         close-pr-message: 'This PR was closed due to inactivity, if you feel this was done in error, please request a maintainer remove the stale label on your PR, to reset the stale timer.'
         days-before-issue-stale: -1
         stale-issue-label: 'Cleanup Flagged'

code/__DEFINES/_flags/interaction_flags.dm

@@ -55,6 +55,8 @@ DEFINE_BITFIELD(interaction_flags_atom, list(
 #define INTERACT_MACHINE_SET_MACHINE (1<<6)
 /// the user must have vision to interact (blind people need not apply)
 #define INTERACT_MACHINE_REQUIRES_SIGHT (1<<7)
+/// allow silicon interaction while offline
+#define INTERACT_MACHINE_OFFLINE_SILICON (1<<8)
 
 DEFINE_BITFIELD(interaction_flags_machine, list(
 	BITFIELD(INTERACT_MACHINE_OPEN),
@@ -65,4 +67,5 @@ DEFINE_BITFIELD(interaction_flags_machine, list(
 	BITFIELD(INTERACT_MACHINE_REQUIRES_SILICON),
 	BITFIELD(INTERACT_MACHINE_SET_MACHINE),
 	BITFIELD(INTERACT_MACHINE_REQUIRES_SIGHT),
+	BITFIELD(INTERACT_MACHINE_OFFLINE_SILICON),
 ))

code/__DEFINES/_flags/item_flags.dm

@@ -31,49 +31,40 @@ DEFINE_BITFIELD(item_flags, list(
 ))
 
 //! Flags for the clothing_flags var on /obj/item
-/*
-#define LAVAPROTECT				(1<<0)
-/// SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
-#define STOPSPRESSUREDAMAGE		(1<<1)
-*/
 /// Blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
-#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)
+/// ignores "is this limb here" for equip.
+#define CLOTHING_IGNORE_DELIMB		(1<<1)
+/// ignores "do we have a jumpsuit" for belt
+#define CLOTHING_IGNORE_BELTLINK	(1<<2)
+/// for plural limbs, wearable with just one
+#define CLOTHING_ALLOW_SINGLE_LIMB	(1<<3)
+/// Prevents syringes, parapens and hyposprays if equipped to slot_suit or SLOT_ID_HEAD.
+#define CLOTHING_THICK_MATERIAL		(1<<4)
+/// Syringes / hyposprays / etc can get through, but need to pass through an injection port.
+#define CLOTHING_INJECTION_PORT		(1<<5)
+// todo: audit
+#define BLOCK_GAS_SMOKE_EFFECT	(1<<6)
 /// Mask allows internals
-#define ALLOWINTERNALS			(1<<3)
+// todo: audit
+#define ALLOWINTERNALS			(1<<7)
 /// Prevents from slipping on wet floors, in space etc
-#define NOSLIP					(1<<4)
-/*
-/// Prevents from slipping on frozen floors
-#define NOSLIP_ICE				(1<<5)
-*/
-/// Prevents syringes, parapens and hyposprays if equipped to slot_suit or SLOT_ID_HEAD.
-#define THICKMATERIAL			(1<<6)
-/*
-/// The voicebox in this clothing can be toggled.
-#define VOICEBOX_TOGGLABLE		(1<<7)
-/// The voicebox is currently turned off.
-#define VOICEBOX_DISABLED		(1<<8)
-/// Hats with negative effects when worn (i.e the tinfoil hat).
-#define IGNORE_HAT_TOSS			(1<<9)
-*/
+// todo: audit
+#define NOSLIP					(1<<8)
 /// Allows helmets and glasses to scan reagents.
-#define SCAN_REAGENTS			(1<<10)
+// todo: audit
+#define SCAN_REAGENTS			(1<<9)
 /// At the moment, masks with this flag will not prevent eating even if they are covering your face.
-#define FLEXIBLEMATERIAL		(1<<11)
+// todo: audit
+#define FLEXIBLEMATERIAL		(1<<10)
 /// Allows special survival food items to be eaten through it
-#define ALLOW_SURVIVALFOOD		(1<<12)
-/// ignores "is this limb here" for equip.
-#define CLOTHING_IGNORE_DELIMB		(1<<13)
-/// ignores "do we have a jumpsuit" for belt
-#define CLOTHING_IGNORE_BELTLINK	(1<<14)
-/// for plural limbs, wearable with just one
-#define CLOTHING_ALLOW_SINGLE_LIMB	(1<<15)
+// todo: audit
+#define ALLOW_SURVIVALFOOD		(1<<11)
 
 DEFINE_BITFIELD(clothing_flags, list(
 	BITFIELD(BLOCK_GAS_SMOKE_EFFECT),
 	BITFIELD(ALLOWINTERNALS),
 	BITFIELD(NOSLIP),
-	BITFIELD(THICKMATERIAL),
+	BITFIELD(CLOTHING_THICK_MATERIAL),
 	BITFIELD(SCAN_REAGENTS),
 	BITFIELD(FLEXIBLEMATERIAL),
 	BITFIELD(ALLOW_SURVIVALFOOD),