Skip to content

Upstream 2026-01-25-0301Z #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blinkdog merged 54 commits into from
Jan 25, 2026
Merged

Upstream 2026-01-25-0301Z #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1cad1ba
Automatic changelog compile [ci skip]
actions-user Jan 11, 2026
81d0898
stomach processes properly again (#5678)
Erikafox Jan 11, 2026
a651d48
Automatic changelog generation for PR #5678 [ci skip]
actions-user Jan 11, 2026
433da32
fix reagent transfering + improve taste (#5683)
Erikafox Jan 11, 2026
73a948c
Automatic changelog generation for PR #5683 [ci skip]
actions-user Jan 11, 2026
4c6e4d2
Automatic changelog compile [ci skip]
actions-user Jan 12, 2026
d4bcbfd
Adds .45-70 Hollow Point to cargo (#5804)
generalthrax Jan 12, 2026
1ebeb9d
Fixes Kali Subshuttle Docking Port (#5803)
generalthrax Jan 12, 2026
84573f0
Automatic changelog generation for PR #5803 [ci skip]
actions-user Jan 12, 2026
d477278
puts a ghost spawn in trifuge (#5802)
Erikafox Jan 12, 2026
2e649a2
Automatic changelog generation for PR #5802 [ci skip]
actions-user Jan 12, 2026
5e1a784
Makes unique meats cut into 4 (#5794)
generalthrax Jan 12, 2026
b00b658
Automatic changelog generation for PR #5794 [ci skip]
actions-user Jan 12, 2026
0782a2d
Automatic changelog compile [ci skip]
actions-user Jan 13, 2026
453086a
Fixes some guns firing twice simultaneously (#5648)
SapphicOverload Jan 13, 2026
8d033c8
Automatic changelog generation for PR #5648 [ci skip]
actions-user Jan 13, 2026
0f9659a
FIX: Game Panel - Create Turf (#5694)
KOCMODECAHTHUK Jan 13, 2026
f0a16aa
Automatic changelog generation for PR #5694 [ci skip]
actions-user Jan 13, 2026
0cdbbe1
Prevents fake deathgasping (#5672)
zimon9 Jan 13, 2026
fbc1aaa
Automatic changelog generation for PR #5672 [ci skip]
actions-user Jan 13, 2026
952bf28
Automatic changelog compile [ci skip]
actions-user Jan 14, 2026
3642ea4
digi alt thighhigh adjustment (#5811)
thearbiber Jan 15, 2026
15053eb
Automatic changelog generation for PR #5811 [ci skip]
actions-user Jan 15, 2026
5642908
Automatic changelog compile [ci skip]
actions-user Jan 16, 2026
7501ac1
Fixes Ponytail (Side) 4 (#5812)
Imaginos16 Jan 16, 2026
d004e01
Automatic changelog generation for PR #5812 [ci skip]
actions-user Jan 16, 2026
dad6c66
Automatic changelog compile [ci skip]
actions-user Jan 17, 2026
ef5c77c
Ramzi Ice Command Post (#5753)
generalthrax Jan 17, 2026
4f95bfb
cavecrew remap (#5442)
rivercadaver Jan 17, 2026
7a42a76
Puts NGR radio on the haboob (#5815)
generalthrax Jan 18, 2026
2b305a8
Automatic changelog generation for PR #5815 [ci skip]
actions-user Jan 18, 2026
fdbb2c3
Automatic changelog compile [ci skip]
actions-user Jan 19, 2026
aed50ef
replaces flea syndicate headset with pirate headset (#5821)
ValorousHeart Jan 20, 2026
1361f4d
Automatic changelog generation for PR #5821 [ci skip]
actions-user Jan 20, 2026
1cdd39e
replaces roach syndicate headsets with pirate headsets (#5820)
generalthrax Jan 20, 2026
d2b734c
Automatic changelog generation for PR #5820 [ci skip]
actions-user Jan 20, 2026
4b27871
FIX: REMOVED NULL SPACE MY GUN - CTF CM-82 (#5818)
KOCMODECAHTHUK Jan 20, 2026
fdd8bd5
Automatic changelog generation for PR #5818 [ci skip]
actions-user Jan 20, 2026
f7268af
Shield bash now works for any melee weapon (#5814)
SomeguyManperson Jan 20, 2026
3fae00b
Automatic changelog generation for PR #5814 [ci skip]
actions-user Jan 20, 2026
7e3b112
Automatic changelog compile [ci skip]
actions-user Jan 21, 2026
f4fe5e9
516 compat audio player (#5813)
Erikafox Jan 22, 2026
91d2d51
Automatic changelog generation for PR #5813 [ci skip]
actions-user Jan 22, 2026
1ff4403
Automatic changelog compile [ci skip]
actions-user Jan 23, 2026
d63dc04
Fix T4 Drill not drilling (#5806)
Erikafox Jan 24, 2026
5346578
Automatic changelog generation for PR #5806 [ci skip]
actions-user Jan 24, 2026
f488f8e
Water Immersion - Carried Away Edition (#5548)
Erikafox Jan 24, 2026
257b4fc
Automatic changelog generation for PR #5548 [ci skip]
actions-user Jan 24, 2026
4ba868f
Fixes Phorids dying for no reason (#5817)
SapphicOverload Jan 24, 2026
48b4b25
Automatic changelog generation for PR #5817 [ci skip]
actions-user Jan 24, 2026
5bab357
Automatic changelog compile [ci skip]
actions-user Jan 25, 2026
5c02f75
Dwayne-remap (#5768)
DIB-DOG Jan 25, 2026
19037d2
Automatic changelog generation for PR #5768 [ci skip]
actions-user Jan 25, 2026
f764578
Merge remote-tracking branch 'upstream/master' into upstream-20260125…
blinkdog Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions _maps/RandomRuins/BeachRuins/beach_gunsmith.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4453,9 +4453,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/mob/living/simple_animal/hostile/human/ramzi/ranged/hydra{
wander = 0
},
/mob/living/simple_animal/hostile/human/ramzi/ranged/hydra/gunsmith,
/turf/open/floor/wood/walnut,
/area/ruin/beach/gunsmith)
"Up" = (
Expand Down
Loading
Loading