Skip to content

Commit 2e0e92a

Browse files
Merge pull request #31 from FalloutFalcon/upstream-pull-4-1-2026
Upstream Pull 4/1/2026
2 parents d879766 + 5d2a1ff commit 2e0e92a

672 files changed

Lines changed: 7949 additions & 3040 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/auto_changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Generate App Token
2020
id: app-token-generation
21-
uses: actions/create-github-app-token@v2
21+
uses: actions/create-github-app-token@v3
2222
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
2323
with:
2424
app-id: ${{ secrets.APP_ID }}

.github/workflows/compile_changelogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: Generate App Token
5858
id: app-token-generation
59-
uses: actions/create-github-app-token@v2
59+
uses: actions/create-github-app-token@v3
6060
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
6161
with:
6262
app-id: ${{ secrets.APP_ID }}

.github/workflows/generate_client_storage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: Generate App Token
1616
id: app-token-generation
17-
uses: actions/create-github-app-token@v2
17+
uses: actions/create-github-app-token@v3
1818
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
1919
with:
2020
app-id: ${{ secrets.APP_ID }}

.github/workflows/stale.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,18 @@ jobs:
3737
operations-per-run: 300
3838
- name: Filter staled pull requests for announcement
3939
id: filter-prs
40-
uses: actions/github-script@v7
40+
uses: actions/github-script@v8
4141
with:
4242
script: |
43-
return JSON.parse(context.job.steps.stale.outputs.staled-issues-prs).filter(issue => !!issue.pull_request)
43+
const pull_requests = JSON.parse('${{steps.stale.outputs.staled-issues-prs}}')
44+
.filter(issue => !!issue.pull_request)
45+
.map(pr => ({
46+
title: pr.title,
47+
number: pr.number,
48+
html_url: pr.pull_request.html_url,
49+
}));
50+
51+
return JSON.stringify(pull_requests)
4452
4553
announce:
4654
runs-on: ubuntu-24.04
@@ -64,7 +72,7 @@ jobs:
6472
steps.secrets_set.outputs.SECRETS_ENABLED
6573
with:
6674
webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
67-
title: ${{ matrix.pull_request.user.login }} - ${{ matrix.pull_request.title }}
75+
title: ${{ matrix.pull_request.title }}
6876
message: ${{ format('**Pull Request \#{0} automatically marked as stale.**', matrix.pull_request.number) }}
6977
include_image: false
7078
show_author: false

.github/workflows/update_tgs_dmapi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Generate App Token
4242
id: app-token-generation
43-
uses: actions/create-github-app-token@v2
43+
uses: actions/create-github-app-token@v3
4444
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
4545
with:
4646
app-id: ${{ secrets.APP_ID }}

code/__DEFINES/combat.dm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,11 @@ DEFINE_BITFIELD(ammo_box_multiload, list(
293293
#define BODY_ZONE_PRECISE_L_FOOT "l_foot"
294294
#define BODY_ZONE_PRECISE_R_FOOT "r_foot"
295295

296-
GLOBAL_LIST_INIT(all_body_zones, list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
297-
GLOBAL_LIST_INIT(limb_zones, list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
296+
// These lists are ordered as bodyparts would be ordered
297+
GLOBAL_LIST_INIT(all_body_zones, list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
298+
GLOBAL_LIST_INIT(limb_zones, list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
298299
GLOBAL_LIST_INIT(arm_zones, list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
299-
GLOBAL_LIST_INIT(leg_zones, list(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
300+
GLOBAL_LIST_INIT(leg_zones, list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
300301
GLOBAL_LIST_INIT(all_precise_body_zones, list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_FOOT, BODY_ZONE_PRECISE_R_FOOT))
301302

302303
//We will round to this value in damage calculations.

code/__DEFINES/dcs/signals/signals_atom/signals_atom_lighting.dm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@
3939
#define COMSIG_ATOM_SET_LIGHT_FLAGS "atom_set_light_flags"
4040
///Called right after the atom changes the value of light_flags to a different one, from base of [/atom/proc/set_light_flags]: (old_flags)
4141
#define COMSIG_ATOM_UPDATE_LIGHT_FLAGS "atom_update_light_flags"
42+
///Called right before the atom changes the value of light_render_source to a different one, from base [atom/proc/set_light_render_source]: (new_render_source)
43+
#define COMSIG_ATOM_SET_LIGHT_RENDER_SOURCE "atom_set_light_render_source"
44+
///Called right after the atom changes the value of light_render_source to a different one, from base of [/atom/proc/set_light_render_source]: (old_render_source)
45+
#define COMSIG_ATOM_UPDATE_LIGHT_RENDER_SOURCE "atom_update_light_render_source"
4246

4347
///Called when an atom has a light template applied to it. Frombase of [/datum/light_template/proc/mirror_onto]: ()
4448
#define COMSIG_ATOM_LIGHT_TEMPLATE_MIRRORED "atom_light_template_mirrored"
49+
50+
///Called when an atom's overlay component applies visuals, from base of [/datum/component/overlay_lighting/proc/show_to_holder]: (atom/movable/light_holder)
51+
#define COMSIG_ATOM_OVERLAY_LIGHT_APPLIED "atom_overlay_light_applied"
52+
53+
///Called when an atom's overlay component hides its visuals, from base of [/datum/component/overlay_lighting/proc/hide_from_holder]: (atom/movable/light_holder)
54+
#define COMSIG_ATOM_OVERLAY_LIGHT_REMOVED "atom_overlay_light_removed"
55+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// from base of [/datum/light_middleman/proc/light_modified] : ()
2+
#define COMSIG_LIGHT_MIDDLEMAN_UPDATED "light_middleman_updated"

code/__DEFINES/dcs/signals/signals_medical.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@
2626
#define COMSIG_LIVING_OPERATING_ON "living_operating_on"
2727
/// Sent from /mob/living/perform_surgery: (mob/living/surgeon, list/possible_operations)
2828
#define COMSIG_ATOM_BEING_OPERATED_ON "atom_being_operated_on"
29+
30+
/// From /obj/item/ph_meter/interact_with_atom(): (atom/source, mob/user)
31+
#define COMSIG_ON_REAGENT_SCAN "on_reagent_scan"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,3 +386,6 @@
386386

387387
/// Sent to a mob when one of their bodypart's surgery state changes, OR sent from the basic_surgery_state holder when its surgery state changes (old_state, new_state, changed_states)
388388
#define COMSIG_LIVING_UPDATING_SURGERY_STATE "carbon_updating_surgery_state"
389+
390+
/// Sent to a mob when its player DNRs
391+
#define COMSIG_LIVING_DNR "living_dnr"

0 commit comments

Comments
 (0)