Upstream 2026-06-17

.github/workflows/discord_pr_announce.yml

@@ -1,7 +1,7 @@
 name: "Discord PR Notification"
 on:
   pull_request_target:
-    types: [opened, closed]
+    types: [opened, closed, reopened]
 
 jobs:
   notify:
@@ -19,15 +19,11 @@ jobs:
         uses: tgstation/discord-notify@main
         if: >
           steps.secrets_set.outputs.SECRETS_ENABLED &&
-          (github.event.pull_request.merged == true || github.event.action == 'opened') &&
+          (github.event.pull_request.merged == true || github.event.action == 'opened' || github.event.action == 'reopened') &&
           github.event.pull_request.author_association != 'FIRST_TIMER' &&
           github.event.pull_request.author_association != 'FIRST_TIME_CONTRIBUTOR'
         with:
           webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
-          title: ${{ github.event.pull_request.user.login }} - ${{ github.event.pull_request.title }}
-          message: GET_ACTION
           include_image: false
           show_author: false
-          avatar_url: https://avatars.githubusercontent.com/u/92191611?s=200&v=4
-          username: GitHub
-          title_url: "${{ github.event.pull_request.html_url }}"
+          avatar_url: https://avatars.githubusercontent.com/u/1363778?s=200&v=4

.github/workflows/stale.yml

@@ -76,5 +76,3 @@ jobs:
           include_image: false
           show_author: false
           avatar_url: https://avatars.githubusercontent.com/u/1363778?s=200&v=4
-          username: GitHub
-          title_url: "${{ matrix.pull_request.html_url }}"

_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm

@@ -21404,7 +21404,7 @@
 	codes_txt = "delivery;dir=4";
 	location = "Cargo Storage4"
 	},
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	name = "Old Yeller"
 	},
 /turf/open/floor/iron/recharge_floor,
@@ -33958,7 +33958,7 @@
 	codes_txt = "delivery;dir=4";
 	location = "Cargo Storage-2"
 	},
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	name = "Parcel Pete"
 	},
 /obj/item/radio/intercom/directional/west,

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -22768,7 +22768,7 @@
 	name = "warehouse shutters control"
 	},
 /obj/structure/window/reinforced/spawner/directional/north,
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	location = "QM #1"
@@ -48596,7 +48596,7 @@
 /turf/open/floor/iron,
 /area/station/maintenance/port/aft)
 "lUm" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	location = "QM #4"

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -63666,7 +63666,7 @@
 	},
 /obj/effect/turf_decal/bot,
 /obj/machinery/light/small/directional/east,
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/machinery/status_display/supply{
 	pixel_x = 32
 	},
@@ -81448,7 +81448,7 @@
 	location = "QM #1"
 	},
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "xaH" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -20096,7 +20096,7 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "gWz" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/structure/cable,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=1";
@@ -21887,7 +21887,7 @@
 /turf/open/floor/iron/dark,
 /area/station/ai/satellite/exterior)
 "hBo" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/structure/cable,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=2";
@@ -30638,7 +30638,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/oil/slippery,
 /obj/effect/decal/cleanable/blood/gibs/down,
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	name = "Leaping Rabbit"
 	},
 /obj/structure/disposalpipe/segment,

_maps/map_files/NebulaStation/NebulaStation.dmm

@@ -18050,7 +18050,7 @@
 /area/station/engineering/storage)
 "cII" = (
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	home_destination = "QM #2";
 	suffix = "#2"
 	},
@@ -75323,7 +75323,7 @@
 /area/station/engineering/supermatter/room)
 "lcm" = (
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	home_destination = "QM #2";
 	suffix = "#2"
 	},
