Merge branch 'DaedalusDock:master' into hair-edits

Author: Doctor-Derp

.github/workflows/run_integration_tests.yml

@@ -16,14 +16,6 @@ on:
 jobs:
   run_integration_tests:
     runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mysql:latest
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v4
       - name: Restore BYOND cache

_maps/map_files/Theseus/Theseus.dmm

@@ -15248,6 +15248,9 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "12"
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
 "fCV" = (
@@ -18108,9 +18111,6 @@
 /turf/open/floor/plating,
 /area/station/medical/virology)
 "gHq" = (
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -18120,6 +18120,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "9"
 	},
+/obj/machinery/computer/pager/aether{
+	dir = 8
+	},
 /turf/open/floor/carpet/blue,
 /area/station/command/heads_quarters/cmo)
 "gHx" = (
@@ -20240,6 +20243,15 @@
 /obj/structure/overfloor_catwalk/iron_dark,
 /turf/open/floor/plating,
 /area/station/engineering/main)
+"hHn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/overfloor_catwalk/iron_dark,
+/obj/structure/cable/yellow{
+	icon_state = "10"
+	},
+/turf/open/floor/plating,
+/area/station/service/janitor)
 "hHy" = (
 /obj/machinery/disposal/bin,
 /obj/machinery/firealarm/directional/west,
@@ -23258,6 +23270,17 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/station/command/gateway)
+"iLU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "3"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "5"
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
 "iMi" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/effect/mapping_helpers/paint_wall/medical,
@@ -32824,6 +32847,9 @@
 /obj/machinery/camera/directional/west{
 	c_tag = "Custodial Closet"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1"
+	},
 /turf/open/floor/iron,
 /area/station/service/janitor)
 "mqo" = (
@@ -42601,6 +42627,9 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable/yellow{
+	icon_state = "12"
+	},
 /turf/open/floor/iron,
 /area/station/service/janitor)
 "pRf" = (
@@ -95664,7 +95693,7 @@ bZK
 gNa
 bZK
 bZK
-bZK
+iLU
 xLD
 bZK
 bZK
@@ -96435,7 +96464,7 @@ cKc
 aLs
 acg
 nRZ
-qGh
+hHn
 mqi
 thq
 eBp

code/__DEFINES/_helpers.dm

@@ -24,3 +24,6 @@
 // Custom types that we define don't get a unique id, but this is useful for identifying
 // types that don't normally have a way to run istype() on them.
 #define TYPEID(thing) copytext(REF(thing), 4, 6)
+
+/// Abstraction over using mob.client to just check if there's a connected player.
+#define HAS_CONNECTED_PLAYER(mob) (mob.client)

code/__DEFINES/aether_runes.dm

@@ -0,0 +1,44 @@
+// Generic BB keys
+#define RUNE_BB_INVOKER "user"
+#define RUNE_BB_TOME "tome"
+#define RUNE_BB_CANCEL_REASON "cancel_reason"
+#define RUNE_BB_CANCEL_SOURCE "cancel_source"
+#define RUNE_BB_TARGET_MOB "target_mob"
+/// The reagent container containing the blood required.
+#define RUNE_BB_BLOOD_CONTAINER "revival_blood_container"
+
+// Exchange rune
+/// The list of parts to exchange for the exchange rune.
+#define RUNE_BB_EXCHANGE_PARTS "exchange_parts"
+
+// Revival rune
+/// The heart used.
+#define RUNE_BB_REVIVAL_HEART "revival_heart"
+/// The reagent container containing Woundseal used.
+#define RUNE_BB_REVIVAL_WOUNDSEAL_CONTAINER "revival_woundseal_container"
+
+// Heal rune
+/// List of reagents containers containing tinctures.
+#define RUNE_BB_HEAL_REAGENT_CONTAINERS "heal_reagent_containers"
+
+/// Graceful fails should have NO SIDE EFFECTS.
+#define RUNE_FAIL_GRACEFUL "graceful_fail"
+
+// ~& Global failure states, handle these always! &~//
+#define RUNE_FAIL_INVOKER_INCAP "invoker_incap"
+/// Helper removed their hand from the rune.
+#define RUNE_FAIL_HELPER_REMOVED_HAND "helper_incap"
+/// Target mob moved off the center.
+#define RUNE_FAIL_TARGET_MOB_MOVED "target_mob_moved"
+/// Target stood up.
+#define RUNE_FAIL_TARGET_STOOD_UP "target_stood_up"
+#define RUNE_FAIL_TOME_GONE "tome_gone"
+/// An item has moved out of the rune.
+#define RUNE_FAIL_TARGET_ITEM_OUT_OF_RUNE "item_out_of_rune"
+
+/// Special failure condition where the revival target was revived mid ritual.
+#define RUNE_FAIL_REVIVAL_TARGET_ALIVE "revival_target_alive"
+
+#define RUNE_INVOKING_PENDING_CANCEL -1
+#define RUNE_INVOKING_IDLE 0
+#define RUNE_INVOKING_ACTIVE 1

code/__DEFINES/dream.dm

@@ -1,6 +1,10 @@
-/// Dream is generic, and rollable by anyone.
-#define DREAM_GENERIC (1<<0)
 /// Dream can only be dreampt once per round per mind.
-#define DREAM_ONCE_PER_ROUND (1<<1)
+#define DREAM_ONCE_PER_ROUND (1<<0)
 /// Dream is considered complete even if cut short.
-#define DREAM_CUT_SHORT_IS_COMPLETE (1<<2)
+#define DREAM_CUT_SHORT_IS_COMPLETE (1<<1)
+
+/// Rollable by anyone
+#define DREAM_CLASS_GENERIC "generic_dream"
+#define DREAM_CLASS_DETECTIVE "detective_dream"
+#define DREAM_CLASS_AETHERITE "aether_dream"
+#define DREAM_CLASS_VAMPIRE "vampire_dream"

code/__DEFINES/economy.dm

@@ -21,7 +21,7 @@
 #define ACCOUNT_ENG "ENG"
 #define ACCOUNT_ENG_NAME "Daedalus Industries Funds"
 #define ACCOUNT_MED "MED"
-#define ACCOUNT_MED_NAME "Aether Pharmaceuticals Funds"
+#define ACCOUNT_MED_NAME "Aether Association Funds"
 #define ACCOUNT_SRV "SRV"
 #define ACCOUNT_CAR "CAR"
 #define ACCOUNT_CAR_NAME "Hermes Galactic Freight Funds"

code/__DEFINES/inventory.dm

@@ -114,6 +114,10 @@
 //defines for the index of hands
 #define LEFT_HANDS 1
 #define RIGHT_HANDS 2
+/// Checks if the value is "left" - same as ISEVEN, but used primarily for hand or foot index contexts
+#define IS_RIGHT_INDEX(value) (value % 2 == 0)
+/// Checks if the value is "right" - same as ISODD, but used primarily for hand or foot index contexts
+#define IS_LEFT_INDEX(value) (value % 2 != 0)
 
 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 /// For when there's simply no need for a female version of this uniform.

code/__DEFINES/jobs.dm

@@ -52,8 +52,8 @@
 #define JOB_STATION_ENGINEER "Station Engineer"
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
 //Medical
-#define JOB_MEDICAL_DIRECTOR "Medical Director"
-#define JOB_MEDICAL_DOCTOR "General Practitioner"
+#define JOB_AUGUR "Augur"
+#define JOB_ACOLYTE "Acolyte"
 #define JOB_PARAMEDIC "Paramedic"
 #define JOB_CHEMIST "Chemist"
 #define JOB_VIROLOGIST "Virologist"
@@ -109,7 +109,7 @@
 #define DEPARTMENT_BITFLAG_SCIENCE (1<<5)
 #define DEPARTMENT_SCIENCE "Science"
 #define DEPARTMENT_BITFLAG_MEDICAL (1<<6)
-#define DEPARTMENT_MEDICAL "Aether Pharmaceuticals"
+#define DEPARTMENT_MEDICAL "Aether Association"
 #define DEPARTMENT_BITFLAG_SILICON (1<<7)
 #define DEPARTMENT_SILICON "Silicon"
 #define DEPARTMENT_BITFLAG_ASSISTANT (1<<8)

code/__DEFINES/magic.dm

@@ -26,6 +26,8 @@
 #define SCHOOL_NECROMANCY "necromancy"
 /// Other forbidden magics, such as heretic spells
 #define SCHOOL_FORBIDDEN "forbidden"
+/// Blood magic
+#define SCHOOL_BLOOD "blood"
 
 // Invocation types - what does the wizard need to do to invoke (cast) the spell?
 /// Allows being able to cast the spell without saying or doing anything.

code/__DEFINES/maps.dm

@@ -67,9 +67,6 @@ require only minor tweaks.
 #define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
 
-// boolean - Is this Z-level used to house shuttles during transport
-#define ZTRAIT_TRANSIT "Transit"
-
 // boolean - weather types that occur on the level
 #define ZTRAIT_SNOWSTORM "Weather_Snowstorm"
 #define ZTRAIT_VOIDSTORM "Weather_Voidstorm"
@@ -117,9 +114,6 @@ require only minor tweaks.
 ///Z level traits for Secret Away Missions
 #define ZTRAITS_AWAY_SECRET list(ZTRAIT_AWAY = TRUE, ZTRAIT_SECRET = TRUE, ZTRAIT_NOPHASE = TRUE)
 
-///Z level traits for the transit z level
-#define ZTRAITS_TRANSIT list(ZTRAIT_RESERVED = TRUE, ZTRAIT_TRANSIT = TRUE)
-
 #define DL_NAME "name"
 #define DL_TRAITS "traits"
 #define DECLARE_LEVEL(NAME, TRAITS) list(DL_NAME = NAME, DL_TRAITS = TRAITS)

code/__DEFINES/packetnet.dm

@@ -38,6 +38,12 @@
 /// Network Class of a device, used as part of ping replies.
 #define PACKET_NETCLASS "netclass"
 
+// Pagers
+/// Packet arg for pager types
+#define PACKET_ARG_PAGER_CLASS "pager_class"
+/// Packet arg for the message sent
+#define PACKET_ARG_PAGER_MESSAGE "pager_message"
+
 // Special addresses
 #define NET_ADDRESS_PING "ping"
 

code/__DEFINES/pager_defines.dm

@@ -0,0 +1,3 @@
+#define PAGER_CLASS_AETHER "aetherpager"
+#define PAGER_CLASS_MARS "marspager"
+#define PAGER_CLASS_MANAGEMENT "managementpager"

code/__DEFINES/pain.dm

@@ -1,7 +1,3 @@
-/// Chance to drop your held item passed here
-#define PAIN_THRESHOLD_DROP_ITEM 50
-/// Chance to reduce paralysis duration passed here
-#define PAIN_THRESHOLD_REDUCE_PARALYSIS 10
 /// Stage at
 #define SHOCK_MIN_PAIN_TO_BEGIN 30
 
@@ -24,12 +20,23 @@
 
 /// The amount of pain where movement slowdown beings
 #define PAIN_AMT_BEGIN_SLOWDOWN (PAIN_AMT_PASSOUT * 0.075)
-#define PAIN_MAX_SLOWDOWN 5
+#define PAIN_MAX_SLOWDOWN 3
 
 #define PAIN_AMT_LOW (PAIN_AMT_PASSOUT * 0.05)
 #define PAIN_AMT_MEDIUM (PAIN_AMT_PASSOUT * 0.35)
 #define PAIN_AMT_AGONIZING (PAIN_AMT_PASSOUT * 0.85)
 
+#define PAIN_CLASS_NONE "none"
+#define PAIN_CLASS_NEGLIGIBLE "negligible"
+#define PAIN_CLASS_LOW "low"
+#define PAIN_CLASS_MEDIUM "medium"
+#define PAIN_CLASS_AGONIZING "agonizing"
+
+/// Chance to drop your held item passed here
+#define PAIN_THRESHOLD_DROP_ITEM 75
+/// Chance to reduce sleep duration passed here
+#define PAIN_THRESHOLD_REDUCE_SLEEP 10
+
 /// max_damage * this value is the amount of pain constantly applied when the limb bone is broken
 #define BROKEN_BONE_PAIN_FACTOR 0.1
 /// max_damage * this value is the amount of pain constantly applied when the limb is dislocated

code/__DEFINES/radio.dm

@@ -107,6 +107,7 @@
 #define RADIO_AIRLOCK "airlock"
 #define RADIO_MAGNETS "magnets"
 #define RADIO_PDAMESSAGE "pdamessage"
+#define RADIO_PAGER_MESSAGE "pager_message"
 
 #define DEFAULT_SIGNALER_CODE 30
 

code/__DEFINES/stamina.dm

@@ -70,4 +70,4 @@
 ///The amount of stamina required to sprint
 #define STAMINA_MIN2SPRINT_MODIFER 0.4 //Same as exhaustion threshold
 ///How much stamina is taken per tile while sprinting
-#define STAMINA_SPRINT_COST 4
+#define STAMINA_SPRINT_COST 8

code/__DEFINES/status_effects.dm

@@ -6,6 +6,8 @@
 #define STATUS_EFFECT_REPLACE 2
 /// if it only allows one, and new instances just instead refresh the timer
 #define STATUS_EFFECT_REFRESH 3
+/// if it only allows one, and new instances add to the timer
+#define STATUS_EFFECT_EXTEND 4
 
 ///Processing flags - used to define the speed at which the status will work
 ///This is fast - 0.2s between ticks (I believe!)
@@ -43,7 +45,11 @@
 
 #define STASIS_DEBUG_HEALTH "stasis_debug_health"
 
+/// Head fracture
 #define BROKEN_SKULL_EFFECT "broken_head"
+/// Missing or dead liver.
+#define DEAD_LIVER_EFFECT "dead_liver"
+
 #define VAMPIRE_EFFECT "vampire_effect"
 
 // Status effect application helpers.

code/__DEFINES/subsystems.dm

@@ -238,6 +238,7 @@
 #define FIRE_PRIORITY_GARBAGE 10
 #define FIRE_PRIORITY_AMBIENCE 5
 #define FIRE_PRIORITY_CODEX 5
+#define FIRE_PRIORITY_TITLE 5
 
 
 

code/__DEFINES/traits.dm

@@ -270,6 +270,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Stops all slipping and sliding from ocurring
 #define TRAIT_NO_SLIP_ALL "noslip_all"
 
+/// Invoking a Miracle rune
+#define TRAIT_INVOKING_MIRACLE "invokingmiracle"
+
 #define TRAIT_NODEATH "nodeath"
 #define TRAIT_NOHARDCRIT "nohardcrit"
 #define TRAIT_NOSOFTCRIT "nosoftcrit"
@@ -470,6 +473,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Maybe worth generalizing into a general "is sneaky" / "is stealth" trait in the future.
 #define TRAIT_ALIEN_SNEAK "sneaking_alien"
 
+/// Smoke temporarily cannot affect this mob.
+#define TRAIT_AFFECTED_BY_SMOKE_RECENTLY "affected_by_smoke_recently"
+
 // METABOLISMS
 // Various jobs on the station have historically had better reactions
 // to various drinks and foodstuffs. Security liking donuts is a classic
@@ -507,7 +513,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_LIGHTBULB_REMOVER "lightbulb_remover"
 #define TRAIT_KNOW_CYBORG_WIRES "know_cyborg_wires"
 #define TRAIT_KNOW_ENGI_WIRES "know_engi_wires"
-#define TRAIT_ENTRAILS_READER "entrails_reader"
 /// this skillchip trait lets you wash brains in washing machines to heal them
 #define TRAIT_BRAINWASHING "brainwashing"
 

code/__DEFINES/traits_job.dm

@@ -0,0 +1,2 @@
+/// A trait given to Aether members on job spawn.
+#define TRAIT_AETHERITE "aetherite"