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

Ded Moroz Update #797

Closed
wants to merge 19 commits into from
Closed

Ded Moroz Update #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
208a810
PortBase
MalorMorfin Dec 10, 2024
094ce48
Merge branch 'master' into DedMorozUpdate
MalorMorfin Dec 10, 2024
502e43e
chutok fixov
MalorMorfin Dec 10, 2024
350162b
DED MOROZ EDITION
MalorMorfin Dec 12, 2024
4752e9d
revert
MalorMorfin Dec 12, 2024
748b21a
Добавил дерево
MalorMorfin Dec 12, 2024
0e9e5ef
shitty content
MalorMorfin Dec 13, 2024
716b259
map update and other
MalorMorfin Dec 21, 2024
a3b3355
Merge branch 'master' into DedMorozUpdate
MalorMorfin Dec 21, 2024
21e2223
fix?
MalorMorfin Dec 21, 2024
f87a4a0
ы
MalorMorfin Dec 21, 2024
b672387
final
MalorMorfin Dec 22, 2024
309f335
Merge branch 'master' into DedMorozUpdate
MalorMorfin Dec 22, 2024
d4aab32
uh
MalorMorfin Dec 22, 2024
f62444a
bigbury
MalorMorfin Dec 23, 2024
2e34de5
fix
MalorMorfin Dec 23, 2024
f54ce50
canterbury
MalorMorfin Dec 23, 2024
a3a0a24
review fix
MalorMorfin Dec 24, 2024
ab535e5
update
MalorMorfin Dec 28, 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
2,086 changes: 1,524 additions & 562 deletions _maps/map_files/Talos/TGS_Talos.dmm
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 60 additions & 4 deletions _maps/shuttles/normandy.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
/turf/template_noop,
/area/shuttle/dropship/normandy)
"aD" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/engine_sidealt{
dir = 4
},
Expand All @@ -14,6 +17,9 @@
},
/area/shuttle/dropship/normandy)
"bg" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/turf/closed/shuttle/dropship2/engine_sidealt{
dir = 8
},
Expand Down Expand Up @@ -41,6 +47,12 @@
/turf/open/shuttle/dropship/floor,
/area/shuttle/dropship/normandy)
"cE" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/aisle{
dir = 4
},
Expand All @@ -49,6 +61,9 @@
/turf/template_noop,
/area/template_noop)
"cX" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/turf/closed/shuttle/dropship2/engine_sidealt{
dir = 1
},
Expand Down Expand Up @@ -131,10 +146,22 @@
/area/shuttle/dropship/normandy)
"kh" = (
/obj/docking_port/mobile/marine_dropship/one,
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/aisle{
dir = 4
},
/area/shuttle/dropship/normandy)
"kr" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/turf/closed/shuttle/dropship2/edge/alt,
/area/shuttle/dropship/normandy)
"kD" = (
/turf/closed/shuttle/dropship2/edge/alt{
dir = 1
Expand Down Expand Up @@ -209,6 +236,9 @@
/turf/open/shuttle/dropship/floor,
/area/shuttle/dropship/normandy)
"rJ" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/cornersalt,
/area/shuttle/dropship/normandy)
"rL" = (
Expand Down Expand Up @@ -250,6 +280,9 @@
},
/area/shuttle/dropship/normandy)
"uU" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/turf/closed/shuttle/dropship2/cornersalt{
dir = 1
},
Expand All @@ -267,6 +300,12 @@
},
/area/shuttle/dropship/normandy)
"yt" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/aisle,
/area/shuttle/dropship/normandy)
"yG" = (
Expand Down Expand Up @@ -311,10 +350,24 @@
/obj/structure/bed/chair/dropship/doublewide/left,
/turf/open/shuttle/dropship/floor,
/area/shuttle/dropship/normandy)
"BB" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/edge/alt{
dir = 1
},
/area/shuttle/dropship/normandy)
"Cd" = (
/turf/open/shuttle/dropship/three,
/area/shuttle/dropship/normandy)
"Dw" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 8
},
/turf/closed/shuttle/dropship2/aisle{
dir = 8
},
Expand All @@ -333,6 +386,9 @@
},
/area/shuttle/dropship/normandy)
"EW" = (
/obj/structure/prop/holidays/string_lights/green_and_red{
dir = 4
},
/turf/closed/shuttle/dropship2/engine_sidealt,
/area/shuttle/dropship/normandy)
"FA" = (
Expand Down Expand Up @@ -637,8 +693,8 @@ pO
pO
pO
rJ
kD
kD
BB
BB
EW
aD
fh
Expand Down Expand Up @@ -775,8 +831,8 @@ pO
pO
pO
uU
ex
ex
kr
kr
cX
bg
ax
Expand Down
Loading
Loading