Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
This commit is contained in:
Poojawa
2017-02-12 03:56:14 -06:00
committed by GitHub
parent 30b3dff395
commit 6674f9fc15
153 changed files with 1651 additions and 1368 deletions
+91 -120
View File
@@ -20993,6 +20993,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/chair/stool,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aMI" = (
@@ -24027,6 +24028,7 @@
/area/crew_quarters/bar/atrium)
"aRI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair/stool,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aRJ" = (
@@ -78208,7 +78210,7 @@
/turf/closed/wall,
/area/maintenance/electrical)
"cHL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
tag = "icon-manifold (NORTH)";
icon_state = "manifold";
dir = 1
@@ -107878,15 +107880,6 @@
pixel_y = 3
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/doorButtons/access_button{
dir = 1;
idDoor = "virology_airlock_exterior";
idSelf = "virology_airlock_control";
name = "Virology Access Button";
pixel_x = 0;
pixel_y = -24;
req_access_txt = "39"
},
/turf/open/floor/plasteel/whitegreen/corner{
dir = 8
},
@@ -108190,6 +108183,15 @@
name = "Virology Exterior Airlock";
req_access_txt = "39"
},
/obj/machinery/doorButtons/access_button{
dir = 1;
idDoor = "virology_airlock_exterior";
idSelf = "virology_airlock_control";
name = "Virology Access Button";
pixel_x = -24;
pixel_y = -2;
req_access_txt = "39"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -108660,6 +108662,12 @@
/turf/open/floor/plating,
/area/medical/virology)
"dKi" = (
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-21";
layer = 4.1;
pixel_x = -3;
pixel_y = 3
},
/turf/open/floor/plasteel/whitegreen/corner{
dir = 1
},
@@ -109068,6 +109076,14 @@
name = "Virology Interior Airlock";
req_access_txt = "39"
},
/obj/machinery/doorButtons/access_button{
idDoor = "virology_airlock_interior";
idSelf = "virology_airlock_control";
name = "Virology Access Button";
pixel_x = 0;
pixel_y = 22;
req_access_txt = "39"
},
/turf/open/floor/plasteel,
/area/medical/virology)
"dKZ" = (
@@ -118113,8 +118129,8 @@
},
/area/crew_quarters/electronic_marketing_den)
"ecc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/obj/structure/closet/wardrobe/grey,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/electronic_marketing_den)
"ecd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -118148,23 +118164,29 @@
/turf/open/floor/plasteel,
/area/hydroponics/Abandoned_Garden)
"ech" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
scrub_Toxins = 0
/obj/machinery/button/door{
id = "Dorm2";
name = "Dormitory Door Lock";
normaldoorcontrol = 1;
pixel_x = -26;
pixel_y = 7;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics/Abandoned_Garden)
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"eci" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
tag = "icon-manifold (EAST)";
icon_state = "manifold";
dir = 4
/obj/machinery/button/door{
id = "Dorm4";
name = "Dormitory Door Lock";
normaldoorcontrol = 1;
pixel_x = -26;
pixel_y = 7;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics/Abandoned_Garden)
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"ecj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/hydrofloor,
@@ -118500,102 +118522,51 @@
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"ecc" = (
/obj/structure/closet/wardrobe/green,
/turf/open/floor/plasteel/neutral/side,
/area/shuttle/arrival)
"ecd" = (
/obj/machinery/doorButtons/access_button{
"edc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/crew_quarters/electronic_marketing_den)
"edd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
idDoor = "virology_airlock_interior";
idSelf = "virology_airlock_control";
name = "Virology Access Button";
pixel_x = -10;
pixel_y = 0;
req_access_txt = "39"
on = 1;
scrub_Toxins = 0
},
/turf/closed/wall/r_wall,
/area/medical/virology)
"ece" = (
/obj/structure/cable/white{
d2 = 2;
icon_state = "0-2";
tag = "icon-0-2"
},
/turf/closed/wall/r_wall,
/area/medical/virology)
"ecf" = (
/obj/structure/cable/white{
tag = "icon-4-8";
icon_state = "4-8"
},
/obj/structure/cable/white{
tag = "icon-2-4";
icon_state = "2-4"
},
/obj/structure/cable/white{
tag = "icon-1-4";
icon_state = "1-4"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics/Abandoned_Garden)
"ede" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
tag = "icon-manifold (EAST)";
icon_state = "manifold";
dir = 4
},
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics/Abandoned_Garden)
"edf" = (
/obj/structure/table/wood,
/obj/item/clothing/head/hardhat/cakehat,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"edg" = (
/obj/machinery/doorButtons/airlock_controller{
idExterior = "virology_airlock_exterior";
idInterior = "virology_airlock_interior";
idSelf = "virology_airlock_control";
name = "Virology Access Console";
pixel_x = 0;
pixel_y = 22;
pixel_x = -10;
pixel_y = 24;
req_access_txt = "39"
},
/obj/structure/cable/white{
tag = "icon-4-8";
icon_state = "4-8"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (WEST)"
},
/area/medical/virology)
"ecg" = (
/obj/structure/cable/white,
/turf/closed/wall/r_wall,
/area/medical/virology)
"ech" = (
/obj/machinery/button/door{
id = "Dorm2";
name = "Dormitory Door Lock";
normaldoorcontrol = 1;
pixel_x = -26;
pixel_y = 7;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"eci" = (
/obj/machinery/button/door{
id = "Dorm4";
name = "Dormitory Door Lock";
normaldoorcontrol = 1;
pixel_x = -26;
pixel_y = 7;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"ecj" = (
/obj/item/weapon/reagent_containers/food/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
/obj/item/weapon/reagent_containers/food/condiment/peppermill{
pixel_x = -8
},
/obj/structure/table/wood,
/obj/item/clothing/head/hardhat/cakehat{
pixel_x = 4;
pixel_y = 3
},
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
(1,1,1) = {"
aaa
@@ -149776,7 +149747,7 @@ aic
awb
awX
ayh
ech
edd
azo
azo
aCw
@@ -150024,7 +149995,7 @@ alb
amb
anl
aoj
ecc
edc
aUJ
ecd
asz
@@ -150033,7 +150004,7 @@ auT
awc
ecf
ecg
eci
ede
ecj
eck
aCx
@@ -155695,7 +155666,7 @@ aEf
aFB
aGX
aGY
aGY
aJA
aKZ
aMI
aGY
@@ -155950,7 +155921,7 @@ aBF
aCP
aEg
aFC
aGY
aGX
aGY
aJA
aLa
@@ -156213,9 +156184,9 @@ aJA
aLb
aMK
aGY
ecj
edf
aRH
aGY
aJA
aGY
aGZ
aYv
@@ -165305,7 +165276,7 @@ dGR
cKs
cKs
dJl
ecd
dJp
dKY
dJp
dJp
@@ -165562,9 +165533,9 @@ dGS
cDe
aaa
aaa
ece
ecf
ecg
dJp
edg
dJp
aaa
aaa
dJp
@@ -168866,8 +168837,8 @@ cEq
cGb
cHs
cvP
cCg
eci
cCg
cNS
cxw
cvP