Merge remote-tracking branch 'upstream/master' into synth_defibs

citadel.dme

@@ -2073,6 +2073,10 @@
 #include "code\game\turfs\turf_flick_animations.dm"
 #include "code\game\turfs\turf_movement.dm"
 #include "code\game\turfs\unsimulated.dm"
+#include "code\game\turfs\simulated\fake_sky.dm"
+#include "code\game\turfs\simulated\lava.dm"
+#include "code\game\turfs\simulated\shuttle.dm"
+#include "code\game\turfs\simulated\shuttle_ceiling.dm"
 #include "code\game\turfs\simulated\sky.dm"
 #include "code\game\turfs\simulated\floor\floor.dm"
 #include "code\game\turfs\simulated\floor\floor_acts.dm"
@@ -2081,26 +2085,22 @@
 #include "code\game\turfs\simulated\floor\floor_icon.dm"
 #include "code\game\turfs\simulated\floor\floor_types.dm"
 #include "code\game\turfs\simulated\floor\floor_types_eris.dm"
-#include "code\game\turfs\simulated\floor\floor_types_vr.dm"
 #include "code\game\turfs\simulated\floor_types\atmoscaves_vr.dm"
 #include "code\game\turfs\simulated\floor_types\concrete.dm"
 #include "code\game\turfs\simulated\floor_types\dirt.dm"
 #include "code\game\turfs\simulated\floor_types\dungeon.dm"
 #include "code\game\turfs\simulated\floor_types\glass.dm"
 #include "code\game\turfs\simulated\floor_types\grass.dm"
-#include "code\game\turfs\simulated\floor_types\lava.dm"
 #include "code\game\turfs\simulated\floor_types\outdoors.dm"
 #include "code\game\turfs\simulated\floor_types\outdoors_attackby.dm"
+#include "code\game\turfs\simulated\floor_types\plating.dm"
 #include "code\game\turfs\simulated\floor_types\river.dm"
-#include "code\game\turfs\simulated\floor_types\sky.dm"
 #include "code\game\turfs\simulated\floor_types\snow.dm"
 #include "code\game\turfs\simulated\floor_types\water.dm"
 #include "code\game\turfs\simulated\flooring\_flooring.dm"
 #include "code\game\turfs\simulated\flooring\flooring_decals.dm"
 #include "code\game\turfs\simulated\flooring\flooring_premade.dm"
 #include "code\game\turfs\simulated\flooring\flooring_traps.dm"
-#include "code\game\turfs\simulated\flooring\shuttle_vr.dm"
-#include "code\game\turfs\simulated\misc\fancy_shuttles.dm"
 #include "code\game\turfs\simulated\wall\materials.dm"
 #include "code\game\turfs\simulated\wall\rot.dm"
 #include "code\game\turfs\simulated\wall\wall-construction.dm"
@@ -2110,18 +2110,15 @@
 #include "code\game\turfs\simulated\wall\wall_attacks.dm"
 #include "code\game\turfs\simulated\wall\wall_icon.dm"
 #include "code\game\turfs\simulated\wall_types\dungeon.dm"
+#include "code\game\turfs\simulated\wall_types\fancy_shuttle.dm"
 #include "code\game\turfs\simulated\wall_types\material.dm"
 #include "code\game\turfs\simulated\wall_types\prepainted.dm"
 #include "code\game\turfs\simulated\wall_types\shuttle.dm"
-#include "code\game\turfs\space\cracked_asteroid.dm"
 #include "code\game\turfs\space\space.dm"
 #include "code\game\turfs\space\transit.dm"
 #include "code\game\turfs\unsimulated\beach.dm"
 #include "code\game\turfs\unsimulated\floor.dm"
-#include "code\game\turfs\unsimulated\mask.dm"
 #include "code\game\turfs\unsimulated\planetary.dm"
-#include "code\game\turfs\unsimulated\planetary_vr.dm"
-#include "code\game\turfs\unsimulated\shuttle.dm"
 #include "code\game\turfs\unsimulated\walls.dm"
 #include "code\game\verbs\advanced_who.dm"
 #include "code\game\verbs\character_directory.dm"
