Merge remote-tracking branch 'upstream/master'

Rhials · Mar 15, 2024 · 062d9dd · 062d9dd
2 parents 65d14dd + bd3a460
commit 062d9dd
Show file tree

Hide file tree

Showing 169 changed files with 3,074 additions and 1,579 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,6 +8,13 @@
 			"preLaunchTask": "Build All",
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamSeeker (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+		},
 		{
 			"type": "byond",
 			"request": "launch",
@@ -16,6 +23,14 @@
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
 			"dreamDaemon": true
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		},
 		{
 			"name": "Debug External Libraries",
 			"type": "cppvsdbg",
@@ -27,6 +42,18 @@
 				"-trusted"
 			],
 			"preLaunchTask": "Build All"
+		},
+		{
+			"name": "Debug External Libraries (low memory mode)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${command:dreammaker.returnDreamDaemonPath}",
+			"cwd": "${workspaceRoot}",
+			"args": [
+				"${command:dreammaker.getFilenameDmb}",
+				"-trusted"
+			],
+			"preLaunchTask": "Build All (low memory mode)"
 		}
 	]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -24,6 +24,30 @@
 			"dependsOn": "dm: reparse",
 			"label": "Build All"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"args": ["-DLOWMEMORYMODE"],
+			"windows": {
+				"command": ".\\tools\\build\\build.bat",
+				"args": ["-DLOWMEMORYMODE"]
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All (low memory mode)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "tgstation.dme",

diff --git a/_maps/gateway_test.json b/_maps/gateway_test.json
@@ -10,6 +10,7 @@
 		"/datum/unit_test/job_roundstart_spawnpoints",
 		"/datum/unit_test/required_map_items",
 		"/datum/unit_test/space_dragon_expiration",
+		"/datum/unit_test/spy_bounty",
 		"/datum/unit_test/traitor"
 	]
 }
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
@@ -5554,6 +5554,7 @@
 "ciT" = (
 /obj/structure/table/glass,
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/recharger,
 /turf/open/floor/iron/white,
 /area/station/science/auxlab/firing_range)
 "cjm" = (
@@ -50924,7 +50925,7 @@
 /turf/open/misc/sandy_dirt,
 /area/station/maintenance/starboard/aft)
 "rLN" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/lazarus_injector,
 /obj/effect/turf_decal/bot_white,
 /obj/effect/turf_decal/siding/thinplating_new{

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -36847,7 +36847,7 @@
 /turf/open/floor/iron/large,
 /area/station/security/processing)
 "jeZ" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/book{
 	desc = "An undeniably handy book.";

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -25361,7 +25361,7 @@
 /turf/open/floor/plating,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "hPf" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/clothing/head/costume/bearpelt,
 /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -41714,7 +41714,7 @@
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/aft)
 "oXK" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/storage/briefcase/secure/riches,
 /obj/item/storage/backpack/duffelbag/syndie/hitman,
 /obj/item/card/id/advanced/silver/reaper,

diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
@@ -77446,6 +77446,8 @@
 "tVp" = (
 /obj/machinery/light_switch/directional/north,
 /obj/machinery/status_display/ai/directional/east,
+/obj/structure/table/reinforced/titaniumglass,
+/obj/item/piggy_bank/vault,
 /turf/open/floor/circuit,
 /area/station/ai_monitored/command/nuke_storage)
 "tVq" = (
@@ -80646,6 +80648,10 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
 /obj/machinery/status_display/ai/directional/west,
+/obj/structure/table/reinforced/titaniumglass,
+/obj/item/maneki_neko{
+	pixel_y = 4
+	},
 /turf/open/floor/circuit,
 /area/station/ai_monitored/command/nuke_storage)
 "uNp" = (

diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
@@ -44635,7 +44635,7 @@
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
 "oQO" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/clothing/head/costume/bearpelt,
 /obj/item/gun/ballistic/revolver/russian,
 /obj/item/ammo_box/a357,

diff --git a/_maps/multiz_debug.json b/_maps/multiz_debug.json
@@ -5,7 +5,8 @@
 	"map_file": "multiz.dmm",
 	"ignored_unit_tests": [
 		"/datum/unit_test/job_roundstart_spawnpoints",
-		"/datum/unit_test/required_map_items"
+		"/datum/unit_test/required_map_items",
+		"/datum/unit_test/spy_bounty"
 	],
 	"traits": [
 		{

diff --git a/_maps/runtimestation.json b/_maps/runtimestation.json
@@ -6,7 +6,8 @@
 	"space_ruin_levels": 1,
 	"ignored_unit_tests": [
 		"/datum/unit_test/job_roundstart_spawnpoints",
-		"/datum/unit_test/required_map_items"
+		"/datum/unit_test/required_map_items",
+		"/datum/unit_test/spy_bounty"
 	],
 	"shuttles": {
 		"cargo": "cargo_delta"

diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
@@ -36,6 +36,9 @@
 ///How long pirates will wait for a response before attacking
 #define RESPONSE_MAX_TIME 2 MINUTES
 
+/// How long till a spessman should come back after being captured and sent to the holding facility (which some antags use)
+#define COME_BACK_FROM_CAPTURE_TIME 6 MINUTES
+
 //ERT Types
 #define ERT_BLUE "Blue"
 #define ERT_RED  "Red"

diff --git a/code/__DEFINES/basic_mobs.dm b/code/__DEFINES/basic_mobs.dm
@@ -12,6 +12,8 @@
 #define FLAMMABLE_MOB (1<<3)
 /// Mob never takes damage from unarmed attacks
 #define IMMUNE_TO_FISTS (1<<4)
+/// Mob is immune to getting wet
+#define IMMUNE_TO_GETTING_WET (1<<5)
 
 /// Temporary trait applied when an attack forecast animation has completed
 #define TRAIT_BASIC_ATTACK_FORECAST "trait_basic_attack_forecast"

diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/blackmarket.dm
@@ -7,4 +7,5 @@
 #define SHIPPING_METHOD_TELEPORT "Teleport"
 // Throws the item from somewhere at the station.
 #define SHIPPING_METHOD_LAUNCH "Launch"
-
+// Sends a supply pod to the buyer's location, showy.
+#define SHIPPING_METHOD_SUPPLYPOD "Supply Pod"
diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm
@@ -64,3 +64,10 @@
 #define SUPPLY_PACK_UNCOMMON_DISCOUNTABLE "uncommon_discount"
 ///Discount category for the silly, overpriced, joke content, sometimes useful or plain bad.
 #define SUPPLY_PACK_RARE_DISCOUNTABLE "rare_discount"
+
+///Standard export define for not selling the item.
+#define EXPORT_NOT_SOLD 0
+///Sell the item
+#define EXPORT_SOLD 1
+///Sell the item, but for the love of god, don't delete it, we're handling it in a fancier way.
+#define EXPORT_SOLD_DONT_DELETE 2
diff --git a/code/__DEFINES/dcs/signals/signals_blackmarket.dm b/code/__DEFINES/dcs/signals/signals_blackmarket.dm
@@ -0,0 +1,2 @@
+///From /datum/market_item/spawn_item(): (uplink, shipping_method, shipping_loc)
+#define COMSIG_MARKET_ITEM_SPAWNED "market_item_spawned"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
@@ -171,6 +171,9 @@
 ///From obj/item/toy/crayon/spraycan
 #define COMSIG_LIVING_MOB_PAINTED "living_mob_painted"
 
+///From obj/closet/supplypod/return_victim: (turf/destination)
+#define COMSIG_LIVING_RETURN_FROM_CAPTURE "living_return_from_capture"
+
 ///From mob/living/proc/wabbajack(): (randomize_type)
 #define COMSIG_LIVING_PRE_WABBAJACKED "living_mob_wabbajacked"
 	/// Return to stop the rest of the wabbajack from triggering.

diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -406,6 +406,10 @@
 ///sent to the projectile when spawning the item (shrapnel) that may be embedded: (new_item)
 #define COMSIG_PROJECTILE_ON_SPAWN_EMBEDDED "projectile_on_spawn_embedded"
 
+/// from /obj/projectile/energy/fisher/on_hit() or /obj/item/gun/energy/recharge/fisher when striking a target
+#define COMSIG_HIT_BY_SABOTEUR "hit_by_saboteur"
+	#define COMSIG_SABOTEUR_SUCCESS (1<<0)
+
 // /obj/vehicle/sealed/car/vim signals
 
 ///from /datum/action/vehicle/sealed/noise/chime/Trigger(): ()

diff --git a/code/__DEFINES/dcs/signals/signals_saboteur.dm b/code/__DEFINES/dcs/signals/signals_saboteur.dm
diff --git a/code/__DEFINES/instruments.dm b/code/__DEFINES/instruments.dm
@@ -6,6 +6,8 @@
 /// Max number of playing notes per instrument.
 #define CHANNELS_PER_INSTRUMENT 128
 
+/// Minimum length a note should ever go for
+#define INSTRUMENT_MIN_TOTAL_SUSTAIN 0.1
 /// Maximum length a note should ever go for
 #define INSTRUMENT_MAX_TOTAL_SUSTAIN (5 SECONDS)
 
@@ -16,8 +18,8 @@
 /// Minimum volume for when the sound is considered dead.
 #define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0
 
-#define SUSTAIN_LINEAR 1
-#define SUSTAIN_EXPONENTIAL 2
+#define SUSTAIN_LINEAR "Linear"
+#define SUSTAIN_EXPONENTIAL "Exponential"
 
 // /datum/instrument instrument_flags
 #define INSTRUMENT_LEGACY (1<<0) //Legacy instrument. Implies INSTRUMENT_DO_NOT_AUTOSAMPLE

diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm
@@ -115,6 +115,7 @@
 #define LOG_CATEGORY_TOOL "tool"
 #define LOG_CATEGORY_TRANSPORT "transport"
 #define LOG_CATEGORY_VIRUS "virus"
+#define LOG_CATEGORY_CAVE_GENERATION "cave-generation"
 
 // Admin categories
 #define LOG_CATEGORY_ADMIN "admin"

diff --git a/code/__DEFINES/mining.dm b/code/__DEFINES/mining.dm
@@ -39,6 +39,17 @@
 /// The chance of ore spawning in a wall that is VENT_PROX_FAR tiles to a vent.
 #define VENT_CHANCE_FAR 1
 
+/// The amount of ore that is mined from a wall that is VENT_PROX_VERY_HIGH tiles to a vent.
+#define ORE_WALL_VERY_HIGH 5
+/// The amount of ore that is mined from a wall that is VENT_PROX_HIGH tiles to a vent.
+#define ORE_WALL_HIGH 4
+/// The amount of ore that is mined from a wall that is VENT_PROX_MEDIUM tiles to a vent.
+#define ORE_WALL_MEDIUM 3
+/// The amount of ore that is mined from a wall that is VENT_PROX_LOW tiles to a vent.
+#define ORE_WALL_LOW 2
+/// The amount of ore that is mined from a wall that is VENT_PROX_FAR tiles to a vent.
+#define ORE_WALL_FAR 1
+
 /// The number of points a miner gets for discovering a vent, multiplied by BOULDER_SIZE when completing a wave defense minus the discovery bonus.
 #define MINER_POINT_MULTIPLIER 100
 /// The multiplier that gets applied for automatically generated mining points.

diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
@@ -189,6 +189,8 @@ DEFINE_BITFIELD(bot_cover_flags, list(
 #define JUDGE_IDCHECK (1<<1)
 #define JUDGE_WEAPONCHECK (1<<2)
 #define JUDGE_RECORDCHECK (1<<3)
+///lowered threat level
+#define JUDGE_CHILLOUT (1<<4)
 
 /// Above this level of assessed threat, Beepsky will attack you
 #define THREAT_ASSESS_DANGEROUS 4
@@ -206,13 +208,16 @@ DEFINE_BITFIELD(bot_cover_flags, list(
 #define SECBOT_CHECK_RECORDS (1<<3)
 ///Whether we will stun & cuff or endlessly stun
 #define SECBOT_HANDCUFF_TARGET (1<<4)
+///if it's currently affected by a saboteur bolt (lowered perp threat level)
+#define SECBOT_SABOTEUR_AFFECTED (1<<5)
 
 DEFINE_BITFIELD(security_mode_flags, list(
 	"SECBOT_DECLARE_ARRESTS" = SECBOT_DECLARE_ARRESTS,
 	"SECBOT_CHECK_IDS" = SECBOT_CHECK_IDS,
 	"SECBOT_CHECK_WEAPONS" = SECBOT_CHECK_WEAPONS,
 	"SECBOT_CHECK_RECORDS" = SECBOT_CHECK_RECORDS,
 	"SECBOT_HANDCUFF_TARGET" = SECBOT_HANDCUFF_TARGET,
+	"SECBOT_SABOTEUR_AFFECTED" = SECBOT_SABOTEUR_AFFECTED,
 ))
 
 //MedBOT defines

diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
@@ -509,6 +509,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 /// Is the mob standing on an elevated surface? This prevents them from dropping down if not elevated first.
 #define TRAIT_ON_ELEVATED_SURFACE "on_elevated_surface"
+/// Does the mob ignore elevation? (e.g. xeno larvas on hiding)
+#define TRAIT_IGNORE_ELEVATION "ignore_elevation"
 
 /// Prevents you from twohanding weapons.
 #define TRAIT_NO_TWOHANDING "no_twohanding"

diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
@@ -151,3 +151,26 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(
 	/mob/living/simple_animal/hostile/megafauna/colossus = 2,
 	/mob/living/simple_animal/hostile/megafauna/dragon = 4,
 ))
+
+/// List of how many minerals spawned based on proximity to an ore vent.
+GLOBAL_LIST_INIT(post_ore_random, list(
+	"[ORE_WALL_FAR]" = 0,
+	"[ORE_WALL_LOW]" = 0,
+	"[ORE_WALL_MEDIUM]" = 0,
+	"[ORE_WALL_HIGH]" = 0,
+	"[ORE_WALL_VERY_HIGH]" = 0,
+))
+/// List of how many minerals spawned randomly off of mining Z-levels, and at what quantity.
+GLOBAL_LIST_INIT(post_ore_manual, list(
+	"[ORE_WALL_FAR]" = 0,
+	"[ORE_WALL_LOW]" = 0,
+	"[ORE_WALL_MEDIUM]" = 0,
+	"[ORE_WALL_HIGH]" = 0,
+	"[ORE_WALL_VERY_HIGH]" = 0,
+))
+/// List of how many ore vents spawned, and of what size.
+GLOBAL_LIST_INIT(ore_vent_sizes, list(
+	LARGE_VENT_TYPE = 0,
+	MEDIUM_VENT_TYPE = 0,
+	SMALL_VENT_TYPE = 0,
+))
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -255,6 +255,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HULK" = TRAIT_HULK,
 		"TRAIT_HUSK" = TRAIT_HUSK,
 		"TRAIT_ID_APPRAISER" = TRAIT_ID_APPRAISER,
+		"TRAIT_IGNORE_ELEVATION" = TRAIT_IGNORE_ELEVATION,
 		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN,
 		"TRAIT_IGNORING_GRAVITY" = TRAIT_IGNORING_GRAVITY,

diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
@@ -96,6 +96,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_HIDE_EXTERNAL_ORGANS" = TRAIT_HIDE_EXTERNAL_ORGANS,
 		"TRAIT_HOLY" = TRAIT_HOLY,
 		"TRAIT_HUSK" = TRAIT_HUSK,
+		"TRAIT_IGNORE_ELEVATION" = TRAIT_IGNORE_ELEVATION,
 		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN,
 		"TRAIT_ILLITERATE" = TRAIT_ILLITERATE,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		///From /datum/market_item/spawn_item(): (uplink, shipping_method, shipping_loc)
		#define COMSIG_MARKET_ITEM_SPAWNED "market_item_spawned"