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

A slurry of Bigred changes #5397

Merged
merged 10 commits into from
Jan 23, 2024
Merged

A slurry of Bigred changes #5397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
760ea70
f
spartanbobby Dec 24, 2023
d16d49b
a
spartanbobby Dec 24, 2023
d9df917
d
spartanbobby Dec 26, 2023
bff3858
s
spartanbobby Dec 28, 2023
172d587
Merge remote-tracking branch 'cmss13-devs/master' into thingy
spartanbobby Dec 28, 2023
6b272bc
Merge remote-tracking branch 'cmss13-devs/master' into thingy
spartanbobby Jan 5, 2024
0b69d1a
s
spartanbobby Jan 6, 2024
f196d0d
d
spartanbobby Jan 6, 2024
6f8b4b2
ff
spartanbobby Jan 6, 2024
57f6fc3
d
spartanbobby Jan 6, 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,262 changes: 5,594 additions & 4,668 deletions maps/map_files/BigRed/BigRed.dmm
View file
Open in desktop

Large diffs are not rendered by default.

277 changes: 192 additions & 85 deletions maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 18 additions & 14 deletions maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,15 +428,17 @@
},
/area/bigredv2/outside/nw)
"bo" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/item/stack/rods,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
"bp" = (
/obj/item/stack/sheet/metal,
/obj/item/stack/rods,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
Expand All @@ -447,8 +449,10 @@
},
/area/bigredv2/outside/nw)
"br" = (
/obj/item/stack/rods,
/obj/item/stack/rods,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
Expand Down Expand Up @@ -835,7 +839,7 @@ aE
ak
aW
aW
bm
bG
bv
bv
bF
Expand All @@ -856,7 +860,7 @@ aF
aM
aX
aM
bo
bz
bw
bz
bz
Expand All @@ -877,7 +881,7 @@ aG
ab
ab
ab
bp
bS
bx
bx
bG
Expand Down Expand Up @@ -919,7 +923,7 @@ aI
aP
aP
ac
br
bn
bl
bu
bE
Expand All @@ -940,7 +944,7 @@ aJ
aQ
aY
ac
bs
bn
bs
bl
bE
Expand All @@ -961,7 +965,7 @@ aA
aR
aZ
ac
bi
bo
bi
bA
bE
Expand All @@ -982,7 +986,7 @@ aw
aK
ba
ai
bi
bX
bi
bA
bE
Expand All @@ -1003,7 +1007,7 @@ aA
aA
bb
ai
bi
bp
bi
bB
bE
Expand All @@ -1024,7 +1028,7 @@ cc
aw
bc
ai
bi
bn
bi
bB
bE
Expand All @@ -1045,7 +1049,7 @@ aA
aS
bd
ac
bi
br
bi
bB
bE
Expand All @@ -1066,7 +1070,7 @@ aL
aT
be
ac
bi
bX
bi
bB
bE
Expand Down
17 changes: 12 additions & 5 deletions maps/map_files/BigRed/sprinkles/25.lz1cave_flank.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
"d" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/space_port)
"e" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor{
dir = 1;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/lz1_north_cas)
"f" = (
/obj/item/tool/warning_cone,
/turf/open/floor/plating,
Expand Down Expand Up @@ -218,7 +225,7 @@ c
c
c
c
j
e
"}
(12,1,1) = {"
c
Expand All @@ -235,7 +242,7 @@ c
c
c
c
j
e
"}
(13,1,1) = {"
c
Expand All @@ -252,7 +259,7 @@ c
c
c
c
j
e
"}
(14,1,1) = {"
c
Expand All @@ -269,7 +276,7 @@ c
c
c
c
j
e
"}
(15,1,1) = {"
c
Expand All @@ -286,5 +293,5 @@ c
i
c
c
j
e
"}
Loading
Loading