@@ -90694,7 +90694,7 @@
 /area/station/hallway/primary/fore)
 "nvZ" = (
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/mulebot{
+/mob/living/basic/bot/mulebot{
 	home_destination = "QM #2";
 	suffix = "#2"
 	},

_maps/map_files/tramstation/tramstation.dmm

@@ -37258,7 +37258,7 @@
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "lQz" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/navbeacon{
 	location = "QM #2";
@@ -42313,7 +42313,7 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/virology)
 "nIC" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/navbeacon{
 	location = "QM #6";
@@ -48536,7 +48536,7 @@
 /turf/open/floor/iron/dark,
 /area/station/ai/satellite/interior)
 "pXq" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/navbeacon{
 	location = "QM #3";
@@ -53141,7 +53141,7 @@
 /turf/closed/wall,
 /area/station/engineering/atmospherics_engine)
 "rCs" = (
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/navbeacon{
 	location = "QM #1";

_maps/map_files/wawastation/wawastation.dmm

@@ -3279,7 +3279,7 @@
 	codes_txt = "delivery;dir=8";
 	location = "QM #2"
 	},
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse)
 "beO" = (
@@ -16366,7 +16366,7 @@
 	codes_txt = "delivery;dir=8";
 	location = "QM #1"
 	},
-/mob/living/simple_animal/bot/mulebot,
+/mob/living/basic/bot/mulebot,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse)

code/__DEFINES/ai/ai.dm

@@ -21,6 +21,7 @@
 ///For JPS pathing, the maximum length of a path we'll try to generate. Should be modularized depending on what we're doing later on
 #define AI_MAX_PATH_LENGTH 30 // 30 is possibly overkill since by default we lose interest after 14 tiles of distance, but this gives wiggle room for weaving around obstacles
 #define AI_BOT_PATH_LENGTH 60
+#define AI_MULEBOT_PATH_LENGTH 150 //we making a pilgramage sometimes...
 
 // How far should we, by default, be looking for interesting things to de-idle?
 #define AI_DEFAULT_INTERESTING_DIST 10

code/__DEFINES/ai/bot_keys.dm

@@ -149,3 +149,12 @@
 #define BB_ROBOT_TARGET "robot_target"
 ///key that holds materials we can refill
 #define BB_REFILLABLE_TARGET "refillable_target"
+
+
+//mulebots
+///key that holds our delivery destination's name
+#define BB_MULEBOT_DESTINATION_BEACON "mulebot_destination"
+///key that holds our home port's name
+#define BB_MULEBOT_HOME_BEACON "mulebot_home_beacon"
+///key that holds our current delivery target atom
+#define BB_MULEBOT_TRAVEL_TARGET "mulebot_travel_target"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -88,6 +88,14 @@
 /// global signal when a global nullrod type is picked
 #define COMSIG_GLOB_NULLROD_PICKED "!nullrod_picked"
 
+/// global signal when someone prays via prayer verb.
+#define COMSIG_GLOB_SEND_PRAYER "!send_prayer"
+	#define ARG_PRAYING_MOB 1
+	#define ARG_PRAYER_MSG 2
+	#define ARG_PRAYER_TYPE 3
+	#define ARG_PRAYER_SYMBOL 4
+	#define ARG_PRAYED_DEITIES 5
+
 /// Global signal when light debugging is canceled
 #define COMSIG_LIGHT_DEBUG_DISABLED "!light_debug_disabled"
 

code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm

@@ -23,11 +23,11 @@
 	#define COMSIG_MOB_CANCEL_CLICKON (1<<0)
 ///from base of mob/alt_click_on_secodary(): (atom/A)
 #define COMSIG_MOB_ALTCLICKON_SECONDARY "mob_altclickon_secondary"
-/// From base of /mob/living/simple_animal/bot/proc/bot_step()
+/// From base of /mob/living/basic/bot/proc/bot_step()
 #define COMSIG_MOB_BOT_PRE_STEP "mob_bot_pre_step"
 	/// Should always match COMPONENT_MOVABLE_BLOCK_PRE_MOVE as these are interchangeable and used to block movement.
 	#define COMPONENT_MOB_BOT_BLOCK_PRE_STEP COMPONENT_MOVABLE_BLOCK_PRE_MOVE
-/// From base of /mob/living/simple_animal/bot/proc/bot_step()
+/// From base of /mob/living/basic/bot/proc/bot_step()
 #define COMSIG_MOB_BOT_STEP "mob_bot_step"
 
 /// From base of /mob/proc/update_held_items

code/__DEFINES/dcs/signals/signals_mob/signals_mob_silicon.dm

@@ -12,5 +12,3 @@
 #define COMSIG_SILICON_AI_VACATE_APC "AI_vacate_apc"
 ///called when an AI's control is toggled
 #define COMSIG_SILICON_AI_SET_CONTROL_DISABLED "AI_set_control_disabled"
-///called when borg module is activated/deactivated
-#define COMSIG_SILICON_MODULE_ACTIVATION "borg_module_select"

code/__DEFINES/dcs/signals/signals_moveloop.dm

@@ -11,3 +11,6 @@
 #define COMSIG_MOVELOOP_JPS_REPATH "moveloop_jps_repath"
 ///from [/datum/move_loop/has_target/jps/on_finish_pathing]
 #define COMSIG_MOVELOOP_JPS_FINISHED_PATHING "moveloop_jps_finished_pathing"
+
+///from /datum/move_loop/has_target/jps/frustrations/handle_move_attempt_failure
+#define COMSIG_MOVELOOP_JPS_FRUSTRATION_INCREMENTED "moveloop_jps_frustration_incremented"

code/__DEFINES/gizmo.dm

@@ -37,4 +37,5 @@
 	/datum/gizmodes/sputter = 1,\
 	/datum/gizmodes/copier = 1,\
 	/datum/gizmodes/bad = 1,\
+	/datum/gizmodes/code_crack/tutorial = 1,\
 )

