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

Merge pull request #7357 from LetterN/mapsmapsmaps

Browse Source 
readds the cryo and lewdstuff on the map
This commit is contained in:
deathride58
2018-07-10 02:00:44 -04:00
committed by GitHub
parent 0235f37fd0 e54cf2ce21
commit 93ce09f63f
5 changed files with 532 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+408 -260
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+68 -22
View File
@@ -59000,7 +59000,10 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/closet/wardrobe/mixed,
/obj/machinery/computer/cryopod{
pixel_x = 30
},
/obj/machinery/cryopod,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -59794,7 +59797,7 @@
/obj/machinery/status_display{
pixel_x = 32
},
/obj/structure/closet/wardrobe/mixed,
/obj/machinery/cryopod,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -99639,6 +99642,10 @@
dir = 5
},
/area/science/mixing)
"fow" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"fpQ" = (
/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/obj/effect/mapping_helpers/airlock/locked,
@@ -99724,6 +99731,12 @@
dir = 1
},
/area/science/circuit)
"gVS" = (
/obj/item/clothing/head/kitty,
/obj/item/clothing/under/maid,
/obj/item/clothing/mask/muzzle,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"gXn" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -99811,10 +99824,19 @@
dir = 9
},
/area/science/circuit)
"hPM" = (
/obj/item/restraints/handcuffs/fake,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"iaF" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/research)
"ijB" = (
/obj/structure/reagent_dispensers/keg/aphro/strong,
/obj/item/reagent_containers/glass/beaker,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"ixL" = (
/obj/structure/sign/warning/vacuum{
pixel_x = 32
@@ -100109,6 +100131,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/circuit/green,
/area/science/research/abandoned)
"mIi" = (
/obj/item/electropack/shockcollar,
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"mQE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -100131,6 +100158,10 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"nyN" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"nSh" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/closed/wall/r_wall,
@@ -100218,6 +100249,13 @@
dir = 1
},
/area/science/circuit)
"poI" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"psi" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
@@ -100259,6 +100297,10 @@
dir = 5
},
/area/science/circuit)
"qBG" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"rhO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -100367,6 +100409,10 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"vhA" = (
/obj/item/clothing/under/color/grey,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"vqd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
@@ -122792,7 +122838,7 @@ dvV
dsW
dsW
dmj
dod
qBG
dhD
aaa
aad
@@ -124076,11 +124122,11 @@ dui
dvW
dxG
dzc
dhD
dhD
dhD
aaa
aad
dfY
dfY
dfY
dfY
dfY
aaa
aaa
aaa
@@ -124334,10 +124380,10 @@ dvX
dlc
dzd
dfY
aad
aaa
aaa
aad
nyN
gVS
hPM
dfY
ajr
aaa
aaa
@@ -124590,11 +124636,11 @@ dlc
dlc
dmn
djm
dhD
aad
aad
aad
aad
fow
dod
dod
poI
dfY
ajr
aad
aad
@@ -124848,10 +124894,10 @@ dvY
dod
dmi
dfY
aad
aaa
aaa
aad
ijB
vhA
mIi
dfY
ajr
aaa
aaa
@@ -125108,7 +125154,7 @@ dhQ
dhQ
dhQ
dhQ
aad
dfY
ajr
aaa
aaa
_maps/map_files/MetaStation/MetaStation.dmm
+13 -9
View File
@@ -5133,7 +5133,10 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"alf" = (
/obj/structure/closet/firecloset,
/obj/machinery/cryopod{
icon_state = "cryopod-open";
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"alg" = (
@@ -5840,7 +5843,10 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"amv" = (
/obj/structure/closet/emcloset,
/obj/machinery/cryopod{
icon_state = "cryopod-open";
dir = 1
},
/turf/open/floor/plasteel/vault,
/area/crew_quarters/fitness/recreation)
"amw" = (
@@ -21748,7 +21754,7 @@
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUR" = (
/obj/structure/closet/wardrobe/green,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUS" = (
@@ -52985,6 +52991,7 @@
name = "old sink";
pixel_y = 28
},
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -57952,10 +57959,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cto" = (
/obj/machinery/vending/assist,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ctq" = (
@@ -73501,8 +73505,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/structure/sign/poster/official/random{
pixel_x = -32
/obj/machinery/computer/cryopod{
pixel_x = -30
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
_maps/map_files/OmegaStation/OmegaStation.dmm
+9 -17
View File
@@ -11804,14 +11804,13 @@
pixel_y = 24
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/wardrobe/grey,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/crew_quarters/dorms)
"axG" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/wardrobe/black,
/obj/machinery/cryopod,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -12108,18 +12107,6 @@
dir = 4
},
/area/crew_quarters/dorms)
"ayy" = (
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
/area/crew_quarters/dorms)
"ayz" = (
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
@@ -12508,8 +12495,6 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
"azB" = (
/obj/structure/table,
/obj/item/camera,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
@@ -30671,6 +30656,13 @@
/area/engine/atmos)
"bxJ" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/computer/cryopod{
pixel_x = 30
},
/obj/machinery/light{
dir = 4;
light_color = "#e8eaff"
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -73106,7 +73098,7 @@ auT
avY
awQ
axG
ayy
axG
bxJ
aAH
aBQ
_maps/map_files/PubbyStation/PubbyStation.dmm
+34 -18
View File
@@ -7814,6 +7814,10 @@
dir = 4;
pixel_x = 28
},
/obj/machinery/computer/cryopod{
pixel_y = 30
},
/obj/machinery/cryopod,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avm" = (
@@ -8295,15 +8299,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"awx" = (
/obj/structure/closet/athletic_mixed,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel/arrival{
dir = 1
},
/area/crew_quarters/fitness/recreation)
"awy" = (
/obj/structure/closet/lasertag/blue,
/obj/structure/disposalpipe/segment{
@@ -11056,6 +11051,10 @@
/turf/open/floor/plasteel/white/side,
/area/crew_quarters/dorms)
"aDk" = (
/obj/machinery/vr_sleeper{
icon_state = "sleeper";
dir = 8
},
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 8
@@ -47360,7 +47359,10 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"dbi" = (
/obj/machinery/vr_sleeper,
/obj/machinery/vr_sleeper{
icon_state = "sleeper";
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"dci" = (
@@ -48248,7 +48250,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/vr_sleeper,
/obj/machinery/cryopod,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"fIN" = (
@@ -48323,6 +48325,12 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"gcj" = (
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/arrival{
dir = 1
},
/area/crew_quarters/fitness/recreation)
"gdJ" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
@@ -49226,7 +49234,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"iEU" = (
/obj/item/clothing/suit/apron/chef,
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"iFI" = (
@@ -50698,6 +50706,10 @@
/obj/item/stack/spacecash/c10,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/crew_quarters/dorms)
"noC" = (
/obj/machinery/vending/kink,
/turf/open/floor/wood,
/area/maintenance/department/crew_quarters/dorms)
"noM" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -52693,6 +52705,10 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"tap" = (
/obj/structure/reagent_dispensers/keg/aphro,
/turf/open/floor/wood,
/area/maintenance/department/crew_quarters/dorms)
"taA" = (
/obj/structure/chair/office/light,
/turf/open/floor/plasteel/dark,
@@ -91514,7 +91530,7 @@ cBo
alQ
alb
cBw
alb
noC
aiS
aiS
aiS
@@ -91771,7 +91787,7 @@ ajt
alQ
mnG
alb
alb
tap
aiS
anY
apt
@@ -95127,7 +95143,7 @@ aiS
atm
aun
atn
awx
awz
axw
ayu
azC
@@ -95641,7 +95657,7 @@ asl
aiS
aup
atn
awz
awA
axx
ayv
azD
@@ -95898,7 +95914,7 @@ apu
ale
auq
atn
awA
awB
axw
axw
axw
@@ -96155,7 +96171,7 @@ akn
ajv
aqZ
atn
awB
gcj
axw
axw
axw