Skip to content
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

Merge Upstream 22.01.2025 #1049

Merged
merged 52 commits into from
Jan 25, 2025
Merged

Merge Upstream 22.01.2025 #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
2e7be24
Honor-riffic: Adds toggleable honorific titles to certain job ID trim…
Rhials Jan 20, 2025
2ac49eb
Automatic changelog for PR #88309 [ci skip]
tgstation-ci[bot] Jan 20, 2025
54cac28
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 21, 2025
fca15d8
Makes Icebox ruins not count towards blob total, as well as preventi…
kuricityy Jan 21, 2025
ee3693b
Automatic changelog for PR #89113 [ci skip]
tgstation-ci[bot] Jan 21, 2025
4f2ff57
The Big Bess ripley now uses the correct sprite while piloted by an A…
necromanceranne Jan 21, 2025
6b74818
fix: floortile gloves fishing (#89145)
Arceniu Jan 21, 2025
e14fce1
Automatic changelog for PR #89148 [ci skip]
tgstation-ci[bot] Jan 21, 2025
bc79dff
Make deluxe donks uncraftable unless learned (#89143)
the-og-gear Jan 21, 2025
08a197f
Automatic changelog for PR #89143 [ci skip]
tgstation-ci[bot] Jan 21, 2025
03203d5
Fixes `atom_storage` breaking pockets when moving its item to hand (#…
SyncIt21 Jan 21, 2025
a43be97
Automatic changelog for PR #89141 [ci skip]
tgstation-ci[bot] Jan 21, 2025
42664ad
Fixes fishing auto reel moving fixed objects (#89144)
SyncIt21 Jan 21, 2025
4124f54
Automatic changelog for PR #89144 [ci skip]
tgstation-ci[bot] Jan 21, 2025
c3f3e9e
Fix flaky Ethereal test (#89123)
Jacquerel Jan 21, 2025
8196190
Removes a a at at be be of of and and have have (#89155)
out-of-phaze Jan 21, 2025
b72368f
#87754: Batons have their stamina damage reduced by armor, get stun a…
necromanceranne Jan 21, 2025
8dba4fd
Automatic changelog for PR #88830 [ci skip]
tgstation-ci[bot] Jan 21, 2025
cb2bbbe
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 22, 2025
c5396ab
Basic Mob Zombies (#89153)
Jacquerel Jan 22, 2025
85cbc4c
Automatic changelog for PR #89153 [ci skip]
tgstation-ci[bot] Jan 22, 2025
8953806
Remove totally unused blob curse (#89154)
Jacquerel Jan 22, 2025
37ad103
Implements /Exited() for clipboards (#89156)
SmArtKar Jan 22, 2025
b028b40
Automatic changelog for PR #89156 [ci skip]
tgstation-ci[bot] Jan 22, 2025
00297ea
Fix all decap'd heads looking brainless (#89157)
MrMelbert Jan 22, 2025
3169ff9
Automatic changelog for PR #89157 [ci skip]
tgstation-ci[bot] Jan 22, 2025
d3f7ff3
Fixes a fishy CI failure caused by a hard delete (#89138)
vinylspiders Jan 22, 2025
4a1fedf
Fixes an UpdatePaths script that was written backwards (#89128)
vinylspiders Jan 22, 2025
86e06b1
Fixes an armrest related hard del (#89139)
vinylspiders Jan 22, 2025
83e179e
Drastically simplifies the roundstart report (#89150)
TheVekter Jan 22, 2025
163380a
Automatic changelog for PR #89150 [ci skip]
tgstation-ci[bot] Jan 22, 2025
17010c1
Makes the mech repair droid unstackable + mech armor balance (#88789)
StrangeWeirdKitten Jan 22, 2025
fdb81af
Automatic changelog for PR #88789 [ci skip]
tgstation-ci[bot] Jan 22, 2025
29869bb
Makes chasms not spawn things when explosions happen again. (#89132)
Ghommie Jan 22, 2025
f032bb1
Automatic changelog for PR #89132 [ci skip]
tgstation-ci[bot] Jan 22, 2025
a8c798e
Balance: Cargo prices, GMM, Laser SMGs, Holy watermelons (#931)
AloeNeverDie Jan 22, 2025
5239e0a
Automatic changelog for PR #931 [ci skip]
ss220app[bot] Jan 22, 2025
c730511
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 23, 2025
57a2050
Cyberiad: Lawyer office tweaks (#1047)
CallmeHouston Jan 23, 2025
66c25d1
Automatic changelog for PR #1047 [ci skip]
ss220app[bot] Jan 23, 2025
868c753
Move preferences translate to master (#1044)
AyIong Jan 23, 2025
fd62992
Automatic changelog for PR #1044 [ci skip]
ss220app[bot] Jan 23, 2025
6509581
Add AutoWiki module & autowiki emoji (#1052)
AyIong Jan 23, 2025
b25086c
Automatic changelog for PR #1052 [ci skip]
ss220app[bot] Jan 23, 2025
8063f11
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 24, 2025
e38b6e7
Cyberiad: Minor armory fixes (#1059)
HardexZ Jan 24, 2025
e47af7e
Automatic changelog for PR #1059 [ci skip]
ss220app[bot] Jan 24, 2025
3e678c8
Cyberiad: fix turbine, curator access (#996)
CallmeHouston Jan 24, 2025
9929c48
Automatic changelog for PR #996 [ci skip]
ss220app[bot] Jan 24, 2025
73477cf
Automatic NanoMap Update (#1063)
ss220app[bot] Jan 25, 2025
226d35a
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 25, 2025
c6b0197
Merge remote-tracking branch 'upstream/merge-upstream' into merge-ups…
Gaxeer Jan 25, 2025
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
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/interdyne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
"eJ" = (
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
Expand Down Expand Up @@ -496,7 +496,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
"uy" = (
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
"vd" = (
Expand Down Expand Up @@ -656,7 +656,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/interdyne)
"By" = (
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/interdyne)
Expand All @@ -672,7 +672,7 @@
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/interdyne)
"DA" = (
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
Expand Down Expand Up @@ -719,7 +719,7 @@
/area/ruin/space/has_grav/interdyne)
"Ft" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
Expand All @@ -732,7 +732,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/interdyne)
"FC" = (
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/meatderelict.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@
/area/ruin/space/has_grav/powered/biooutpost)
"tv" = (
/obj/effect/decal/cleanable/blood/tracks,
/mob/living/simple_animal/hostile/zombie,
/mob/living/basic/zombie,
/turf/open/indestructible/white{
icon_state = "showroomfloor"
},
Expand Down
Loading
Loading