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.

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 13.01.2025 #981

Merged
merged 75 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
2a622f4
Fixes the trimline decal (#88995)
lukevale Jan 10, 2025
e816543
Automatic changelog for PR #88995 [ci skip]
tgstation-ci[bot] Jan 10, 2025
41e0d75
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 11, 2025
18c3462
Ethereals: Standardize defines, lower hunger rate, refactor charging …
00-Steven Jan 11, 2025
3743649
Automatic changelog for PR #88960 [ci skip]
tgstation-ci[bot] Jan 11, 2025
dba1f9b
ProcArgumentGlobal pragma as error from warning (#88992)
TiviPlus Jan 11, 2025
5cce8ea
Changed job post-equip order to fix station trait issues (#88890)
SmArtKar Jan 11, 2025
a3742ce
Automatic changelog for PR #88890 [ci skip]
tgstation-ci[bot] Jan 11, 2025
175e8bd
Fixes chameleon cards not updating sechud icons (#88899)
SmArtKar Jan 11, 2025
63d68de
Automatic changelog for PR #88899 [ci skip]
tgstation-ci[bot] Jan 11, 2025
2f57d3b
SaturnX no longer destroys player's retinas (#88906)
SmArtKar Jan 11, 2025
ea65a1c
Automatic changelog for PR #88906 [ci skip]
tgstation-ci[bot] Jan 11, 2025
10abeb0
Allows admins to filter observable mobs by ckey (#88922)
SmArtKar Jan 11, 2025
9ae36be
Automatic changelog for PR #88922 [ci skip]
tgstation-ci[bot] Jan 11, 2025
ddd903c
Improves mindbreaker toxin description (#88990)
SmArtKar Jan 11, 2025
a12b38a
Automatic changelog for PR #88990 [ci skip]
tgstation-ci[bot] Jan 11, 2025
531273e
[NO GBP] Blinking no longer stacks lizard overlays (#89015)
SmArtKar Jan 11, 2025
f651143
Fix calibre define text (#89014)
Jacquerel Jan 11, 2025
1e5301f
Automatic changelog for PR #89014 [ci skip]
tgstation-ci[bot] Jan 11, 2025
fc17a1a
Fixes all luminescent fluid giving unnaturally red eyes on overdose, …
00-Steven Jan 11, 2025
cca2607
Automatic changelog for PR #89009 [ci skip]
tgstation-ci[bot] Jan 11, 2025
51d84cf
Fixes custom vendors not displaying custom item names (#88985)
hyperjll Jan 11, 2025
798f2ac
Automatic changelog for PR #88985 [ci skip]
tgstation-ci[bot] Jan 11, 2025
d4f0da8
ink kisses now delete the spawned projectile (#88981)
carlarctg Jan 11, 2025
24e07e2
Automatic changelog for PR #88981 [ci skip]
tgstation-ci[bot] Jan 11, 2025
28e4c83
Deprioritise phobias in two sources of random trauma (#88958)
Jacquerel Jan 11, 2025
06da405
Automatic changelog for PR #88958 [ci skip]
tgstation-ci[bot] Jan 11, 2025
e120887
Adds an off-by-default config option to optionally disable TTS audio …
Iamgoofball Jan 11, 2025
7a7a623
Automatic changelog for PR #88826 [ci skip]
tgstation-ci[bot] Jan 11, 2025
0513f3b
Add mousetraps cargo crate to service category (#88983)
timothymtorres Jan 12, 2025
1ff96d0
Automatic changelog for PR #88983 [ci skip]
tgstation-ci[bot] Jan 12, 2025
f9dfc81
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 12, 2025
57dddc8
Heretics dream of objects around unused influences (#89003)
MTandi Jan 12, 2025
d58f0a8
Automatic changelog for PR #89003 [ci skip]
tgstation-ci[bot] Jan 12, 2025
16309bf
Fixes broken instances of overflowY for 516 (#89022)
JohnFulpWillard Jan 12, 2025
cbd5980
Automatic changelog for PR #89022 [ci skip]
tgstation-ci[bot] Jan 12, 2025
1d11262
Stack crafting images (#89020)
AyIong Jan 12, 2025
4e94c3b
Automatic changelog for PR #89020 [ci skip]
tgstation-ci[bot] Jan 12, 2025
928d646
Gives cult's blood barrage unique sprites (#88942)
SmArtKar Jan 12, 2025
9e768bf
Automatic changelog for PR #88942 [ci skip]
tgstation-ci[bot] Jan 12, 2025
77ada9e
One Meta Decal Fix (#89005)
MrMelbert Jan 12, 2025
92df747
Fixes bluespace fishing rod issues. (#89016)
00-Steven Jan 12, 2025
38b6986
Automatic changelog for PR #89016 [ci skip]
tgstation-ci[bot] Jan 12, 2025
10f5ba9
Fixes fake nuclear disks escaping the digital world. (#89001)
warbluke Jan 12, 2025
5752b19
Automatic changelog for PR #89001 [ci skip]
tgstation-ci[bot] Jan 12, 2025
996c06d
Fix emag not working on secure briefcases and safes (#88824)
timothymtorres Jan 12, 2025
fbf3aa1
Automatic changelog for PR #88824 [ci skip]
tgstation-ci[bot] Jan 12, 2025
9366f9c
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 13, 2025
d6408bc
[s] Records / PAI patching (#89049)
MrMelbert Jan 13, 2025
e3574e9
Adds a barbot seat projector to Wawa's bar (#88923)
SmArtKar Jan 13, 2025
a251f5a
Automatic changelog for PR #88923 [ci skip]
tgstation-ci[bot] Jan 13, 2025
0b231f7
Makes icebox's cargo warehouse on par with other stations (#88900)
EEASAS Jan 13, 2025
6139937
Automatic changelog for PR #88900 [ci skip]
tgstation-ci[bot] Jan 13, 2025
0328039
Fixes wawa's xenobio reagent grinders being inaccessible (#88905)
SmArtKar Jan 13, 2025
6890704
Automatic changelog for PR #88905 [ci skip]
tgstation-ci[bot] Jan 13, 2025
b7118cc
Charge up Tram's TCOMMS SMES (#88993)
Darkened-Earth Jan 13, 2025
504a59e
Automatic changelog for PR #88993 [ci skip]
tgstation-ci[bot] Jan 13, 2025
1b26008
[Icebox] Remaps Tech Storage, Public Mining, and Nearby Maint (#88873)
MrMelbert Jan 13, 2025
f15bf22
Automatic changelog for PR #88873 [ci skip]
tgstation-ci[bot] Jan 13, 2025
a8ecb4d
Fix a few wall mounted issues on icebox (#88980)
TealSeer Jan 13, 2025
f06e0c6
Automatic changelog for PR #88980 [ci skip]
tgstation-ci[bot] Jan 13, 2025
46fe9e5
Metastation cargo maintenence (#88668)
Dmeto Jan 13, 2025
9114a8d
Automatic changelog for PR #88668 [ci skip]
tgstation-ci[bot] Jan 13, 2025
b4e5782
Updates the Turreted Outpost space ruin (#88957)
SmArtKar Jan 13, 2025
8acd8ff
Automatic changelog for PR #88957 [ci skip]
tgstation-ci[bot] Jan 13, 2025
a36eefa
[BIRDSHOT] Turning down the thermostat for a seasonal edge. (#88931)
Zytolg Jan 13, 2025
21aadb0
Automatic changelog for PR #88931 [ci skip]
tgstation-ci[bot] Jan 13, 2025
d9d5399
Fixes camouflage implant missing icon (#88907)
SmArtKar Jan 13, 2025
0c7276d
Automatic changelog for PR #88907 [ci skip]
tgstation-ci[bot] Jan 13, 2025
a54009f
Circuit Wirenet Components + Assembly Shell Tweaks (#88593)
Y0SH1M4S73R Jan 13, 2025
7de4c23
Automatic changelog for PR #88593 [ci skip]
tgstation-ci[bot] Jan 13, 2025
a0473dc
makes the plasma visor overlay a lighter color and also actually work…
Paxilmaniac Jan 13, 2025
4d0c0aa
Automatic changelog for PR #88751 [ci skip]
tgstation-ci[bot] Jan 13, 2025
8c26146
Merge remote-tracking branch 'off/master' into merge-upstream
Gaxeer Jan 13, 2025
927ae2e
remove bad stack trace
Gaxeer Jan 13, 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
Prev Previous commit
Next Next commit
One Meta Decal Fix (tgstation#89005)
MrMelbert authored Jan 12, 2025
commit 77ada9e463e7c72b389a7062a5b7ac4504d5b636
28 changes: 23 additions & 5 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
@@ -11065,8 +11065,8 @@
/area/station/medical/chemistry)
"dYK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
dir = 1
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
/turf/open/floor/wood,
/area/station/commons/lounge)
@@ -27772,6 +27772,15 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/virology)
"jPw" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/turf/open/floor/wood,
/area/station/commons/lounge)
"jPE" = (
/obj/structure/sign/map/left{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
@@ -33518,6 +33527,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/wood,
/area/station/commons/lounge)
"lWq" = (
@@ -44177,6 +44189,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"pIM" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
},
/turf/open/floor/wood,
/area/station/commons/lounge)
"pIU" = (
/obj/structure/closet/secure_closet/medical1,
/obj/effect/turf_decal/tile/green/half/contrasted{
@@ -59653,7 +59671,7 @@
/obj/structure/sign/directions/command{
pixel_y = -8
},
/turf/closed/wall/r_wall,
/turf/closed/wall,
/area/station/commons/storage/tools)
"uZo" = (
/obj/machinery/light/small/directional/north,
@@ -102056,7 +102074,7 @@ twN
lkc
hhN
pBi
hkG
pIM
xEJ
yjc
crf
@@ -103853,7 +103871,7 @@ vFB
kFp
aeb
bvJ
lWm
jPw
kdN
wSs
jGA