@@ -3380,7 +3377,6 @@
 #include "code\modules\maps\overmap\planets\classh.dm"
 #include "code\modules\maps\overmap\planets\classm.dm"
 #include "code\modules\maps\overmap\planets\classp.dm"
-#include "code\modules\maps\overmap\planets\miaphus.dm"
 #include "code\modules\maps\overmap\planets\virgo2.dm"
 #include "code\modules\maps\overmap\planets\virgo4.dm"
 #include "code\modules\maps\overmap\space\alienship.dm"
@@ -3439,7 +3435,6 @@
 #include "code\modules\maps\templates\submaps\wilderness\wilderness_areas.dm"
 #include "code\modules\maps\turf_makers\planetary_turfs.dm"
 #include "code\modules\maps\turf_makers\planet_station_turfs\_lythios43c.dm"
-#include "code\modules\maps\turf_makers\planet_station_turfs\_triumph.dm"
 #include "code\modules\maps\turf_makers\planet_station_turfs\_virgo3b.dm"
 #include "code\modules\maps\weather\classd.dm"
 #include "code\modules\maps\weather\classg.dm"
@@ -4819,7 +4814,6 @@
 #include "code\modules\shuttles\shuttle\shuttle_port.dm"
 #include "code\modules\shuttles\shuttle\shuttle_template.dm"
 #include "code\modules\species\abilites.dm"
-#include "code\modules\species\character_species.dm"
 #include "code\modules\species\physiology.dm"
 #include "code\modules\species\species.dm"
 #include "code\modules\species\species_attack.dm"
@@ -4838,11 +4832,9 @@
 #include "code\modules\species\protean\protean.dm"
 #include "code\modules\species\protean\protean_blob.dm"
 #include "code\modules\species\protean\protean_powers.dm"
-#include "code\modules\species\shadekin\crew_shadekin_abilities.dm"
-#include "code\modules\species\shadekin\crew_shadekin_hud.dm"
+#include "code\modules\species\shadekin\blackeyed.dm"
 #include "code\modules\species\shadekin\shadekin.dm"
 #include "code\modules\species\shadekin\shadekin_abilities.dm"
-#include "code\modules\species\shadekin\shadekin_blackeyed.dm"
 #include "code\modules\species\shadekin\shadekin_hud.dm"
 #include "code\modules\species\shadekin\shadekin_traits.dm"
 #include "code\modules\species\station\adherent.dm"
@@ -5388,29 +5380,22 @@
 #include "maps\rift\shuttles.dm"
 #include "maps\rift\telecomms.dm"
 #include "maps\rift\titlescreens.dm"
-#include "maps\sectors\debrisfield_140\debrisfield_140.dm"
 #include "maps\sectors\debrisfield_192\debrisfield_192.dm"
-#include "maps\sectors\desert_140\desert_140.dm"
 #include "maps\sectors\desert_192\desert_192.dm"
-#include "maps\sectors\frozen_140\frozen_140.dm"
 #include "maps\sectors\frozen_192\frozen_192.dm"
-#include "maps\sectors\gaia_140\gaia_140.dm"
 #include "maps\sectors\gaia_192\gaia_192.dm"
-#include "maps\sectors\lavaland_140\lavaland_140.dm"
-#include "maps\sectors\lavaland_192\lavaland_192.dm"
-#include "maps\sectors\miaphus_192\miaphus_192.dm"
-#include "maps\sectors\mining_140\mining_140.dm"
+#include "maps\sectors\miaphus\miaphus-areas.dm"
+#include "maps\sectors\miaphus\miaphus-misc.dm"
+#include "maps\sectors\miaphus\miaphus.dm"
 #include "maps\sectors\mining_192\mining_192.dm"
-#include "maps\sectors\piratebase_140\piratebase_140.dm"
 #include "maps\sectors\piratebase_192\piratebase_192.dm"
-#include "maps\sectors\roguemining_140\roguemining_140.dm"
 #include "maps\sectors\roguemining_192\roguemining_192.dm"
