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/MetaStation/MetaStation.dmm
+21 -14
View File
@@ -4182,6 +4182,7 @@
id = "trash";
name = "disposal bay door"
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/maintenance/disposal)
"aig" = (
@@ -13541,10 +13542,6 @@
/turf/open/floor/carpet,
/area/security/detectives_office)
"azU" = (
/obj/machinery/computer/security/wooden_tv{
pixel_x = 3;
pixel_y = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -13555,6 +13552,11 @@
network = list("Prison");
pixel_y = 30
},
/obj/item/device/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/item/restraints/handcuffs,
/turf/open/floor/carpet,
/area/security/detectives_office)
"azV" = (
@@ -13562,17 +13564,16 @@
/obj/item/storage/secure/safe{
pixel_x = 32
},
/obj/item/device/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/item/restraints/handcuffs,
/obj/machinery/button/door{
id = "detective_shutters";
name = "detective's office shutters control";
pixel_y = 26;
req_access_txt = "4"
},
/obj/machinery/computer/security/wooden_tv{
pixel_x = 3;
pixel_y = 2
},
/turf/open/floor/carpet,
/area/security/detectives_office)
"azW" = (
@@ -17389,8 +17390,8 @@
amount = 50
},
/obj/item/crowbar,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/effect/turf_decal/bot{
dir = 1
},
@@ -23436,6 +23437,7 @@
/turf/open/floor/plating,
/area/storage/primary)
"aTi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{
locked = 0;
name = "AI Upload";
@@ -24856,6 +24858,7 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"aVY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{
name = "Secure Network Access";
req_access_txt = "19"
@@ -36260,6 +36263,7 @@
d2 = 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,
@@ -36280,6 +36284,7 @@
/area/storage/art)
"brf" = (
/obj/structure/table,
/obj/item/paper_bin/construction,
/obj/item/airlock_painter,
/obj/machinery/airalarm{
dir = 8;
@@ -41266,8 +41271,8 @@
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -69603,6 +69608,7 @@
id = "toxinsdriver";
name = "Toxins Launcher Bay Door"
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/science/mixing)
"cDu" = (
@@ -77240,6 +77246,7 @@
id = "chapelgun";
name = "Chapel Launcher Door"
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/chapel/main)
"cRQ" = (
@@ -128535,7 +128542,7 @@ aaa
aaa
aaf
aaa
aaX
blx
adl
aQf
adl