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 [10.10.2024] #1588

Merged
merged 33 commits into from
Oct 10, 2024
Merged

Merge Upstream [10.10.2024] #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
44b8f92
I swear this needs like, a unit test or something (#26965)
Qwertytoforty Oct 3, 2024
9f2b019
Let's the chef cook up some new ideas: Chef fridge starts with 3 plan…
Qwertytoforty Oct 3, 2024
19e1268
Cavity Time! - Ports 46 Desserts from TG (#26540)
Mitchs98 Oct 3, 2024
dab6fc5
fixes an exploit (#26984)
silverplatedelta Oct 4, 2024
854a160
Fix: Syndie depot locker is only spawned when there is a loot (#26979)
kyunkyunkyun Oct 6, 2024
b6f51c1
Nerf Space Loot (#26738)
ErdGinalD Oct 6, 2024
413ddc8
Adds Floor Lights (and makes lights not have random ranges) (#26923)
Contrabang Oct 6, 2024
1b25a5b
Surgery sounds 2: Now with volume mixer! (#26884)
Bm0n Oct 6, 2024
4833fea
IPCs dying to brain damage (#26957)
Contrabang Oct 6, 2024
8d4f75d
Removes a random proc that we don't use (#26982)
DGamerL Oct 6, 2024
1d447c5
fuck me whyyy (#26988)
Qwertytoforty Oct 6, 2024
19a8eda
check the user, not the target smh (#27005)
1080pCat Oct 7, 2024
a01f41e
[s] Blocks any doubled wall mount placement (#27016)
DGamerL Oct 7, 2024
bcd5b0b
refactor: barrier spawners. (#26866)
warriorstar-orion Oct 7, 2024
9c74bd1
Improves Anomaly Logging (#26526)
Burzah Oct 7, 2024
9aa3ecb
NanoMap Auto-Update (Tue Oct 8 01:37:23 UTC 2024) (#27002)
paradisess13[bot] Oct 8, 2024
1eaae15
IPCs are affected by Jestosterone now (#26840)
WenlockTheBritishHobo Oct 8, 2024
6faa31a
Removes an unneeded proc (#26997)
Contrabang Oct 8, 2024
59ce9b5
[FIX] Prevent duplicate cyborg upgrades (#26731)
Adrer Oct 9, 2024
fa911f1
Fixes singulo act on reinforced floor (#26948)
Migratingcocofruit Oct 9, 2024
37db29f
Fixes Powercell Removal On Modsuits (#26989)
Bm0n Oct 9, 2024
95b2d62
Captain's saber help intent slaps with flat of blade (#26869)
pwbokie Oct 9, 2024
3e640bd
Remove user from do_install (#27039)
Adrer Oct 9, 2024
89796a0
Makes RemoveComponent more sane (#26877)
DGamerL Oct 9, 2024
d96c008
Fix: #26850 - Allows kitchen utensils to be used on custom dishes (#2…
PidgeyThePirate Oct 9, 2024
4c1ba17
feat: Pizza bombs now disguise as any flavor. (#27007)
warriorstar-orion Oct 9, 2024
89bf882
Fixes eternal candle boxes appearing empty on spawn (#27008)
1080pCat Oct 9, 2024
62b65f8
Rework Lavaland tunnel themes. (#26599)
warriorstar-orion Oct 10, 2024
1bec347
Merge branch 'master-offs' into merge_upstream
dj-34 Oct 10, 2024
6a3007d
Conflicts solve
dj-34 Oct 10, 2024
c40d667
Update Paths for random spawners on our maps
dj-34 Oct 10, 2024
abb76a7
Chef's fridge
dj-34 Oct 10, 2024
1a35a1e
Fix linter
dj-34 Oct 10, 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
299 changes: 156 additions & 143 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

85 changes: 46 additions & 39 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
"cM" = (
/obj/effect/mapping_helpers/no_lava,
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored)
"dh" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment/corner{
Expand Down Expand Up @@ -646,6 +650,9 @@
/obj/machinery/economy/vending/chinese,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
"yh" = (
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored)
"zd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1443,26 +1450,26 @@ bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bL
bL
bL
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
bL
bL
bL
Expand All @@ -1479,19 +1486,19 @@ bV
bV
ab
ab
bV
bV
bV
bV
ab
bV
bV
bV
bV
bV
ab
ab
yh
yh
yh
yh
ab
yh
yh
yh
yh
yh
yh
yh
yh
ab
GF
ab
Expand Down Expand Up @@ -1524,7 +1531,7 @@ ab
ab
bT
ab
ab
cb
ab
ab
ab
Expand Down Expand Up @@ -2712,9 +2719,9 @@ ab
ab
ab
ab
ab
ab
ab
cM
cM
cM
ab
ab
bL
Expand Down Expand Up @@ -2748,9 +2755,9 @@ bV
bV
bV
bV
ab
ab
ab
cM
cM
cM
bV
bV
bV
Expand Down
Loading
Loading