Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds 6 placement variations to brig cells (2 main + 4 perma) #7928

Closed
Hopekz wants to merge 2 commits into from
Closed

Adds 6 placement variations to brig cells (2 main + 4 perma) #7928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea75e5c
Adds 6 variations to brig cells (main + perma)
Hopekz Mar 7, 2020
ced17b9
Merge remote-tracking branch 'upstream/master' into brig_cell_variations
Hopekz Mar 12, 2020
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
379 changes: 168 additions & 211 deletions _maps/map_files/YogStation/YogStation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_main1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"j" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 1";
name = "Cell 1 Locker"
},
/turf/template_noop,
/area/space)
"K" = (
/turf/template_noop,
/area/space)
"P" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
K
P
"}
(2,1,1) = {"
K
K
"}
(3,1,1) = {"
K
j
"}
29 changes: 29 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_main2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"j" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 1";
name = "Cell 1 Locker"
},
/turf/template_noop,
/area/space)
"K" = (
/turf/template_noop,
/area/space)
"P" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
K
j
"}
(2,1,1) = {"
K
K
"}
(3,1,1) = {"
K
P
"}
32 changes: 32 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_perma1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"u" = (
/obj/structure/chair/stool,
/turf/template_noop,
/area/space)
"y" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/turf/template_noop,
/area/space)
"N" = (
/turf/template_noop,
/area/space)
"R" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
R
N
"}
(2,1,1) = {"
N
N
"}
(3,1,1) = {"
u
y
"}
32 changes: 32 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_perma2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"u" = (
/obj/structure/chair/stool,
/turf/template_noop,
/area/space)
"y" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/turf/template_noop,
/area/space)
"N" = (
/turf/template_noop,
/area/space)
"R" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
u
y
"}
(2,1,1) = {"
N
N
"}
(3,1,1) = {"
R
N
"}
32 changes: 32 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_perma3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"u" = (
/obj/structure/chair/stool,
/turf/template_noop,
/area/space)
"y" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/turf/template_noop,
/area/space)
"N" = (
/turf/template_noop,
/area/space)
"R" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
N
R
"}
(2,1,1) = {"
N
N
"}
(3,1,1) = {"
y
u
"}
32 changes: 32 additions & 0 deletions _maps/yogstation/RandomRuins/StationRuins/BoxStation/brig_cell_perma4.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"u" = (
/obj/structure/chair/stool,
/turf/template_noop,
/area/space)
"y" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/turf/template_noop,
/area/space)
"N" = (
/turf/template_noop,
/area/space)
"R" = (
/obj/structure/bed,
/obj/item/bedsheet/prisoner,
/turf/template_noop,
/area/space)

(1,1,1) = {"
y
u
"}
(2,1,1) = {"
N
N
"}
(3,1,1) = {"
N
R
"}
32 changes: 32 additions & 0 deletions yogstation/code/datums/ruins/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,37 @@
suffix = "maint_detective.dmm"
name = "Detective Room"


/datum/map_template/ruin/station/box/brig
id = "Brig_cell_main1"
suffix = "brig_cell_main1.dmm"
name = "Brig main cell 1"

/datum/map_template/ruin/station/box/brig/cell_main2
id = "Brig_cell_main2"
suffix = "brig_cell_main2.dmm"
name = "Brig main cell 2"

/datum/map_template/ruin/station/box/brig/cell_perma1
id = "Brig_cell_perma1"
suffix = "brig_cell_perma1.dmm"
name = "Brig perma cell 1"

/datum/map_template/ruin/station/box/brig/cell_perma2
id = "Brig_cell_perma2"
suffix = "brig_cell_perma2.dmm"
name = "Brig perma cell 2"

/datum/map_template/ruin/station/box/brig/cell_perma3
id = "Brig_cell_perma3"
suffix = "brig_cell_perma3.dmm"
name = "Brig perma cell 3"

/datum/map_template/ruin/station/box/brig/cell_perma4
id = "Brig_cell_perma4"
suffix = "brig_cell_perma4.dmm"
name = "Brig perma cell 4"

/datum/map_template/ruin/station/box/dorms_edoor
id = "dorms_edoor1"
suffix = "dorms_edoor1.dmm"
Expand Down Expand Up @@ -134,3 +165,4 @@
id = "dorms_edoor9"
suffix = "dorms_edoor9.dmm"
name = "Dorm east door 9"

8 changes: 8 additions & 0 deletions yogstation/code/game/objects/effects/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,13 @@
/obj/effect/landmark/stationroom/box/aftmaint
template_names = list("Roleplaying Room", "Detective Room")


/obj/effect/landmark/stationroom/box/brig
template_names = list("Brig main cell 1", "Brig main cell 2")

/obj/effect/landmark/stationroom/box/brig/perma
template_names = list("Brig perma cell 1","Brig perma cell 2","Brig perma cell 3","Brig perma cell 4")

/obj/effect/landmark/stationroom/box/dorm_edoor
template_names = list("Dorm east door 1", "Dorm east door 2", "Dorm east door 3", "Dorm east door 4", "Dorm east door 5", "Dorm east door 6", "Dorm east door 7", "Dorm east door 8", "Dorm east door 9")