+#include "maps\sectors\surt\surt.dm"
+#include "maps\sectors\surt\surt_areas.dm"
 #include "maps\sectors\tradeport\shuttles.dm"
-#include "maps\sectors\tradeport_140\tradeport_140.dm"
 #include "maps\sectors\tradeport_192\tradeport_192.dm"
 #include "maps\sectors\virgo2_140\virgo2_140.dm"
 #include "maps\sectors\virgo4_140\virgo4_140.dm"
-#include "maps\sectors\wasteland_140\wasteland_140.dm"
 #include "maps\sectors\wasteland_192\wasteland_192.dm"
 #include "maps\shuttles\factions\corporations\nanotrasen\drone_prototype.dm"
 #include "maps\shuttles\factions\corporations\nanotrasen\sci_vector.dm"

code/__DEFINES/_planes+layers.dm

@@ -390,11 +390,13 @@
 #define HUD_LAYER_INVENTORY 3
 /// storage objects sit here
 #define HUD_LAYER_STORAGE 4
+/// storage object item borders sit here
+#define HUD_LAYER_STORAGE_ITEM_BOUNDING 5
 
 // todo: deprecate
-#define HUD_LAYER_ITEM  3 /// Things sitting on HUD items (largely irrelevant because INVENTORY_PLANE).
+#define HUD_LAYER_ITEM  7 /// Things sitting on HUD items (largely irrelevant because INVENTORY_PLANE).
 // todo: deprecate
