Skip to content

Upstream 2026-02-01-0257Z #41

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 18 commits into from
Feb 1, 2026
Merged

Upstream 2026-02-01-0257Z #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3885f2a
Makes simplemobs not get stuck on railings (#5796)
Erikafox Jan 25, 2026
5494f97
Automatic changelog generation for PR #5796 [ci skip]
actions-user Jan 25, 2026
ac164d6
Automatic changelog compile [ci skip]
actions-user Jan 26, 2026
4a89d83
Replaces a single eoehoma cell on Mining installation with a sharplit…
generalthrax Jan 29, 2026
fabedda
Changes a vent on the updated Dwayne because we found a fix too late …
DIB-DOG Jan 29, 2026
7316074
Removes Anomalous Crystal + Gas Leak from Jungle Paradise (#5822)
generalthrax Jan 29, 2026
9892398
Minor Atira Interior Update (#5725)
Erikafox Jan 29, 2026
211e690
Automatic changelog generation for PR #5831 [ci skip]
actions-user Jan 29, 2026
99d2b16
Replaces Mead Bottle with actual Mead (#5839)
generalthrax Jan 29, 2026
48b0a6f
Automatic changelog generation for PR #5725 [ci skip]
actions-user Jan 29, 2026
7b81dd2
FUCKING HELL JERRY (remaps jungle_syndicate.dmm) (#5579)
Addust Jan 29, 2026
dce2ac9
Automatic changelog generation for PR #5579 [ci skip]
actions-user Jan 29, 2026
868f7df
Automatic changelog compile [ci skip]
actions-user Jan 30, 2026
53df126
kilo remap 400 (#5764)
thearbiber Jan 30, 2026
099b60f
Automatic changelog generation for PR #5764 [ci skip]
actions-user Jan 30, 2026
554c75b
Automatic changelog compile [ci skip]
actions-user Jan 31, 2026
edec18d
Merge remote-tracking branch 'upstream/master' into upstream-20260201…
blinkdog Feb 1, 2026
9a4119e
Don't run the publish action during pull requests
blinkdog Feb 1, 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
3 changes: 0 additions & 3 deletions .github/workflows/publish_ghcr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
publish:
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/BeachRuins/beach_gunsmith.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1820,10 +1820,7 @@
/turf/open/floor/plasteel/mono/dark,
/area/ruin/beach/gunsmith/workshop)
"qT" = (
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = 12;
pixel_y = -6
},
/obj/item/reagent_containers/food/drinks/mead,
/turf/open/floor/wood/walnut,
/area/ruin/beach/gunsmith)
"qV" = (
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,10 +1702,7 @@
/obj/machinery/jukebox/boombox{
pixel_y = 9
},
/obj/item/reagent_containers/food/drinks/beer{
pixel_y = 11;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/mead,
/turf/open/floor/carpet/blue,
/area/ruin/unpowered/icemoon/downed_transport/barracks)
"mt" = (
Expand Down
9 changes: 2 additions & 7 deletions _maps/RandomRuins/IceRuins/icemoon_training_center.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7673,9 +7673,7 @@
/area/ruin/icemoon/training_facility/dorms)
"Lz" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/human/ramzi/melee/machete{
name = "Ramzi Clique Sawbones"
},
/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones,
/turf/open/floor/plasteel/mono/white,
/area/ruin/icemoon/training_facility/medbay)
"LA" = (
Expand Down Expand Up @@ -9246,10 +9244,7 @@
pixel_x = 0;
pixel_y = 12
},
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = 3;
pixel_y = 10
},
/obj/item/reagent_containers/food/drinks/mead,
/turf/open/floor/wood,
/area/ruin/icemoon/training_facility/office_2)
"SW" = (
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,7 @@
pixel_x = 10;
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = -10;
pixel_y = 15
},
/obj/item/reagent_containers/food/drinks/mead,
/turf/open/floor/plasteel/dark/jungleplanet,
/area/ruin/jungle/cavecrew/dormitories)
"cn" = (
Expand Down
Loading
Loading