Staging merge from Nebula

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, planets_testing, outreach, kleibkhar]
+        map_path: [example, tradeship, exodus, ministation, away_sites_testing, modpack_testing, planets_testing, outreach, kleibkhar]
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache

code/__defines/appearance.dm

@@ -1,3 +1,3 @@
 // Consider these images/atoms as part of the UI/HUD
-#define APPEARANCE_UI_IGNORE_ALPHA			RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE
-#define APPEARANCE_UI						RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE
+#define APPEARANCE_UI_IGNORE_ALPHA RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|DEFAULT_APPEARANCE_FLAGS
+#define APPEARANCE_UI              RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|DEFAULT_APPEARANCE_FLAGS

code/__defines/aspects.dm

@@ -11,61 +11,59 @@
 #define ASPECTS_PHYSICAL  BITFLAG(0)
 #define ASPECTS_MENTAL    BITFLAG(1)
 
-#define DEFINE_ROBOLIMB_MODEL_ASPECTS_WITH_SPECIES_BODYTYPE(MODEL_PATH, MODEL_ID, COST, SPECIES, BODYTYPE) \
+#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, COST) \
 /decl/aspect/prosthetic_limb/left_hand/##MODEL_ID {                                                        \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/left_hand;                                                       \
 	aspect_cost = COST * 0.5;                                                                              \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/left_arm/##MODEL_ID {                                                         \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/left_arm;                                                        \
 	aspect_cost = COST;                                                                                    \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/right_hand/##MODEL_ID {                                                       \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/right_hand;                                                      \
 	aspect_cost = COST * 0.5;                                                                              \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/right_arm/##MODEL_ID {                                                        \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/right_arm;                                                       \
 	aspect_cost = COST;                                                                                    \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/left_foot/##MODEL_ID {                                                        \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/left_foot;                                                       \
 	aspect_cost = COST * 0.5;                                                                              \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/left_leg/##MODEL_ID {                                                         \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/left_leg;                                                        \
 	aspect_cost = COST;                                                                                    \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/right_foot/##MODEL_ID {                                                       \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/right_foot;                                                      \
 	aspect_cost = COST * 0.5;                                                                              \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
 }                                                                                                          \
 /decl/aspect/prosthetic_limb/right_leg/##MODEL_ID {                                                        \
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/right_leg;                                                       \
 	aspect_cost = COST;                                                                                    \
-	check_bodytype = BODYTYPE;                                                                             \
-	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/head/##MODEL_ID {                                                             \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/head;                                                            \
+	aspect_cost = COST * 0.5;                                                                              \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/chest/##MODEL_ID {                                                            \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/chest;                                                           \
+	aspect_cost = COST * 0.5;                                                                              \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/groin/##MODEL_ID {                                                            \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/groin;                                                           \
+	aspect_cost = COST * 0.5;                                                                              \
 }
-#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, COST) DEFINE_ROBOLIMB_MODEL_ASPECTS_WITH_SPECIES_BODYTYPE(MODEL_PATH, MODEL_ID, COST, null, null)

code/__defines/bodytype.dm

@@ -0,0 +1,28 @@
+#define BODY_FLAG_EXCLUDE        BITFLAG(0)
+#define BODY_FLAG_HUMANOID       BITFLAG(1)
+#define BODY_FLAG_MONKEY         BITFLAG(2)
+
+#define BODYTYPE_HUMANOID        "humanoid body"
+#define BODYTYPE_OTHER           "alien body"
+#define BODYTYPE_MONKEY          "small humanoid body"
+
+// Bodytype appearance flags
+#define HAS_SKIN_TONE_NORMAL  BITFLAG(0)  // Skin tone selectable in chargen for baseline humans (0-220)
+#define HAS_SKIN_COLOR        BITFLAG(1)  // Skin colour selectable in chargen. (RGB)
+#define HAS_LIPS              BITFLAG(2)  // Lips are drawn onto the mob icon. (lipstick)
+#define HAS_UNDERWEAR         BITFLAG(3)  // Underwear is drawn onto the mob icon.
+#define HAS_EYE_COLOR         BITFLAG(4)  // Eye colour selectable in chargen. (RGB)
+#define HAS_HAIR_COLOR        BITFLAG(5)  // Hair colour selectable in chargen. (RGB)
+#define RADIATION_GLOWS       BITFLAG(6)  // Radiation causes this character to glow.
+#define HAS_SKIN_TONE_GRAV    BITFLAG(7)  // Skin tone selectable in chargen for grav-adapted humans (0-100)
+#define HAS_SKIN_TONE_SPCR    BITFLAG(8)  // Skin tone selectable in chargen for spacer humans (0-165)
+#define HAS_SKIN_TONE_TRITON  BITFLAG(9)
+#define HAS_A_SKIN_TONE (HAS_SKIN_TONE_NORMAL | HAS_SKIN_TONE_GRAV | HAS_SKIN_TONE_SPCR | HAS_SKIN_TONE_TRITON) // Bodytype has a numeric skintone
+
+// Bodytype feature flags
+#define BODY_FLAG_NO_DNA              BITFLAG(0) // Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN.
+#define BODY_FLAG_NO_PAIN             BITFLAG(1) // Cannot suffer halloss/recieves deceptive health indicator.
+#define BODY_FLAG_NO_EAT              BITFLAG(2) // Cannot eat food/drink drinks even if a stomach organ is present.
+#define BODY_FLAG_CRYSTAL_REFORM      BITFLAG(3) // Can regenerate missing limbs from mineral baths.
+#define BODY_FLAG_NO_STASIS           BITFLAG(4) // Does not experience stasis effects (sleeper, cryo)
+#define BODY_FLAG_NO_DEFIB            BITFLAG(5) // Cannot be revived with a defibrilator.

code/__defines/chemistry.dm

@@ -68,3 +68,5 @@
 
 #define DEFAULT_GAS_ACCELERANT /decl/material/gas/hydrogen
 #define DEFAULT_GAS_OXIDIZER   /decl/material/gas/oxygen
+
+#define CHEM_REACTION_FLAG_OVERFLOW_CONTAINER BITFLAG(0)

code/__defines/computers.dm

@@ -76,4 +76,5 @@
 #define OS_FILE_NO_WRITE   -5
 #define OS_HARDDRIVE_SPACE -6
 #define OS_NETWORK_ERROR   -7
-#define OS_BAD_NAME        -8
+#define OS_BAD_NAME        -8
+#define OS_BAD_TYPE        -9 // File type is unsupported on this hardware.

code/__defines/damage_organs.dm

@@ -112,6 +112,6 @@
 #define OPERATE_IDEAL    3
 
 #define MODULAR_BODYPART_INVALID    0 // Cannot be detached or reattached.
-#define MODULAR_BODYPART_PROSTHETIC 1 // Can be detached or reattached freely.
+#define MODULAR_BODYPART_ANYWHERE   1 // Can be detached or reattached freely.
 #define MODULAR_BODYPART_CYBERNETIC 2 // Can be detached or reattached to compatible parent organs.
 

code/__defines/fires.dm

@@ -0,0 +1,4 @@
+#define FUEL_VALUE_RETARDANT -1
+#define FUEL_VALUE_NONE       0
+#define FUEL_VALUE_ACCELERANT 1
+#define FUEL_VALUE_VOLATILE   2