-#define HUD_LAYER_ABOVE 4 /// Things that reside above items (highlights).
+#define HUD_LAYER_ABOVE 8 /// Things that reside above items (highlights).
 
 /**
  *! -- Player HUD Plane - Items

code/__DEFINES/atmospherics/gas_strings.dm

@@ -1,6 +1,6 @@
 // Gas strings for turf defaults.
 /// Default standard gas string
-#define GAS_STRING_TURF_DEFAULT				"o2=22;n2=82;TEMP=293.15"
+#define GAS_STRING_TURF_DEFAULT				ATMOSPHERE_USE_AREA
 /// Total vacuum
 #define GAS_STRING_VACUUM					"TEMP=2.7"
 /// Default but no oxygen

code/__DEFINES/controllers/_subsystem-init.dm

@@ -88,5 +88,4 @@
 
 #define INIT_ORDER_OVERLAY               200
 #define INIT_ORDER_TITLESCREEN           150
-#define INIT_ORDER_NIGHTSHIFT            75
 #define INIT_ORDER_CHAT                 -100  //! Should be last to ensure chat remains smooth during init.

code/__DEFINES/controllers/_subsystem-priority.dm

@@ -24,7 +24,6 @@
 #define FIRE_PRIORITY_PING         5
 #define FIRE_PRIORITY_SHUTTLES     5
 #define FIRE_PRIORITY_PLANTS       5
-#define FIRE_PRIORITY_NIGHTSHIFT   6
 #define FIRE_PRIORITY_VOTE         9
 #define FIRE_PRIORITY_VIS          10
 #define FIRE_PRIORITY_SERVER_MAINT 10

code/__DEFINES/datums/design.dm

@@ -39,3 +39,67 @@ DEFINE_BITFIELD(design_flags, list(
 	BITFIELD(DESIGN_NO_SCALE),
 	BITFIELD(DESIGN_IGNORE_RESOURCE_SANITY),
 ))
+
+//design categories
+//misc is the default
+#define DESIGN_CATEGORY_MISC "Misc"
+#define DESIGN_CATEGORY_MUNITIONS "Munitions"
+#define DESIGN_CATEGORY_STORAGE "Storage"
+#define DESIGN_CATEGORY_AI "AI"
+#define DESIGN_CATEGORY_ATMOS "Atmospherics"
+#define DESIGN_CATEGORY_MECHA "Mecha"
+#define DESIGN_CATEGORY_RECREATION "Recreation"
+#define DESIGN_CATEGORY_TELEPORTATION "Teleportation"
+#define DESIGN_CATEGORY_POWER "Power"
+#define DESIGN_CATEGORY_TELECOMMUNICATIONS "Telecommunications"
+#define DESIGN_CATEGORY_MEDICAL "Medical"
+#define DESIGN_CATEGORY_CARGO_MINING "Cargo / Mining"
+#define DESIGN_CATEGORY_SECURITY "Security"
+#define DESIGN_CATEGORY_SCIENCE "Science"
+#define DESIGN_CATEGORY_COMPUTER "Computer Parts"
+#define DESIGN_CATEGORY_ENGINEERING "Engineering"
+#define DESIGN_CATEGORY_INTEGRATED_CIRCUITRY "Integrated Circuitry"
+#define DESIGN_CATEGORY_SYNTH "Synth"
+#define DESIGN_CATEGORY_PROSTHETIC "Prosthetics"
+#define DESIGN_CATEGORY_DATA "Data"
+#define DESIGN_CATEGORY_ATTACHMENTS "Attachments"
+#define DESIGN_CATEGORY_TOOLS "Tools"
+#define DESIGN_CATEGORY_HARDSUIT "Hardsuit"
+
+//subcategories
+//misc is the default
+#define DESIGN_SUBCATEGORY_MISC "Misc"
+
+//any category can go have station as a subcategory
+#define DESIGN_SUBCATEGORY_STATION "Station Equipment"
+
+//munition subcategories
+#define DESIGN_SUBCATEGORY_BALLISTIC "Ballistic"
+#define DESIGN_SUBCATEGORY_ENERGY "Energy"
+#define DESIGN_SUBCATEGORY_MELEE "Melee"
+#define DESIGN_SUBCATEGORY_AMMO "Ammo"
+#define DESIGN_SUBCATEGORY_PINS "Weapon Pins"
+
+//if it scans? it goes here.
+#define DESIGN_SUBCATEGORY_SCANNING "Scanning Equipment"
+
+//AI subcategories
+#define DESIGN_SUBCATEGORY_LAWS "Laws"
+#define DESIGN_SUBCATEGORY_CORE "Cores"
+
+//Synth subcategory
+#define DESIGN_SUBCATEGORY_SYNTHETIC_MINDS "Synthetic Minds"
+
+//Power subcategories
+#define DESIGN_SUBCATEGORY_CHARGING "Charger"
+#define DESIGN_SUBCATEGORY_GENERATING "Generator"
+
+
+#define DESIGN_SUBCATEGORY_NIF "NIF"
+
+//if it goes in a machine / thing? it goes in here.
+#define DESIGN_SUBCATEGORY_PARTS "Parts"
+
+//science subcategories
+#define DESIGN_SUBCATEGORY_XENOBIOLOGY "Xenobiology"
+#define DESIGN_SUBCATEGORY_XENOARCHEOLOGY "Xenoarcheology"

code/__DEFINES/icon_smoothing.dm

@@ -82,7 +82,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
 
 #define SMOOTH_GROUP_TURF_OPEN                    S_TURF(0)  ///? /turf/simulated/floor
 #define SMOOTH_GROUP_TURF_CHASM                   S_TURF(1)  // /turf/open/chasm, /turf/open/floor/fakepit
-#define SMOOTH_GROUP_FLOOR_LAVA                   S_TURF(2)  ///? /turf/simulated/floor/outdoors/lava
+#define SMOOTH_GROUP_FLOOR_LAVA                   S_TURF(2)  ///? /turf/simulated/lava
 #define SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS      S_TURF(3)  // /turf/open/floor/glass
 
 #define SMOOTH_GROUP_OPEN_FLOOR                   S_TURF(4)  ///? /turf/simulated/floor
@@ -110,7 +110,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
 #define SMOOTH_GROUP_CLOSED_TURFS                 S_TURF(23) ///? /turf/simulated/wall
 #define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS      S_TURF(24) // /turf/closed/wall/mineral/titanium/survival
 #define SMOOTH_GROUP_HOTEL_WALLS                  S_TURF(25) // /turf/closed/indestructible/hotelwall
-#define SMOOTH_GROUP_MINERAL_WALLS                S_TURF(26) ///? /turf/simulated/mineral, /turf/unsimulated/mineral
+#define SMOOTH_GROUP_MINERAL_WALLS                S_TURF(26) ///? /turf/simulated/mineral, /turf/unsimulated/wall/mineral
 #define SMOOTH_GROUP_BOSS_WALLS                   S_TURF(27) // /turf/closed/indestructible/riveted/boss
 
 #define MAX_S_TURF 27 //!Always match this value with the one above it.

code/__DEFINES/mining/legacy.dm

@@ -1,19 +1,31 @@
 /**
- * *sigh*
+ * todo: entirely rework this
  */
 /proc/standard_mineral_roll(rare)
 	var/static/list/probabilities = list(
-		"marble" = 2,
-		"uranium" = 4,
-		"platinum" = 3,
-		"hematite" = 5,
-		"carbon" = 5,
-		"diamond" = 2,
-		"gold" = 8,
-		"silver" = 8,
-		"phoron" = 8,
-		"lead" = 3,
-		"verdantium" = 1,
-		"copper" = 4,
+		/datum/ore/uranium::name = 4,
+		/datum/ore/hematite::name = 5,
+		/datum/ore/coal::name = 5,
+		/datum/ore/phoron::name = 8,
+		/datum/ore/silver::name = 8,
+		/datum/ore/gold::name = 8,
+		/datum/ore/diamond::name = 2,
+		/datum/ore/platinum::name = 3,
+		/datum/ore/verdantium::name = 1,
+		/datum/ore/lead::name = 4,
+		/datum/ore/copper::name = 6,
 	)
