shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15201 from zeroisthebiggay/slur

Browse Source 
fixes monkey shuttle brig
This commit is contained in:
silicons
2021-09-28 00:12:45 -07:00
committed by GitHub
parent b6b100db23 e6612e3f15
commit 78d461b58a
1 changed files with 15 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/emergency_nature.dmm
+15 -61
View File
@@ -145,12 +145,9 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"eS" = (
/obj/effect/turf_decal/trimline/red/filled/end{
dir = 1
},
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"eY" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -240,9 +237,6 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"ht" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 8
@@ -250,19 +244,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 28
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"hC" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"hJ" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -287,10 +269,10 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"it" = (
/mob/living/carbon/monkey,
/obj/structure/flora/grass/jungle/b{
icon_state = "bushb3"
},
/mob/living/carbon/monkey,
/turf/open/floor/grass,
/area/shuttle/escape)
"iD" = (
@@ -333,21 +315,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/shuttle/escape)
"jX" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"jZ" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"ke" = (
/obj/item/shovel/spade,
/turf/open/floor/grass,
@@ -385,13 +352,10 @@
},
/area/shuttle/escape)
"lS" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"lT" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -428,9 +392,9 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"mq" = (
/mob/living/carbon/monkey,
/obj/machinery/light/floor,
/obj/structure/flora/ausbushes/sparsegrass,
/mob/living/carbon/monkey,
/turf/open/floor/grass,
/area/shuttle/escape)
"mw" = (
@@ -557,13 +521,10 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"tL" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"uc" = (
/obj/effect/turf_decal/weather/dirt{
@@ -595,15 +556,12 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"vt" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs{
pixel_y = 7
},
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"vx" = (
/obj/effect/turf_decal/stripes/line{
@@ -612,13 +570,9 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"vP" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"vW" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/structure/table/reinforced,
/obj/item/storage/box/handcuffs{
pixel_y = 5
@@ -626,7 +580,7 @@
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"wg" = (
/obj/effect/turf_decal/trimline/green/filled/end{
@@ -713,7 +667,7 @@
name = "Brig";
req_access_txt = "63; 42"
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Ai" = (
/obj/effect/turf_decal/weather/dirt{
@@ -926,8 +880,8 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"Ia" = (
/mob/living/carbon/monkey,
/obj/structure/flora/ausbushes/sparsegrass,
/mob/living/carbon/monkey,
/turf/open/floor/grass,
/area/shuttle/escape)
"Io" = (
@@ -1549,7 +1503,7 @@ gx
WE
VU
Yu
jX
tL
tL
vt
Yu
@@ -1582,8 +1536,8 @@ gx
VU
Yu
ht
jZ
WL
vP
vP
vP
zE
HV
@@ -1614,7 +1568,7 @@ WE
(7,1,1) = {"
VI
eS
hC
lS
lS
lS
vW