Outreach map changes

.github/workflows/test.yml

@@ -14,9 +14,9 @@ on:
   workflow_dispatch:
 
 env:
-  BYOND_MAJOR: "514"
-  BYOND_MINOR: "1575"
-  SPACEMAN_DMM_VERSION: suite-1.7.2
+  BYOND_MAJOR: "515"
+  BYOND_MINOR: "1633"
+  SPACEMAN_DMM_VERSION: suite-1.8
 
 jobs:
   DreamChecker:

.gitignore

@@ -50,3 +50,4 @@ lib/*.so
 # python
 *.pyc
 __pycache__
+/maps/outreach/backup

code/__defines/MC.dm

@@ -27,7 +27,7 @@ if (Datum.is_processing) {\
 		PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \
 	}\
 } else {\
-	Datum.is_processing = #Processor;\
+	Datum.is_processing = Processor._internal_name;\
 	Processor.processing += Datum;\
 }
 
@@ -125,6 +125,9 @@ if(Datum.is_processing) {\
 	NEW_SS_GLOBAL(SS##X);\
 	PreInit();\
 }\
+/datum/controller/subsystem/##X{\
+	_internal_name = "SS" + #X;\
+}\
 /datum/controller/subsystem/##X
 
 #define PROCESSING_SUBSYSTEM_DEF(X) var/global/datum/controller/subsystem/processing/##X/SS##X;\
@@ -137,4 +140,5 @@ if(Datum.is_processing) {\
 		processing = SS##X.processing; \
 	}\
 }\
-/datum/controller/subsystem/processing/##X
+/datum/controller/subsystem/processing/##X/_internal_name = "SS" + #X;\
+/datum/controller/subsystem/processing/##X

code/__defines/ZAS.dm

@@ -40,12 +40,28 @@
 #define TURF_HAS_VALID_ZONE(T) (isturf(T) && T:zone && !T:zone:invalid)
 #define SHOULD_PARTICIPATE_IN_ZONES(T) (isturf(T) && T:zone_membership_candidate && (!T:external_atmosphere_participation || !T:is_outside()))
 
+#define ATMOS_CANPASS_MOVABLE(ret, AM, TARG_TURF) \
+	switch (AM.atmos_canpass) { \
+		if (CANPASS_ALWAYS) { } \
+		if (CANPASS_DENSITY) { \
+			if (AM.density) { \
+				ret |= AIR_BLOCKED; \
+			} \
+		} \
+		if (CANPASS_PROC) { \
+			ret |= (AIR_BLOCKED * !AM.CanPass(null, TARG_TURF, 0, 0)) | (ZONE_BLOCKED * !AM.CanPass(null, TARG_TURF, 1.5, 1)); \
+		} \
+		if (CANPASS_NEVER) { \
+			ret = BLOCKED; \
+		} \
+	}
+
 #ifdef MULTIZAS
 
 var/global/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTHUP, EASTUP, WESTUP, SOUTHUP, NORTHDOWN, EASTDOWN, WESTDOWN, SOUTHDOWN)
 var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
 
-#define ATMOS_CANPASS_TURF(ret,A,B) \
+#define ATMOS_CANPASS_TURF(ret, A, B) \
 	if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
 		ret = BLOCKED; \
 	} \
@@ -64,22 +80,7 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
 		ret = 0;\
 		for (var/thing in A) { \
 			var/atom/movable/AM = thing; \
-			switch (AM.atmos_canpass) { \
-				if (CANPASS_ALWAYS) { \
-					continue; \
-				} \
-				if (CANPASS_DENSITY) { \
-					if (AM.density) { \
-						ret |= AIR_BLOCKED; \
-					} \
-				} \
-				if (CANPASS_PROC) { \
-					ret |= (AIR_BLOCKED * !AM.CanPass(null, B, 0, 0)) | (ZONE_BLOCKED * !AM.CanPass(null, B, 1.5, 1)); \
-				} \
-				if (CANPASS_NEVER) { \
-					ret = BLOCKED; \
-				} \
-			} \
+			ATMOS_CANPASS_MOVABLE(ret, AM, B); \
 			if (ret == BLOCKED) { \
 				break;\
 			}\
@@ -90,7 +91,7 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
 var/global/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
 var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
 
-#define ATMOS_CANPASS_TURF(ret,A,B) \
+#define ATMOS_CANPASS_TURF(ret, A, B) \
 	if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
 		ret = BLOCKED; \
 	} \
@@ -101,22 +102,7 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
 		ret = 0;\
 		for (var/thing in A) { \
 			var/atom/movable/AM = thing; \
-			switch (AM.atmos_canpass) { \
-				if (CANPASS_ALWAYS) { \
-					continue; \
-				} \
-				if (CANPASS_DENSITY) { \
-					if (AM.density) { \
-						ret |= AIR_BLOCKED; \
-					} \
-				} \
-				if (CANPASS_PROC) { \
-					ret |= (AIR_BLOCKED * !AM.CanPass(null, B, 0, 0)) | (ZONE_BLOCKED * !AM.CanPass(null, B, 1.5, 1)); \
-				} \
-				if (CANPASS_NEVER) { \
-					ret = BLOCKED; \
-				} \
-			} \
+			ATMOS_CANPASS_MOVABLE(ret, AM, B); \
 			if (ret == BLOCKED) { \
 				break;\
 			}\

code/__defines/_byond_version_compat.dm

@@ -0,0 +1,47 @@
+#define REQUIRED_DM_VERSION 514
+
+#if DM_VERSION < REQUIRED_DM_VERSION
+#warn Nebula is not tested on BYOND versions older than 514. The code may not compile, and if it does compile it may have severe problems.
+#endif
+
+// 515 split call for external libraries into call_ext
+#if DM_VERSION < 515
+#define LIBCALL call
+#else
+#define LIBCALL call_ext
+#endif
+
+// So we want to have compile time guarantees these methods exist on local type, unfortunately 515 killed the .proc/procname and .verb/verbname syntax so we have to use nameof()
+// For the record: GLOBAL_VERB_REF would be useless as verbs can't be global.
+
+#if DM_VERSION < 515
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
+#define PROC_REF(X) (.proc/##X)
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (.verb/##X)
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X)
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (##TYPE.verb/##X)
+
+/// Call by name proc reference, checks if the proc is an existing global proc
+#define GLOBAL_PROC_REF(X) (/proc/##X)
+
+#else
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
+#define PROC_REF(X) (nameof(.proc/##X))
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (nameof(.verb/##X))
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
+
+/// Call by name proc reference, checks if the proc is an existing global proc
+#define GLOBAL_PROC_REF(X) (/proc/##X)
+
+#endif

code/__defines/_compile_options.dm

@@ -2,8 +2,5 @@
 // 1 will enable set background. 0 will disable set background.
 #define BACKGROUND_ENABLED 0
 
-#define REQUIRED_DM_VERSION 514
-
-#if DM_VERSION < REQUIRED_DM_VERSION
-#warn Nebula is not tested on BYOND versions older than 514. The code may not compile, and if it does compile it may have severe problems.
-#endif
+///If set, the persistence SS implementation on nebula is disabled and gutted out.
+#define NO_NEB_PERSISTENCE 1

code/__defines/atmos.dm

@@ -97,3 +97,27 @@
 #define ATMOSTANK_HYDROGEN      MOLES_IN(50000, CELL_VOLUME, T20C)
 #define ATMOSTANK_HYDROGEN_FUEL MOLES_IN(25000, CELL_VOLUME, T20C)
 #define ATMOSTANK_NITROUSOXIDE  MOLES_IN(10000, CELL_VOLUME, T20C) // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
+/////////////////////////////////////////
+//Vent Pressure Check Flags
+/////////////////////////////////////////
+
+/// If set, the vent will check the external pressure bound value it has before pumping/siphoning gas to/from the environment
+#define VENT_PRESSURE_CHECK_FLAG_EXTERNAL BITFLAG(1)
+/// If set, the vent will check the internal vent's pressure bound value it has before pumping/siphoning gas to/from the environment
+#define VENT_PRESSURE_CHECK_FLAG_INTERNAL BITFLAG(2)
+/// The default pressure check flag value for vents
+#define VENT_PRESSURE_CHECK_FLAG_DEFAULT  VENT_PRESSURE_CHECK_FLAG_EXTERNAL
+
+/////////////////////////////////////////
+//Vent Default Pressure Bounds
+/////////////////////////////////////////
+
+/// The pressure inside the vent at which it will stop pumping gas into the environment by default.
+#define VENT_DEFAULT_INTERNAL_PRESSURE_PUMP   0
+/// The pressure inside the vent at which it will stop siphoning gas from the environment by default.
+#define VENT_DEFAULT_INTERNAL_PRESSURE_SIPHON MAX_PUMP_PRESSURE
+
+/// The pressure in the environment of a vent at which it will stop pumping gas by default.
+#define VENT_DEFAULT_EXTERNAL_PRESSURE_PUMP   ONE_ATMOSPHERE
+/// The pressure in the environment of a vent at which it will stop siphoning gas from by default.
+#define VENT_DEFAULT_EXTERNAL_PRESSURE_SIPHON 0

code/__defines/bodytype.dm

@@ -8,11 +8,9 @@
 
 // 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_SKIN_COLOR        BITFLAG(1)  // Skin color selectable in chargen. (RGB)
 #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 HAS_EYE_COLOR         BITFLAG(4)  // Eye color 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)

code/__defines/chargen.dm

@@ -0,0 +1,11 @@
+//Some helpers for passing chargen state around
+///Chargen state for minds of entities that do not go through chargen. Prevents skipping save on potentially desired saved entities.
+#define CHARGEN_STATE_NONE            -1
+///Chargen state for new characters going through the character generator. This indicates the origins form was not completed yet.
+#define CHARGEN_STATE_FORM_INCOMPLETE 0
+///Chargen state for new characters going through the character generator. This indicates the origins form was filled and submitted.
+#define CHARGEN_STATE_FORM_COMPLETE   1
+///Chargen state for new characters going through the character generator. This indicates the character is in the spawn pod and is waiting to be moved to spawn.
+#define CHARGEN_STATE_AWAITING_SPAWN  2
+///Chargen state for new characters going through the character generator. This indicates the character was spawned in the world and chargen is completed.
+#define CHARGEN_STATE_FINALIZED       3

code/__defines/chemistry.dm

@@ -57,10 +57,13 @@
 #define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[REAGENT_TYPE])
 #define REAGENT_DATA(REAGENT_HOLDER, REAGENT_TYPE)   (REAGENT_HOLDER?.reagent_data    && REAGENT_HOLDER.reagent_data[REAGENT_TYPE])
 
-#define MAT_SOLVENT_NONE     0
-#define MAT_SOLVENT_MILD     1
-#define MAT_SOLVENT_MODERATE 2
-#define MAT_SOLVENT_STRONG   3
+#define MAT_SOLVENT_NONE        0
+#define MAT_SOLVENT_MILD        1
+#define MAT_SOLVENT_MODERATE    2
+#define MAT_SOLVENT_STRONG      3
+#define MAT_SOLVENT_VERY_STRONG 7
+#define MAT_SOLVENT_STRONGEST   10
+#define MAT_SOLVENT_IMMUNE   INFINITY
 
 #define DIRTINESS_DECONTAMINATE -3
 #define DIRTINESS_STERILE       -2

code/__defines/colors.dm

@@ -39,6 +39,7 @@
 #define COLOR_GREEN_GRAY       "#8daf6a"
 #define COLOR_DARK_GREEN_GRAY  "#54654c"
 #define COLOR_BLUE_GRAY        "#6a97b0"
+#define COLOR_MID_BLUE_GRAY    "#666699"
 #define COLOR_DARK_BLUE_GRAY   "#3e4855"
 #define COLOR_SURGERY_BLUE     "#e0f2f6"
 #define COLOR_SUN              "#ec8b2f"
@@ -92,6 +93,13 @@
 #define COLOR_CRYSTAL          "#00c8a5"
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_DIAMOND          "#d8d4ea"
+#define COLOR_BLOOD_RED        "#990000"
+#define COLOR_PALE_GOLD        "#cc9900"
+#define COLOR_ROYAL_BLUE       "#0033ff"
+#define COLOR_VERDANT_GREEN    "#287d00"
+#define COLOR_SCIENCE_PURPLE   "#6633cc"
+
+#define COLOR_SUPPLY_BROWN     "#967032"
 
 #define PIPE_COLOR_GREY        "#808080"
 #define PIPE_COLOR_RED         "#ff0000"

code/__defines/credits.dm

@@ -0,0 +1,4 @@
+#define CREDIT_ROLL_SPEED 185
+#define CREDIT_SPAWN_SPEED 20
+#define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size)
+#define CREDIT_EASE_DURATION 22

code/__defines/damage.dm

@@ -0,0 +1,2 @@
+///The decimal precision for health values. Health will be rounded against this value.
+#define HEALTH_ROUNDING 0.01

code/__defines/flags.dm

@@ -13,7 +13,7 @@ especially on common types like /atom or /atom/movable.
 
 - FLAG SETTING
 // When setting default flags on type definitions, they are combined with bitwise OR:
-// atom_flags = ATOM_FLAG_CLIMBABLE | ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_TEMP_CHANGE
+// atom_flags = ATOM_FLAG_CLIMBABLE | ATOM_FLAG_OPEN_CONTAINER
 // Be mindful of flags set on parent types, as setting flags on a child type will override the parent flags.
 // Flags are also set at runtime with bitwise OR:
 // atom_flags |= ATOM_FLAG_CLIMBABLE
@@ -40,13 +40,12 @@ The latter will result in a linter warning and will not work correctly.
 #define ATOM_FLAG_NO_REACT                  BITFLAG(3)  // Reagents don't react inside this container.
 #define ATOM_FLAG_OPEN_CONTAINER            BITFLAG(4)  // Is an open container for chemistry purposes.
 #define ATOM_FLAG_INITIALIZED               BITFLAG(5)  // Has this atom been initialized
-#define ATOM_FLAG_NO_TEMP_CHANGE            BITFLAG(6)  // Reagents do not cool or heat to ambient temperature in this container.
-#define ATOM_FLAG_CAN_BE_PAINTED            BITFLAG(7)  // Can be painted using a paint sprayer or similar.
-#define ATOM_FLAG_SHIELD_CONTENTS           BITFLAG(8)  // Protects contents from some global effects (Solar storms)
-#define ATOM_FLAG_ADJACENT_EXCEPTION        BITFLAG(9)  // Skips adjacent checks for atoms that should always be reachable in window tiles
-#define ATOM_FLAG_NO_DISSOLVE               BITFLAG(10) // Bypasses solvent reactions in the container.
-#define ATOM_FLAG_NO_PHASE_CHANGE           BITFLAG(11) // Bypasses heating and cooling product reactions in the container.
-#define ATOM_FLAG_BLOCK_DIAGONAL_FACING     BITFLAG(12) // Atom cannot face non-cardinal directions.
+#define ATOM_FLAG_CAN_BE_PAINTED            BITFLAG(6)  // Can be painted using a paint sprayer or similar.
+#define ATOM_FLAG_SHIELD_CONTENTS           BITFLAG(7)  // Protects contents from some global effects (Solar storms)
+#define ATOM_FLAG_ADJACENT_EXCEPTION        BITFLAG(8)  // Skips adjacent checks for atoms that should always be reachable in window tiles
+#define ATOM_FLAG_NO_DISSOLVE               BITFLAG(9)  // Bypasses solvent reactions in the container.
+#define ATOM_FLAG_NO_PHASE_CHANGE           BITFLAG(10) // Bypasses heating and cooling product reactions in the container.
+#define ATOM_FLAG_BLOCK_DIAGONAL_FACING     BITFLAG(11) // Atom cannot face non-cardinal directions.
 
 #define ATOM_FLAG_NO_CHEM_CHANGE            (ATOM_FLAG_NO_REACT | ATOM_FLAG_NO_DISSOLVE | ATOM_FLAG_NO_PHASE_CHANGE)
 

code/__defines/fluids.dm

@@ -4,33 +4,48 @@
 #define FLUID_SHALLOW 200            // Depth shallow icon is used
 #define FLUID_OVER_MOB_HEAD 300      // Depth icon layers over mobs.
 #define FLUID_DEEP 800               // Depth deep icon is used
+#define FLUID_VERY_DEEP FLUID_DEEP*2 // Solid fill icon is used
 #define FLUID_MAX_DEPTH FLUID_DEEP*4 // Arbitrary max value for flooding.
 #define FLUID_PUSH_THRESHOLD 20      // Amount of flow needed to push items.
+/turf
+	var/_fluid_source_is_active = FALSE
+	var/_fluid_turf_is_active = FALSE
 
-// Expects /turf for T.
-#define ADD_ACTIVE_FLUID_SOURCE(T)    if(!T.changing_turf) { SSfluids.water_sources[T] = TRUE; }
-#define REMOVE_ACTIVE_FLUID_SOURCE(T) SSfluids.water_sources -= T
+// Expects /turf for TURF.
+#define ADD_ACTIVE_FLUID_SOURCE(TURF)                                         \
+if(!QDELETED(TURF) && !TURF.changing_turf && !TURF._fluid_source_is_active) { \
+	TURF._fluid_source_is_active = TRUE;                                      \
+	SSfluids.water_sources += TURF;                                           \
+}
 
-// Expects /obj/effect/fluid for F.
-#define ADD_ACTIVE_FLUID(F)           if(!QDELETED(F)) { SSfluids.active_fluids[F] = TRUE; }
-#define REMOVE_ACTIVE_FLUID(F)        SSfluids.active_fluids -= F
+#define REMOVE_ACTIVE_FLUID_SOURCE(TURF)                                      \
+if(!QDELETED(TURF) && TURF._fluid_source_is_active) {                         \
+	TURF._fluid_source_is_active = FALSE;                                     \
+	SSfluids.water_sources -= TURF;                                           \
+}
 
-// Expects turf for T,
-#define UPDATE_FLUID_BLOCKED_DIRS(T) \
-	if(isnull(T.fluid_blocked_dirs)) {\
-		T.fluid_blocked_dirs = 0; \
-		for(var/obj/structure/window/W in T) { \
-			if(W.density) T.fluid_blocked_dirs |= W.dir; \
-		} \
-		for(var/obj/machinery/door/window/D in T) {\
-			if(D.density) T.fluid_blocked_dirs |= D.dir; \
-		} \
-	}
+#define ADD_ACTIVE_FLUID(TURF)                                                \
+if(!QDELETED(TURF) && !TURF._fluid_turf_is_active) {                          \
+	TURF._fluid_turf_is_active = TRUE;                                        \
+	SSfluids.active_fluids += TURF;                                           \
+}
 
-// We share overlays for all fluid turfs to sync icon animation.
-#define APPLY_FLUID_OVERLAY(img_state) \
-	if(!SSfluids.fluid_images[img_state]) SSfluids.fluid_images[img_state] = image('icons/effects/liquids.dmi',img_state); \
-	add_overlay(SSfluids.fluid_images[img_state]);
+#define REMOVE_ACTIVE_FLUID(TURF)                                             \
+if(!QDELETED(TURF) && TURF._fluid_turf_is_active) {                           \
+	TURF._fluid_turf_is_active = FALSE;                                       \
+	SSfluids.active_fluids -= TURF;                                           \
+}
+
+#define UPDATE_FLUID_BLOCKED_DIRS(TURF)                                       \
+if(isnull(TURF.fluid_blocked_dirs)) {                                         \
+	TURF.fluid_blocked_dirs = 0;                                              \
+	for(var/obj/structure/window/W in TURF) {                                 \
+		if(W.density) TURF.fluid_blocked_dirs |= W.dir;                       \
+	}                                                                         \
+	for(var/obj/machinery/door/window/D in TURF) {                            \
+		if(D.density) TURF.fluid_blocked_dirs |= D.dir;                       \
+	}                                                                         \
+}
 
 #define FLUID_MAX_ALPHA 200
 #define FLUID_MIN_ALPHA 96