ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS

This commit is contained in:
deathride58
2018-01-17 23:51:54 -05:00
parent 3cc63f486b
commit 9e0f8384e5
40 changed files with 666972 additions and 6781 deletions
@@ -442,7 +442,7 @@
},
/area/ruin/powered/clownplanet)
"bp" = (
/turf/closed/mineral/clown,
/turf/closed/mineral/bananium,
/area/ruin/powered/clownplanet)
"bq" = (
/obj/item/pickaxe,
@@ -628,10 +628,10 @@
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"bS" = (
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/machinery/light/small{
dir = 8
},
@@ -671,7 +671,7 @@
},
/area/ruin/powered/clownplanet)
"bZ" = (
/obj/machinery/door/airlock/clown,
/obj/machinery/door/airlock/bananium,
/turf/open/indestructible/sound{
icon_state = "bananium";
name = "bananium floor";
@@ -803,10 +803,10 @@
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
"dL" = (
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/clown,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/item/coin/bananium,
/obj/machinery/light/small{
dir = 4
},
+1 -1
View File
@@ -18,7 +18,7 @@
/turf/closed/mineral/random/high_chance,
/area/ruin/unpowered)
"g" = (
/turf/closed/mineral/clown,
/turf/closed/mineral/bananium,
/area/ruin/unpowered)
"h" = (
/turf/open/floor/plating/asteroid/airless,
@@ -9,10 +9,10 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"d" = (
/turf/closed/wall/mineral/clown,
/turf/closed/wall/mineral/bananium,
/area/ruin/unpowered)
"e" = (
/obj/machinery/door/airlock/clown,
/obj/machinery/door/airlock/bananium,
/turf/open/floor/mineral/bananium/airless,
/area/ruin/unpowered)
"f" = (
+1 -1
View File
@@ -2300,7 +2300,7 @@
/turf/closed/mineral/diamond,
/area/awaymission/BMPship)
"hw" = (
/turf/closed/mineral/clown,
/turf/closed/mineral/bananium,
/area/awaymission/BMPship)
"hx" = (
/obj/structure/frame/computer{
+1 -1
View File
@@ -72,7 +72,7 @@
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
"ao" = (
/obj/item/coin/clown,
/obj/item/coin/bananium,
/turf/open/floor/engine,
/area/tcommsat/chamber)
"ap" = (
+1 -1
View File
@@ -2474,7 +2474,7 @@
/turf/open/floor/mineral/plastitanium/airless,
/area/space/nearstation)
"iE" = (
/turf/closed/mineral/clown,
/turf/closed/mineral/bananium,
/area/space/nearstation)
"iF" = (
/obj/machinery/door/airlock/external,
+5 -5
View File
@@ -7,11 +7,11 @@
#ifdef ALL_MAPS
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\BoxStation\BoxStation.dmm"
#include "cit_map_files\Deltastation\DeltaStation2.dmm"
#include "cit_map_files\MetaStation\MetaStation.dmm"
#include "cit_map_files\OmegaStation\OmegaStation.dmm"
#include "cit_map_files\PubbyStation\PubbyStation.dmm"
#include "cit_map_files\BoxStation\BoxStation.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
+1 -1
View File
@@ -1,5 +1,5 @@
{
"map_name": "Box Station",
"map_path": "map_files/BoxStation",
"map_path": "cit_map_files/BoxStation",
"map_file": "BoxStation.dmm"
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1,5 +1,5 @@
{
"map_name": "Delta Station",
"map_path": "map_files/Deltastation",
"map_path": "cit_map_files/Deltastation",
"map_file": "DeltaStation2.dmm"
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+97 -156
View File
@@ -9176,7 +9176,10 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -24
},
/turf/open/floor/plasteel/stairs/left,
/turf/open/floor/plasteel/neutral/corner{
dir = 8;
heat_capacity = 1e+006
},
/area/hallway/primary/central)
"arj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -9820,27 +9823,27 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"asf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"asg" = (
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"ash" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"asi" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"asj" = (
/obj/machinery/vending/cola/random,
@@ -10821,16 +10824,16 @@
},
/obj/structure/table/wood,
/obj/item/kitchen/fork,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aud" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aue" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"auf" = (
/obj/structure/table/reinforced,
@@ -11332,7 +11335,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"avg" = (
/obj/structure/table/wood,
@@ -11340,7 +11343,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"avh" = (
/obj/structure/chair/stool,
@@ -11348,20 +11351,20 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"avi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"avj" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"avk" = (
/obj/structure/table/reinforced,
@@ -11892,32 +11895,32 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awl" = (
/obj/structure/table/wood,
/obj/item/storage/bag/tray,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awm" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awo" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awp" = (
/obj/structure/table/reinforced,
@@ -12238,7 +12241,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awU" = (
/obj/structure/chair/stool,
@@ -12249,7 +12252,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awV" = (
/obj/structure/table/wood,
@@ -12257,13 +12260,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"awX" = (
/obj/structure/table/reinforced,
@@ -12561,7 +12564,9 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/stairs/left,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/hallway/primary/central)
"axC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -12687,20 +12692,20 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"axP" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"axQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"axR" = (
/obj/structure/cable/white{
@@ -13010,13 +13015,6 @@
pixel_x = 32
},
/obj/item/bedsheet/blue,
/obj/machinery/button/door{
id = "Dorm3";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"ayB" = (
@@ -13028,13 +13026,6 @@
pixel_x = 32
},
/obj/item/bedsheet/red,
/obj/machinery/button/door{
id = "Dorm4";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"ayE" = (
@@ -13088,24 +13079,24 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"ayK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"ayL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"ayM" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"ayN" = (
/obj/item/storage/fancy/cigarettes/cigars{
@@ -13495,7 +13486,6 @@
"azD" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm3";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
@@ -13568,7 +13558,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"azK" = (
/obj/structure/table/wood,
@@ -13576,7 +13566,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"azL" = (
/obj/structure/closet/crate/bin,
@@ -13586,7 +13576,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"azM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -14064,7 +14054,7 @@
/obj/structure/cable/white{
icon_state = "0-4"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -14083,7 +14073,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAP" = (
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -14099,7 +14089,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAQ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -14108,7 +14098,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -14117,7 +14107,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAS" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -14126,7 +14116,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aAT" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -14684,12 +14674,12 @@
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aBZ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/cheesiehonkers,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aCa" = (
/obj/machinery/light{
@@ -14698,7 +14688,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aCb" = (
/obj/machinery/status_display,
@@ -15194,7 +15184,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aCV" = (
/obj/structure/table/reinforced,
@@ -15515,13 +15505,6 @@
pixel_x = 32
},
/obj/item/bedsheet/brown,
/obj/machinery/button/door{
id = "Dorm1";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
specialfunctions = 4
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aDI" = (
@@ -15530,13 +15513,6 @@
pixel_x = 32
},
/obj/item/bedsheet/black,
/obj/machinery/button/door{
id = "Dorm2";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
specialfunctions = 4
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"aDJ" = (
@@ -15621,21 +15597,21 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aDP" = (
/obj/effect/landmark/xmastree,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aDQ" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aDR" = (
/obj/structure/table/reinforced,
@@ -16098,29 +16074,31 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/primary/central)
"aEK" = (
/obj/machinery/vending/clothing,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
/obj/effect/turf_decal/bot,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/crew_quarters/dorms)
"aEM" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/bot,
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -16245,12 +16223,12 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aEX" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/chips,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aEY" = (
/obj/structure/table/reinforced,
@@ -16690,7 +16668,7 @@
dir = 4;
network = list("MINE")
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aFO" = (
/obj/structure/table/wood,
@@ -16698,14 +16676,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aFP" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aFQ" = (
/obj/structure/table/reinforced,
@@ -17145,7 +17123,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aGO" = (
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -17160,7 +17138,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aGP" = (
/obj/structure/chair/stool,
@@ -17168,7 +17146,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aGQ" = (
/obj/machinery/holopad,
@@ -17176,7 +17154,7 @@
name = "Station Intercom";
pixel_x = 28
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aGR" = (
/obj/machinery/vending/dinnerware,
@@ -17740,7 +17718,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aHS" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -17749,12 +17727,12 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aHT" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/coffee,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aHU" = (
/obj/item/twohanded/required/kirbyplants{
@@ -17763,7 +17741,7 @@
/obj/structure/sign/poster/random{
pixel_x = 32
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aHV" = (
/obj/machinery/status_display,
@@ -18837,7 +18815,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aJX" = (
/obj/machinery/vending/cola/random,
@@ -19453,7 +19431,7 @@
pixel_x = -32;
pixel_y = -32
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aLg" = (
/obj/machinery/vending/snack/random,
@@ -19980,7 +19958,7 @@
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aMu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -19990,7 +19968,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aMx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -20889,27 +20867,37 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/yellowsiding,
/turf/open/floor/plasteel/redyellow/side{
dir = 9
},
/area/hallway/primary/central)
"aOn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/stairs/left,
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/area/hallway/primary/central)
"aOo" = (
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/area/hallway/primary/central)
"aOp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/stairs/right,
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/area/hallway/primary/central)
"aOq" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/yellowsiding,
/turf/open/floor/plasteel/redyellow/side{
dir = 5
},
/area/hallway/primary/central)
"aOr" = (
/obj/structure/sign/directions/engineering{
@@ -27351,7 +27339,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bbQ" = (
/obj/machinery/vending/kink,
/turf/open/floor/wood{
broken = 1;
icon_state = "wood-broken5"
@@ -31948,7 +31935,7 @@
dir = 8;
network = list("SS13")
},
/turf/open/floor/plasteel/stairs/right,
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/primary/central)
"bli" = (
/obj/structure/closet/firecloset,
@@ -31973,7 +31960,7 @@
c_tag = "Central Diner 4";
dir = 1
},
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"blk" = (
/obj/machinery/camera{
@@ -33203,7 +33190,7 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"bxH" = (
/obj/effect/landmark/event_spawn,
@@ -33231,7 +33218,7 @@
/area/crew_quarters/dorms)
"bxL" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/bar,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"bxM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -35873,52 +35860,6 @@
"sPY" = (
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"sPZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/stairs/right,
/area/hallway/primary/central)
"sQa" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm4";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"sQb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm1";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"sQc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm2";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
(1,1,1) = {"
aaa
@@ -71747,7 +71688,7 @@ agF
auP
avU
anH
sPZ
axC
axC
axC
aAC
@@ -73551,7 +73492,7 @@ ayz
azD
aAH
aBQ
sQb
azD
aDG
aEO
sDl
@@ -74319,10 +74260,10 @@ apI
awQ
axJ
ayB
sQa
azD
aAH
aBS
sQc
azD
ayz
aEQ
sDl
+36 -52
View File
@@ -3148,7 +3148,7 @@
/turf/open/space,
/area/space/nearstation)
"ajB" = (
/obj/machinery/vending/kink,
/obj/item/storage/box/mousetraps,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"ajC" = (
@@ -3536,7 +3536,6 @@
/area/maintenance/department/security/brig)
"aks" = (
/obj/machinery/light/small,
/obj/item/storage/box/mousetraps,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"akt" = (
@@ -15381,13 +15380,13 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Cargo Warehouse APC";
pixel_x = 24
areastring = "/area/quartermaster/warehouse";
pixel_x = 26
},
/obj/structure/cable,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aMw" = (
@@ -36022,10 +36021,11 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
"bHS" = (
/obj/structure/table,
/obj/item/device/flashlight/lamp,
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
},
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
"bHT" = (
@@ -36575,8 +36575,6 @@
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
/obj/structure/table,
/obj/item/device/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
"bJi" = (
@@ -47189,7 +47187,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"clm" = (
/obj/machinery/vending/kink,
/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/dark,
/area/library)
"cln" = (
@@ -51298,20 +51296,6 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cCX" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"cCY" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/maintenance/department/cargo)
"cCZ" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"cDa" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -51320,7 +51304,7 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cDb" = (
"cCY" = (
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -51329,7 +51313,7 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cDc" = (
"cCZ" = (
/obj/structure/cable{
icon_state = "1-2"
},
@@ -51339,6 +51323,15 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"cDa" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDb" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDc" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDd" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
@@ -51372,15 +51365,6 @@
"cDn" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDo" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDp" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
"cDq" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
(1,1,1) = {"
aaa
@@ -79040,7 +79024,7 @@ cCF
cCH
bTn
bPB
cCZ
bDi
bVC
bQj
bPA
@@ -88713,7 +88697,7 @@ aaa
aaa
aaa
aiU
cCX
ajv
aju
ajt
alQ
@@ -90804,12 +90788,12 @@ aEd
aIj
aJm
aKg
cDd
cDa
aMo
cDd
cDf
cDg
cDi
cDj
cDk
cDh
aLg
aTj
aUu
@@ -91837,8 +91821,8 @@ aMs
aNO
aPb
aQe
cDl
cDm
cDi
cDj
aTn
aUx
aVA
@@ -92095,7 +92079,7 @@ aNP
aPb
aNO
aNP
cDn
cDk
aTo
aSk
aTm
@@ -92352,7 +92336,7 @@ aNO
aPc
aQf
aRq
cDo
cDl
aTp
aSk
aTm
@@ -92609,7 +92593,7 @@ aNQ
aNO
aQg
aNP
cDp
cDm
aTq
aSk
aVB
@@ -92859,14 +92843,14 @@ aEd
aEd
aEd
aEd
cDa
cCX
cDb
cDc
cDe
cDf
cDh
coL
coL
coL
cDq
cDn
aTr
aUy
aPd
@@ -93116,7 +93100,7 @@ aGI
aHr
aEd
aJp
cDb
cCY
aLi
aMw
aEj
@@ -93373,7 +93357,7 @@ aGJ
aGJ
aDl
aEk
cDc
cCZ
aLj
aMx
aEj
@@ -100082,7 +100066,7 @@ aaa
aaa
aEj
bkO
cCY
bgO
bnn
bom
aEj
+97 -28
View File
@@ -88,6 +88,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/camera/autoname,
/turf/open/floor/plating,
/area/engine/engineering)
"ar" = (
@@ -605,6 +606,7 @@
/area/bridge)
"bM" = (
/obj/structure/closet/secure_closet/hop,
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/blue/side{
dir = 4
},
@@ -629,6 +631,7 @@
/area/hallway/primary/central)
"bR" = (
/obj/machinery/vending/cola,
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"bS" = (
@@ -668,6 +671,7 @@
/area/hallway/secondary/entry)
"bW" = (
/obj/structure/closet/secure_closet/hos,
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/arrival{
dir = 1
},
@@ -867,6 +871,7 @@
/area/hallway/primary/central)
"cC" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/blue/side{
dir = 1
},
@@ -1078,6 +1083,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/camera/autoname,
/obj/effect/turf_decal/plaque{
icon_state = "L11"
},
@@ -1282,6 +1288,69 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
"dS" = (
/obj/machinery/atmospherics/components/unary/tank/air,
/obj/machinery/camera/autoname,
/turf/open/floor/plating,
/area/engine/atmos)
"dT" = (
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"dU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/blue/side{
dir = 1
},
/area/hallway/primary/central)
"dV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/blue/side{
dir = 1
},
/area/hallway/primary/central)
"dW" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel,
/area/construction)
"dX" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/camera/autoname{
dir = 4
},
/turf/open/floor/plasteel,
/area/construction)
"dY" = (
/obj/machinery/camera/autoname{
dir = 8
},
/turf/open/floor/plating,
/area/storage/primary)
"dZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/camera/autoname{
dir = 1
},
/turf/open/floor/plasteel,
/area/construction)
"ea" = (
/obj/structure/table,
/obj/machinery/camera/autoname{
dir = 1
},
/turf/open/floor/plasteel,
/area/storage/primary)
(1,1,1) = {"
aa
@@ -2018,7 +2087,7 @@ dm
dy
dy
dy
dy
dX
dy
dy
dy
@@ -2107,7 +2176,7 @@ ac
ad
af
ah
am
dS
ay
aN
bb
@@ -2229,7 +2298,7 @@ cA
bE
bE
cN
cY
dW
dn
dn
dn
@@ -2321,13 +2390,13 @@ aa
ab
ac
ae
ag
ag
ag
ag
ag
ag
ag
ab
ab
ab
ab
ab
ab
ab
bu
bG
ce
@@ -2348,7 +2417,7 @@ dn
dn
dn
dn
dL
dZ
cN
af
ad
@@ -2375,19 +2444,19 @@ aa
ab
ac
ae
ag
ab
ai
an
ai
aQ
ai
ag
ab
bv
bH
cf
cq
bv
cD
dU
bE
bE
cR
@@ -2429,19 +2498,19 @@ aa
ab
ac
ae
ag
ab
ai
ao
aA
aR
ai
ag
ab
bv
bI
cf
cq
bu
cD
dV
bE
bE
cN
@@ -2483,13 +2552,13 @@ aa
ab
ac
ae
ag
ag
ag
ab
ab
ab
aB
ag
ag
ag
ab
ab
ab
bv
bJ
cf
@@ -2539,9 +2608,9 @@ ac
ae
ac
ac
ag
ab
aB
ag
ab
ac
ac
bv
@@ -3050,7 +3119,7 @@ dB
dl
dE
dJ
dN
ea
cS
af
ad
@@ -3241,7 +3310,7 @@ ac
ad
af
ak
av
dT
aK
av
bi
@@ -3368,7 +3437,7 @@ dx
dl
dl
dl
dl
dY
dl
dl
dl
+1 -1
View File
@@ -1,5 +1,5 @@
{
"map_name": "MetaStation",
"map_path": "map_files/MetaStation",
"map_path": "cit_map_files/MetaStation",
"map_file": "MetaStation.dmm"
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"map_name": "OmegaStation",
"map_path": "map_files/OmegaStation",
"map_path": "cit_map_files/OmegaStation",
"map_file": "OmegaStation.dmm"
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"map_name": "PubbyStation",
"map_path": "map_files/PubbyStation",
"map_path": "cit_map_files/PubbyStation",
"map_file": "PubbyStation.dmm"
}
-1
View File
@@ -1 +0,0 @@
#define FORCE_MAP "_maps/tgstation2.json"
-7
View File
@@ -1,7 +0,0 @@
{
"map_name": "Box Station",
"map_path": "map_files/TgStation",
"map_file": "tgstation.2.1.3.dmm",
"minetype": "lavaland",
"transition_config": "default"
}
+1 -1
View File
@@ -339,7 +339,7 @@
name = "Bananium"
id = MAT_BANANIUM
sheet_type = /obj/item/stack/sheet/mineral/bananium
coin_type = /obj/item/coin/clown
coin_type = /obj/item/coin/bananium
/datum/material/titanium
name = "Titanium"
+4
View File
@@ -1256,6 +1256,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Research Division"
icon_state = "medresearch"
/area/science/circuit
name = "Circuitry Lab"
icon_state = "cir_lab"
/area/science/research/lobby
name = "Research Division Lobby"
icon_state = "medresearch"
+2 -2
View File
@@ -226,14 +226,14 @@
opacity = 0
glass = TRUE
/obj/machinery/door/airlock/clown
/obj/machinery/door/airlock/bananium
name = "bananium airlock"
desc = "Honkhonkhonk"
icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_bananium
doorOpen = 'sound/items/bikehorn.ogg'
/obj/machinery/door/airlock/clown/glass
/obj/machinery/door/airlock/bananium/glass
opacity = 0
glass = TRUE
@@ -231,20 +231,20 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
*/
/obj/item/stack/sheet/mineral/bananium
name = "bananium"
icon_state = "sheet-clown"
icon_state = "sheet-bananium"
singular_name = "bananium sheet"
sheettype = "clown"
sheettype = "bananium"
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
novariants = TRUE
grind_results = list("banana" = 20)
GLOBAL_LIST_INIT(clown_recipes, list ( \
GLOBAL_LIST_INIT(bananium_recipes, list ( \
new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/bananium/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.clown_recipes
recipes = GLOB.bananium_recipes
. = ..()
/*
@@ -206,9 +206,9 @@
desc = "Honk."
icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
base_name = "bananium airlock"
airlock_type = /obj/machinery/door/airlock/clown
airlock_type = /obj/machinery/door/airlock/bananium
mineral = "bananium"
glass_type = /obj/machinery/door/airlock/clown/glass
glass_type = /obj/machinery/door/airlock/bananium/glass
/obj/structure/door_assembly/door_assembly_sandstone
name = "sandstone airlock assembly"
+3 -3
View File
@@ -261,14 +261,14 @@
if(exposed_temperature > 300)
burnbabyburn()
/obj/structure/falsewall/clown
/obj/structure/falsewall/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
icon_state = "bananium"
mineral = /obj/item/stack/sheet/mineral/bananium
walltype = /turf/closed/wall/mineral/clown
canSmoothWith = list(/obj/structure/falsewall/clown, /turf/closed/wall/mineral/clown)
walltype = /turf/closed/wall/mineral/bananium
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
/obj/structure/falsewall/sandstone
+2 -2
View File
@@ -322,12 +322,12 @@
defer_change = 1
/turf/closed/mineral/clown
/turf/closed/mineral/bananium
mineralType = /obj/item/ore/bananium
mineralAmt = 3
spreadChance = 0
spread = 0
scan_state = "rock_Clown"
scan_state = "rock_Bananium"
/turf/closed/mineral/bscrystal
@@ -34,13 +34,13 @@
explosion_block = 3
canSmoothWith = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond)
/turf/closed/wall/mineral/clown
/turf/closed/wall/mineral/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
icon_state = "bananium"
sheet_type = /obj/item/stack/sheet/mineral/bananium
canSmoothWith = list(/turf/closed/wall/mineral/clown, /obj/structure/falsewall/clown)
canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium)
/turf/closed/wall/mineral/sandstone
name = "sandstone wall"
@@ -250,7 +250,7 @@
/turf/closed/wall/mineral/plastitanium/overspace
icon_state = "map-overspace"
fixed_underlay = list("space"=1)
/turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity)
var/datum/explosion/acted_explosion = null
for(var/datum/explosion/E in GLOB.explosions)
+1 -1
View File
@@ -403,7 +403,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
if(newauthor)
scanner.cache.author = newauthor
if(href_list["setcategory"])
var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion")
var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion", "Technical")
if(newcategory)
upload_category = newcategory
if(href_list["upload"])
+1 -1
View File
@@ -364,7 +364,7 @@
value = 80
materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT*0.2)
/obj/item/coin/clown
/obj/item/coin/bananium
name = "bananium coin"
cmineral = "bananium"
icon_state = "coin_bananium_heads"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB