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 18.10.2024 #1600

Merged
merged 25 commits into from
Oct 19, 2024
Merged

Merge Upstream 18.10.2024 #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fec3a2f
[s] Janimech Garbage Magnet Walls Fix (#27085)
PollardTheDragon Oct 13, 2024
cd14b61
fixes some walls I missed (#27089)
Qwertytoforty Oct 13, 2024
b51cc0f
[PORT/FEATURE] Animated closet doors (#26832)
Adrer Oct 14, 2024
c901397
Fixes combat pants not having a icon state (#27098)
1080pCat Oct 14, 2024
9e23d82
Adds back the fuel sprite(again) (#27095)
1080pCat Oct 14, 2024
3aa1245
Fixes weed extract not having a sprite (#27096)
1080pCat Oct 14, 2024
c15a5bb
Fixes invisible signs on mining shelters (#27073)
Contrabang Oct 14, 2024
d916254
quick easy .dmi fix (#27077)
1080pCat Oct 14, 2024
bfca46b
Fixes the blood drunk miner not having a death animation (#27097)
1080pCat Oct 14, 2024
f5ee256
fix: duplicate mapped fire-extinguishers (#27105)
warriorstar-orion Oct 14, 2024
0973879
save progress (#26976)
Qwertytoforty Oct 15, 2024
429bebc
[FIX] Animated closet fixes (#27102)
Adrer Oct 15, 2024
4cef80f
[FIX] Guncabinet overlay fix (#27107)
Adrer Oct 15, 2024
ca77461
fix (#27078)
Bm0n Oct 15, 2024
c1427a4
Fixes a glowing eye issue and eye overlay issue (#26934)
Spaghetti-bit Oct 15, 2024
344de81
Fixes chat language colours (#27099)
Adrer Oct 15, 2024
388c02b
[FIX] Changes the engineering locker sprite to be correct (#27109)
Adrer Oct 15, 2024
fff92cd
cere: fix some area desginations on service asteroid (#27111)
warriorstar-orion Oct 15, 2024
b0895a1
Update gun_attachments.dm (#26956)
Qwertytoforty Oct 15, 2024
be2cdeb
fixes deepfrier / cereal maker not transfering reagents (#27123)
Qwertytoforty Oct 16, 2024
c3d7734
[REFACTOR] Remove the flying var, adds the flying trait. (#26881)
Adrer Oct 16, 2024
204f798
[FIX] [IDB Ignore] Closet emag sparks disappear again (#27126)
Adrer Oct 17, 2024
20dfb3a
refactor: Remove unused grill machine (#27122)
warriorstar-orion Oct 17, 2024
94365f6
Merge branch 'master' into merge-upstream
AyIong Oct 18, 2024
ad1b726
Fixes
AyIong Oct 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
21 changes: 5 additions & 16 deletions _maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,14 +1658,6 @@
},
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/chamber)
"zM" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'SERVER ROOM'.";
name = "SERVER ROOM";
pixel_y = 0
},
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/chamber)
"zY" = (
/obj/structure/bed,
/obj/item/bedsheet/green,
Expand Down Expand Up @@ -3011,9 +3003,6 @@
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"To" = (
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/chamber)
"Tw" = (
/obj/machinery/computer/telescience{
dir = 4
Expand Down Expand Up @@ -7958,7 +7947,7 @@ ux
Ad
tF
iy
To
Zu
mZ
FA
EM
Expand Down Expand Up @@ -8050,7 +8039,7 @@ ux
ux
ux
ux
To
Zu
ME
Zj
EM
Expand Down Expand Up @@ -8142,9 +8131,9 @@ pE
sv
ia
kl
To
To
zM
Zu
Zu
FA
EM
il
dn
Expand Down
4 changes: 0 additions & 4 deletions _maps/map_files/generic/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9158,10 +9158,6 @@
name = "south bump";
pixel_y = -30
},
/obj/structure/extinguisher_cabinet{
name = "south bump";
pixel_y = -30
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
"Sd" = (
Expand Down
Loading
Loading