-	return pickweight(probabilities)
+	var/static/list/probabilities_rare = list(
+		/datum/ore/uranium::name = 4 + 2,
+		/datum/ore/hematite::name = 5,
+		/datum/ore/coal::name = 5,
+		/datum/ore/phoron::name = 8 + 1,
+		/datum/ore/silver::name = 8 + 1,
+		/datum/ore/gold::name = 8 + 1,
+		/datum/ore/diamond::name = 2 + 3,
+		/datum/ore/platinum::name = 3 + 3,
+		/datum/ore/verdantium::name = 1 + 3,
+		/datum/ore/lead::name = 4,
+		/datum/ore/copper::name = 6,
+	)
+	return pickweight(rare ? probabilities_rare : probabilities)

code/__DEFINES/turfs/type_generation.dm

@@ -1,8 +1,19 @@
 //* This file is explicitly licensed under the MIT license. *//
 //* Copyright (c) 2023 Citadel Station developers.          *//
 
-/// create the standard 4 types of turfs for a given turf type.
+/**
+ * Create the 4 standard subtypes for a given turf type.
+ *
+ * * Indoors uses indoors gas mix of level, and is indoors.
+ * * Outdoors uses outdoors gas mix of level, and is outdoors.
+ * * Inherit-Area inherits the gas mix and outdoors status of the area.
+ * * Overhang uses outdoors gas mix of level, and is indoors.
+ *
+ * This macro allows for annotating the type being processed by commenting above.
+ * This macro acts like the type it's generating when writing prototype overrides below.
+ */
 #define CREATE_STANDARD_TURFS(type) \
+##type {} \
 ##type/indoors { \
 	outdoors = FALSE; \
 	initial_gas_mix = ATMOSPHERE_USE_INDOORS; \
@@ -11,11 +22,12 @@
 	outdoors = TRUE; \
 	initial_gas_mix = ATMOSPHERE_USE_OUTDOORS; \
 } \
-##type/default { \
+##type/inherit_area { \
 	outdoors = null; \
 	initial_gas_mix = ATMOSPHERE_USE_AREA; \
 } \
 ##type/overhang { \
 	outdoors = FALSE; \
 	initial_gas_mix = ATMOSPHERE_USE_OUTDOORS; \
-}
+} \
+##type