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

Merge pull request #30995 from ShizCalev/map-fixes

Browse Source 
Map fixes
This commit is contained in:
Jordan Brown
2017-09-25 09:05:54 -05:00
committed by CitadelStationBot
parent 2071dfd1a5
commit 0dd54affc4
5 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+5 -2
View File
@@ -13334,6 +13334,7 @@
id = "chapelgun"; id = "chapelgun";
name = "Chapel Launcher Door" name = "Chapel Launcher Door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/chapel/main) /area/chapel/main)
"aEo" = ( "aEo" = (
@@ -27902,6 +27903,7 @@
id = "trash"; id = "trash";
name = "disposal bay door" name = "disposal bay door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/disposal) /area/maintenance/disposal)
"bnw" = ( "bnw" = (
@@ -39042,6 +39044,7 @@
id = "toxinsdriver"; id = "toxinsdriver";
name = "toxins launcher bay door" name = "toxins launcher bay door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/science/mixing) /area/science/mixing)
"bLm" = ( "bLm" = (
@@ -83826,7 +83829,7 @@ bHE
bYu bYu
bZk bZk
bCq bCq
cTG cTF
bCq bCq
bCq bCq
bCq bCq
@@ -85122,7 +85125,7 @@ bCq
bCq bCq
bCq bCq
bCq bCq
cTH cTF
bCq bCq
bLv bLv
bLv bLv
_maps/map_files/Deltastation/DeltaStation2.dmm
+17 -17
View File
@@ -30323,8 +30323,8 @@
/obj/item/stack/sheet/metal{ /obj/item/stack/sheet/metal{
amount = 50 amount = 50
}, },
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/machinery/newscaster{ /obj/machinery/newscaster{
pixel_y = -32 pixel_y = -32
}, },
@@ -46733,7 +46733,6 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"bMX" = ( "bMX" = (
/obj/machinery/computer/security/wooden_tv,
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/machinery/button/door{ /obj/machinery/button/door{
id = "detectivewindows"; id = "detectivewindows";
@@ -46747,15 +46746,16 @@
pixel_y = -26 pixel_y = -26
}, },
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/item/device/flashlight/lamp,
/obj/item/reagent_containers/food/drinks/flask/det,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"bMY" = ( "bMY" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/device/flashlight/lamp,
/obj/item/storage/secure/safe{ /obj/item/storage/secure/safe{
pixel_x = 32 pixel_x = 32
}, },
/obj/item/reagent_containers/food/drinks/flask/det, /obj/machinery/computer/security/wooden_tv,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"bMZ" = ( "bMZ" = (
@@ -67256,7 +67256,7 @@
pixel_x = -26 pixel_x = -26
}, },
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
}, },
@@ -108370,8 +108370,8 @@
amount = 50 amount = 50
}, },
/obj/item/crowbar, /obj/item/crowbar,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/report_crimes{ /obj/structure/sign/poster/official/report_crimes{
pixel_y = 32 pixel_y = 32
@@ -136696,7 +136696,7 @@ aae
aae aae
aae aae
aaf aaf
dYc aBW
aae aae
aae aae
aaa aaa
@@ -136947,7 +136947,7 @@ aaa
aaa aaa
aae aae
aaf aaf
dYc aBW
aae aae
aae aae
aaa aaa
@@ -137473,7 +137473,7 @@ dZB
eab eab
ear ear
aaa aaa
dYc aBW
aaa aaa
aaa aaa
aaa aaa
@@ -139529,7 +139529,7 @@ dZB
eaf eaf
ear ear
aaa aaa
dYc aBW
aae aae
aae aae
aae aae
@@ -140543,7 +140543,7 @@ dVy
dUl dUl
aaf aaf
aaf aaf
dYc aBW
aaa aaa
dZB dZB
eag eag
@@ -140557,7 +140557,7 @@ dZB
eag eag
ear ear
aaa aaa
dYc aBW
aaa aaa
aaa aaa
aaa aaa
@@ -141060,14 +141060,14 @@ aaf
aae aae
aae aae
aae aae
dYc aBW
aae aae
aaa aaa
aaa aaa
aaf aaf
aaa aaa
aaa aaa
dYc aBW
aae aae
aae aae
aaf aaf
@@ -141324,7 +141324,7 @@ aae
aaf aaf
aae aae
aae aae
dYc aBW
aaa aaa
aaa aaa
aaa aaa
_maps/map_files/MetaStation/MetaStation.dmm
+21 -14
View File
@@ -4182,6 +4182,7 @@
id = "trash"; id = "trash";
name = "disposal bay door" name = "disposal bay door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/disposal) /area/maintenance/disposal)
"aig" = ( "aig" = (
@@ -13541,10 +13542,6 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"azU" = ( "azU" = (
/obj/machinery/computer/security/wooden_tv{
pixel_x = 3;
pixel_y = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10 dir = 10
}, },
@@ -13555,6 +13552,11 @@
network = list("Prison"); network = list("Prison");
pixel_y = 30 pixel_y = 30
}, },
/obj/item/device/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/item/restraints/handcuffs,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"azV" = ( "azV" = (
@@ -13562,17 +13564,16 @@
/obj/item/storage/secure/safe{ /obj/item/storage/secure/safe{
pixel_x = 32 pixel_x = 32
}, },
/obj/item/device/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/item/restraints/handcuffs,
/obj/machinery/button/door{ /obj/machinery/button/door{
id = "detective_shutters"; id = "detective_shutters";
name = "detective's office shutters control"; name = "detective's office shutters control";
pixel_y = 26; pixel_y = 26;
req_access_txt = "4" req_access_txt = "4"
}, },
/obj/machinery/computer/security/wooden_tv{
pixel_x = 3;
pixel_y = 2
},
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/security/detectives_office) /area/security/detectives_office)
"azW" = ( "azW" = (
@@ -17389,8 +17390,8 @@
amount = 50 amount = 50
}, },
/obj/item/crowbar, /obj/item/crowbar,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 1 dir = 1
}, },
@@ -23436,6 +23437,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/storage/primary) /area/storage/primary)
"aTi" = ( "aTi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{ /obj/machinery/door/airlock/highsecurity{
locked = 0; locked = 0;
name = "AI Upload"; name = "AI Upload";
@@ -24856,6 +24858,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload_foyer) /area/ai_monitored/turret_protected/ai_upload_foyer)
"aVY" = ( "aVY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{ /obj/machinery/door/airlock/highsecurity{
name = "Secure Network Access"; name = "Secure Network Access";
req_access_txt = "19" req_access_txt = "19"
@@ -36260,6 +36263,7 @@
d2 = 4; d2 = 4;
icon_state = "0-4" icon_state = "0-4"
}, },
/obj/item/paper_bin,
/obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random,
@@ -36280,6 +36284,7 @@
/area/storage/art) /area/storage/art)
"brf" = ( "brf" = (
/obj/structure/table, /obj/structure/table,
/obj/item/paper_bin/construction,
/obj/item/airlock_painter, /obj/item/airlock_painter,
/obj/machinery/airalarm{ /obj/machinery/airalarm{
dir = 8; dir = 8;
@@ -41266,8 +41271,8 @@
/obj/item/stack/sheet/metal{ /obj/item/stack/sheet/metal{
amount = 50 amount = 50
}, },
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/turf/open/floor/plasteel/caution{ /turf/open/floor/plasteel/caution{
dir = 8 dir = 8
}, },
@@ -69603,6 +69608,7 @@
id = "toxinsdriver"; id = "toxinsdriver";
name = "Toxins Launcher Bay Door" name = "Toxins Launcher Bay Door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/science/mixing) /area/science/mixing)
"cDu" = ( "cDu" = (
@@ -77240,6 +77246,7 @@
id = "chapelgun"; id = "chapelgun";
name = "Chapel Launcher Door" name = "Chapel Launcher Door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/chapel/main) /area/chapel/main)
"cRQ" = ( "cRQ" = (
@@ -128535,7 +128542,7 @@ aaa
aaa aaa
aaf aaf
aaa aaa
aaX blx
adl adl
aQf aQf
adl adl
_maps/map_files/OmegaStation/OmegaStation.dmm
+5 -4
View File
@@ -13900,8 +13900,8 @@
/obj/item/stack/sheet/metal{ /obj/item/stack/sheet/metal{
amount = 50 amount = 50
}, },
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/machinery/newscaster{ /obj/machinery/newscaster{
pixel_y = 32 pixel_y = 32
}, },
@@ -20539,8 +20539,8 @@
amount = 50 amount = 50
}, },
/obj/item/crowbar, /obj/item/crowbar,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
@@ -35681,6 +35681,7 @@
id = "chapelmassdoor"; id = "chapelmassdoor";
name = "Chapel Launcher Door" name = "Chapel Launcher Door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/chapel/main) /area/chapel/main)
"blJ" = ( "blJ" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+5 -4
View File
@@ -13789,8 +13789,7 @@
pixel_x = -1; pixel_x = -1;
pixel_y = 9 pixel_y = 9
}, },
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
},
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
pixel_x = 7; pixel_x = 7;
pixel_y = 2 pixel_y = 2
@@ -16903,6 +16902,7 @@
id = "trash"; id = "trash";
name = "disposal bay door" name = "disposal bay door"
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/disposal) /area/maintenance/disposal)
"aLo" = ( "aLo" = (
@@ -41644,6 +41644,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 8 dir = 8
}, },
/obj/structure/fans/tiny,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/science/mineral_storeroom) /area/science/mineral_storeroom)
"bMr" = ( "bMr" = (
@@ -45768,7 +45769,7 @@
/area/storage/tech) /area/storage/tech)
"bVL" = ( "bVL" = (
/obj/structure/table, /obj/structure/table,
/obj/item/storage/box/metalfoam{ /obj/item/storage/box/smart_metal_foam{
pixel_x = 4; pixel_x = 4;
pixel_y = 7 pixel_y = 7
}, },
@@ -103836,8 +103837,8 @@ aaa
aaa aaa
aaa aaa
aLn aLn
aLn
aNT aNT
aQo
aPg aPg
aQl aQl
aRu aRu