code/__DEFINES/hud.dm

@@ -158,6 +158,8 @@
 #define HUD_WIZARD_COMPACT_PERKS "wizard_compact_perks"
 #define HUD_WIZARD_PERK(slot) "wizard_perk:[slot]"
 
+#define HUD_MULEBOT_CHARGE "mulebot_charge"
+
 /// Converts item slots to hud keys
 #define HUD_KEY_ITEM_SLOT(slot) "item_slot:[slot]"
 /// Converts item slots to hud keys as a compiler constant

code/__DEFINES/is_helpers.dm

@@ -192,9 +192,7 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 
 #define isrevenant(A) (istype(A, /mob/living/basic/revenant))
 
-#define isbot(A) (istype(A, /mob/living/simple_animal/bot) || istype(A, /mob/living/basic/bot))
-
-#define isbasicbot(A) (istype(A, /mob/living/basic/bot))
+#define isbot(A) istype(A, /mob/living/basic/bot)
 
 #define ismouse(A) (istype(A, /mob/living/basic/mouse))
 

code/__DEFINES/layers.dm

@@ -36,10 +36,11 @@
 #define DEFAULT_PLANE 0 //Marks out the default plane, even if we don't use it
 
 #define WEATHER_PLANE 1
-#define AREA_PLANE 2
-#define MASSIVE_OBJ_PLANE 3
-#define GHOST_PLANE 4
-#define POINT_PLANE 5
+#define PARTICLE_WEATHER_PLANE 2
+#define AREA_PLANE 3
+#define MASSIVE_OBJ_PLANE 4
+#define GHOST_PLANE 5
+#define POINT_PLANE 6
 
 //---------- LIGHTING -------------
 /// Normal 1 per turf dynamic lighting objects

code/__DEFINES/maps.dm

@@ -135,7 +135,7 @@ Always compile, always use that verb, and always make sure that it works for wha
 ///Z level traits for Deep Space
 #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
 ///Z level traits for
-#define ZTRAITS_WILDS list(\
+#define ZTRAITS_ICY_WILDS list(\
 	ZTRAIT_LINKAGE = GRIDLINKED, \
 	ZTRAIT_ICE_RUINS = TRUE, \
 	ZTRAIT_SNOWSTORM = FALSE, \

code/__DEFINES/mobs.dm

@@ -1096,6 +1096,15 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
 /// Helper macro that determines if the mob is at the threshold to start vomitting due to high toxin levels
 #define AT_TOXIN_VOMIT_THRESHOLD(mob) (mob.get_tox_loss() > 45 && mob.nutrition > 20)
 
