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

Jump to bottom

Fixes Trijent Mapping Error(?) #5005

Merged
merged 2 commits into from
Nov 24, 2023
Merged

Fixes Trijent Mapping Error(?) #5005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145fbb1
Fixes nonsensical window
HeresKozmos Nov 22, 2023
8c59174
Merge branch 'master' into TrijentMapFix
HeresKozmos Nov 23, 2023
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
31 changes: 4 additions & 27 deletions maps/map_files/DesertDam/Desert_Dam.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9576,17 +9576,6 @@
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor/plating,
/area/desert_dam/interior/dam_interior/east_tunnel_entrance)
"aCT" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
dir = 8;
health = 25000
},
/turf/open/floor/prison{
dir = 10;
icon_state = "bright_clean"
},
/area/desert_dam/interior/dam_interior/east_tunnel_entrance)
"aCU" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison{
Expand Down Expand Up @@ -9651,18 +9640,6 @@
},
/turf/open/asphalt,
/area/desert_dam/exterior/valley/valley_northwest)
"aDd" = (
/obj/structure/bed/chair,
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
dir = 8;
health = 25000
},
/turf/open/floor/prison{
dir = 10;
icon_state = "bright_clean"
},
/area/desert_dam/interior/dam_interior/east_tunnel_entrance)
"aDe" = (
/obj/effect/decal/sand_overlay/sand1,
/turf/open/asphalt{
Expand Down Expand Up @@ -85490,8 +85467,8 @@ dTs
dTs
aEa
aEa
aCS
aCS
aEa
aEa
aEa
aEa
dTs
Expand Down Expand Up @@ -85724,8 +85701,8 @@ dTs
dTs
aEa
aCD
aCT
aDd
aCF
aDg
aDn
aEa
aDt
Expand Down