Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9c7a528
Update wheelchair.dm
maxion12345 Jul 22, 2021
b2467a9
Update wheelchair.dm
maxion12345 Jul 22, 2021
6371bdf
Merge branch 'yogstation13:master' into master
maxion12345 Aug 9, 2021
b88d759
Merge branch 'yogstation13:master' into master
maxion12345 Aug 22, 2021
e96c52c
Merge branch 'yogstation13:master' into master
maxion12345 Aug 24, 2021
467192a
Merge branch 'yogstation13:master' into master
maxion12345 Sep 2, 2021
303fc16
Merge branch 'yogstation13:master' into master
maxion12345 Sep 3, 2021
294cbdd
Merge branch 'yogstation13:master' into master
maxion12345 Sep 5, 2021
b85b89a
Merge branch 'yogstation13:master' into master
maxion12345 Sep 16, 2021
efce9f3
Merge branch 'yogstation13:master' into master
maxion12345 Sep 18, 2021
9803c11
Merge branch 'yogstation13:master' into master
maxion12345 Sep 19, 2021
818e421
Merge branch 'yogstation13:master' into master
maxion12345 Sep 21, 2021
2fbd830
Merge branch 'yogstation13:master' into master
maxion12345 Oct 6, 2021
21b6fea
Merge branch 'yogstation13:master' into master
maxion12345 Oct 8, 2021
a263c14
removes random brig cell
maxion12345 Oct 8, 2021
b55782c
adds list to thing
maxion12345 Oct 8, 2021
94a6e7e
add brig turnstile
maxion12345 Oct 8, 2021
e05ed93
u[pdate
maxion12345 Oct 9, 2021
18a1feb
Merge branch 'newbrigtest' of https://github.com/maxion12345/Yogstati…
maxion12345 Oct 9, 2021
969884c
fix linter
maxion12345 Oct 9, 2021
eb607ab
fix hud
maxion12345 Oct 10, 2021
eb9e863
upgrade boxstation brig entrance
maxion12345 Oct 17, 2021
0446836
Revert "upgrade boxstation brig entrance"
maxion12345 Oct 17, 2021
20a2dd9
Revert "add brig turnstile"
maxion12345 Oct 24, 2021
2e3e8c9
Revert "removes random brig cell"
maxion12345 Oct 24, 2021
7a7021f
Merge branch 'yogstation13:master' into newbrigtest
maxion12345 Oct 24, 2021
5c105d0
modified rust_g.dll apparentl? idk
maxion12345 Oct 24, 2021
63bb755
yeah maps redone oh yeahyeah
maxion12345 Oct 24, 2021
aaed7a0
Revert "modified rust_g.dll apparentl? idk"
maxion12345 Oct 24, 2021
17c5d7d
yuh
maxion12345 Oct 24, 2021
4d0fb4c
made a fuckywucky
maxion12345 Oct 24, 2021
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
49 changes: 23 additions & 26 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -68910,16 +68910,6 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
"cjb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/security/brig)
"cjd" = (
/obj/machinery/door/poddoor/preopen{
id = "brigfrontdoor";
Expand Down Expand Up @@ -72864,19 +72854,6 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/brig)
"cpR" = (
/obj/machinery/door/airlock/security/glass{
id_tag = null;
name = "Brig";
req_access_txt = "63"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/security/warden)
"cpS" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -88561,6 +88538,15 @@
/obj/effect/mapping_helpers/teleport_anchor,
/turf/open/floor/plasteel,
/area/engine/engineering)
"fTJ" = (
/obj/machinery/turnstile/brig{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"fTT" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock";
Expand Down Expand Up @@ -100835,6 +100821,17 @@
icon_state = "panelscorched"
},
/area/maintenance/disposal/incinerator)
"ujk" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/turnstile/brig{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/security/warden)
"ukm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -126388,7 +126385,7 @@ agE
ahq
cjO
crC
cpR
ujk
cxM
bHT
cjM
Expand Down Expand Up @@ -126904,7 +126901,7 @@ bWL
apq
aef
aGE
cjb
fTJ
cjP
aaj
bpE
Expand Down Expand Up @@ -127675,7 +127672,7 @@ ain
apr
agX
aHp
cjb
fTJ
cjT
aaf
awk
Expand Down
Loading