+/// Shared cooldown for manually triggered emote audio
+#define MANUAL_GENERAL_EMOTE_AUDIO_COOLDOWN "manual_general_emote_audio_cooldown"
+/// Per emote cooldown for manually triggered emote audio
+#define MANUAL_SPECIFIC_EMOTE_AUDIO_COOLDOWN(type) "manual_specific_emote_audio_cooldown_[type]"
+/// Shared cooldown for forced emote audio
+#define FORCED_GENERAL_EMOTE_AUDIO_COOLDOWN "forced_general_emote_audio_cooldown"
+/// Per emote cooldown for forced emote audio
+#define FORCED_SPECIFIC_EMOTE_AUDIO_COOLDOWN(type) "forced_specific_emote_audio_cooldown_[type]"
+
 /// The duration of the flip emote animation
 #define FLIP_EMOTE_DURATION 0.7 SECONDS
 ///The duration of a taunt emote, so how long they can deflect projectiles

code/__DEFINES/religion.dm

@@ -68,3 +68,20 @@
 #define RITE_ALLOW_MULTIPLE_PERFORMS (1<<1)
 ///The rite can only be fully performed once, so we'll completely remove it from the rite list afterwards.
 #define RITE_ONE_TIME_USE (1<<2)
+
+///Default prayer type for the pray verb
+#define DEFAULT_PRAYER "PRAYER"
+///Cult prayer type
+#define CULT_PRAYER "CULTIST PRAYER"
+//Heretic prayer type
+#define HERETIC_PRAYER "HERETICAL PRAYER"
+///Chaplain prayer type
+#define CHAPLAIN_PRAYER "CHAPLAIN PRAYER"
+///Spiritual prayer type
+#define SPIRITUAL_PRAYER "SPIRITUAL PRAYER"
+///Evil prayer type
+#define EVIL_PRAYER "EVIL PRAYER"
+///Standard prayer type that santa sees
+#define SANTA_PRAYER "PRAYER"
+///what type of prayer santa sees when someone's bad
+#define SANTA_NAUGHTY_PRAYER "PRAYER (NAUGHTY)"

code/__DEFINES/robots.dm

@@ -403,3 +403,10 @@ DEFINE_BITFIELD(janitor_mode_flags, list(
 
 /// Default offsets for riding a cyborg
 #define DEFAULT_ROBOT_RIDING_OFFSETS list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-6, 3), TEXT_WEST = list(6, 3))
+
+
+//mulebots
+#define MULEBOT_MOOD_ANNOYED "ANNOYED"
+#define MULEBOT_MOOD_CHIME "CHIME"
+#define MULEBOT_MOOD_DELIGHT "DELIGHT"
+#define MULEBOT_MOOD_SIGH "SIGH"

code/__DEFINES/say.dm

@@ -11,7 +11,8 @@
 #define LANGUAGE_MUTUAL_BONUS "language mutual bonus"
 #define SAY_MOD_VERB "say_mod_verb"
 
-#define HEARD_BUT_DIDNT_UNDERSTAND "heard_but_didnt_understand"
+#define HEAR_HEARD (1<<0)
+#define HEAR_UNDERSTOOD (1<<1)
 
 //Message modes. Each one defines a radio channel, more or less.
 //if you use ! as a mode key for some ungodly reason, change the first character for ion_num() so get_message_mode() doesn't freak out with state law prompts - shiz.
@@ -76,7 +77,8 @@
 /// Message is being relayed through another object
 #define MODE_RELAY "relayed"
 /// Message has a TTS identifier attached to it
-#define MODE_TTS_IDENTIFIER "tts_identifier"/// Override the mob's name
+#define MODE_TTS_IDENTIFIER "tts_identifier"
+/// Override the mob's name
 #define MODE_SPEAKER_NAME_OVERRIDE "speaker_name_override"
 
 //Spans. Robot speech, italics, etc. Applied in compose_message().

code/__DEFINES/traits/declarations.dm

@@ -381,6 +381,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SUCCUMB_OVERRIDE "succumb_override"
 /// Can hear observers
 #define TRAIT_SIXTHSENSE "sixth_sense"
+/// For mobs / minds with the listening_prayers trait, this stops them from hearing prayers
+#define TRAIT_DONT_HEAR_PRAYERS "dont_hear_prayers"
 #define TRAIT_FEARLESS "fearless"
 /// Ignores darkness for hearing
 #define TRAIT_HEAR_THROUGH_DARKNESS "hear_through_darkness"