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 19.03.2024 #1115

Merged
merged 31 commits into from
Mar 19, 2024
+10,340 −10,117
Merged

Merge upstream 19.03.2024 #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cb7cf57
oops (#24658)
chuga-git Mar 17, 2024
926dff2
Cyborgs drop their upgrades on the floor when reset or deconstructed …
Fordoxia Mar 18, 2024
f31961a
Modsuit activation/deactivation is no longer cancelled by user incapa…
chuga-git Mar 18, 2024
45f7f41
Fix: Body Scanner layout (#24140)
AyIong Mar 18, 2024
df29a55
niche case (#24595)
Contrabang Mar 18, 2024
6f63204
Adjusts Species Lung Temperature Tolerances (#24509)
LtDiggs Mar 18, 2024
fdef20c
Adds Meson Sunglasses (#24619)
ItsMarmite Mar 18, 2024
dabcd51
Makes headslug mob_size MOB_SIZE_SMALL (#24623)
Adrer Mar 18, 2024
fa9246e
Capitalized Comfrey. (#24642)
FunnyMan3595 Mar 18, 2024
e4b0ca0
Update inflatable.dm (#24646)
Fordoxia Mar 18, 2024
864520f
Fix dynamic lighting in secret clown HQ (#24181)
Adrer Mar 18, 2024
1b3370d
re-maps cables on box station (#24260)
Fluffyzack21 Mar 18, 2024
7054f86
Fixes all the cables on meta station (#24589)
Fluffyzack21 Mar 18, 2024
238525d
oversight perma pipe missing (#24607)
Fluffyzack21 Mar 18, 2024
664b04a
goodbye exclaims (#24593)
Contrabang Mar 18, 2024
c8dde43
fixes admin shuttles breaking the escape shuttle / not working (#24677)
Qwertytoforty Mar 18, 2024
79c2af1
Fix RD-Robotics Surgery window tint button on Cyberiad. (#24647)
FunnyMan3595 Mar 18, 2024
e92e3a8
Update gun icon on knife removing (#24674)
m-dzianishchyts Mar 18, 2024
153284e
Fix mime/clown picked names not being on their bank account. (#24669)
FunnyMan3595 Mar 18, 2024
13f0d60
Make pAIs show correctly in diagnostic HUDs (#24666)
FunnyMan3595 Mar 18, 2024
a5aa7d9
Retaliate mobs no longer break stuff after revived with a laz injecto…
FunnyMan3595 Mar 18, 2024
5bd3b32
Remove IPC heel pixel on standard chassis type (#24657)
VetleNeumann Mar 18, 2024
850888e
Handle 'Adjacent' for items inside structures (#24655)
VetleNeumann Mar 18, 2024
c6c8811
adds extra check (#24648)
BiancaWilkson Mar 18, 2024
435fbb6
Make gravity generator power-dependent again (#24601)
m-dzianishchyts Mar 18, 2024
576cbdc
Cargo "View Contents" Fix (#24562)
Oyu07 Mar 18, 2024
4dcc43f
Made eating Keeki a bit smarter. (#24373)
FunnyMan3595 Mar 18, 2024
ba2720a
Fixed clown and mime brain/head naming. (#24668)
FunnyMan3595 Mar 18, 2024
ffd3927
It just work's. Probably. (#24515)
AyIong Mar 18, 2024
7779516
Multi-tile doors fix (#24113)
MrRomainzZ Mar 18, 2024
5e9be1b
Merge remote-tracking branch 'official/master' into merge-upstream
m-dzianishchyts Mar 18, 2024
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
10 changes: 9 additions & 1 deletion _maps/map_files/Delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98695,6 +98695,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"xkI" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
/turf/simulated/floor/plasteel{
icon_state = "red"
},
/area/station/security/permabrig)
"xkJ" = (
/obj/machinery/atmospherics/binary/pump{
name = "burn chamber to port";
Expand Down Expand Up @@ -152596,7 +152604,7 @@ ygH
uUu
kju
aKU
aOX
xkI
nFh
aSj
aTH
Expand Down
Loading
Loading