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

TG sync Sunday (#201)

Browse Source 
* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping
This commit is contained in:
Poojawa
2017-02-06 00:36:56 -06:00
committed by GitHub
parent aeeca195c7
commit 73b6b33f79
279 changed files with 3548 additions and 2585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/caves.dmm
+1 -1
View File
@@ -2374,7 +2374,7 @@
info = "<center><b>CARAVAN SERVICES</b></center><br><center><i>Quality service since 2205</i></center><br><br><center><b>SHIPMENT CONTENTS:</b></center><br><br>4 scattershot rifles<br>6 grenades<br>1 laser rifle<br>1 blowup doll";
name = "Shipment Receipt"
},
/obj/item/organ/cyberimp/eyes/thermals,
/obj/item/organ/eyes/robotic/thermals,
/obj/item/weapon/gun/energy/laser/captain/scattershot,
/obj/item/slimepotion/fireproof,
/turf/open/floor/plating/asteroid/basalt{
_maps/map_files/BirdStation/BirdStation.dmm
+240 -234
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+20 -15
View File
@@ -29436,6 +29436,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"bbq" = (
/obj/machinery/deepfryer,
/mob/living/carbon/monkey/punpun,
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
@@ -30615,7 +30616,7 @@
"bdC" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/valve/open{
name = "SM coolant loop";
name = "SM Coolant loop";
open = 0
},
/turf/open/floor/plasteel/vault{
@@ -118363,6 +118364,10 @@
},
/turf/open/floor/wood,
/area/crew_quarters/abandoned_gambling_den)
"edb" = (
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
(1,1,1) = {"
aaa
@@ -149615,8 +149620,8 @@ ceO
cFo
cGG
ecI
ecM
ecO
ecI
ecI
cHW
cOI
cQy
@@ -149814,7 +149819,7 @@ aMs
aOb
aPG
aRu
ect
ecp
aUF
boy
boy
@@ -149871,7 +149876,7 @@ cCL
ceO
cFm
cGG
ecJ
ecI
cJI
cLo
cMY
@@ -150385,7 +150390,7 @@ cCL
ceO
cFn
cGG
ecK
ecI
cJK
cLq
cNa
@@ -150642,9 +150647,9 @@ cCK
bZD
cFn
cGG
ecL
ecN
ecP
ecI
ecI
ecI
cHW
cOM
cQI
@@ -155987,7 +155992,7 @@ aGY
aGZ
aYv
aZV
aZU
edb
bcD
bdZ
bfP
@@ -156789,8 +156794,8 @@ bWx
bYh
bZZ
ecz
ecC
ecD
ecz
ecz
ecE
ecG
cjC
@@ -157819,8 +157824,8 @@ cad
cbN
cbN
cbN
ecF
ecH
ecE
ecG
cjG
clg
cmt
@@ -158330,7 +158335,7 @@ bUO
bWC
bYl
cae
ecB
ecA
cdH
cfh
cgx
_maps/map_files/MetaStation/MetaStation.dmm
+25 -8
View File
@@ -1,5 +1,5 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//Model dictionary trimmed on: 31-01-2017 23:17 (UTC)
//Model dictionary trimmed on: 02-02-2017 02:51 (UTC)
"aaa" = (
/turf/open/space,
/area/space)
@@ -3906,6 +3906,8 @@
},
/obj/structure/rack,
/obj/item/weapon/storage/fancy/donut_box,
/obj/item/weapon/gun/energy/e_gun/dragnet,
/obj/item/weapon/gun/energy/e_gun/dragnet,
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -40955,8 +40957,6 @@
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
/obj/item/weapon/paper_bin/construction,
/obj/item/stack/cable_coil,
/turf/open/floor/plasteel,
/area/storage/art)
"bre" = (
@@ -54885,7 +54885,7 @@
},
/area/crew_quarters/kitchen)
"bOV" = (
/obj/machinery/holopad,
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -73083,7 +73083,6 @@
},
/area/crew_quarters/hor)
"ctb" = (
/obj/machinery/computer/aifixer,
/obj/structure/window/reinforced{
dir = 4
},
@@ -73095,6 +73094,7 @@
pixel_x = 0;
pixel_y = 30
},
/obj/machinery/modular_computer/console/preset/research,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -94427,6 +94427,23 @@
/obj/structure/disposaloutlet,
/turf/open/floor/plating/airless,
/area/toxins/xenobiology)
"ddD" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8;
initialize_directions = 11
},
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
/area/crew_quarters/kitchen)
"ddE" = (
/obj/effect/landmark/start{
name = "Cook"
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
(1,1,1) = {"
aaa
@@ -126198,7 +126215,7 @@ coe
cpq
cqJ
crP
cta
cuN
ctR
cuN
cvR
@@ -128230,7 +128247,7 @@ bHb
bMP
bKg
bLL
bNz
ddD
bOT
bQC
bLK
@@ -129002,7 +129019,7 @@ bBT
bKj
bLN
bLK
bOR
ddE
bQF
bNz
bSV
_maps/map_files/OmegaStation/OmegaStation.dmm
+33 -24
View File
@@ -8693,6 +8693,8 @@
pixel_x = -32;
pixel_y = 0
},
/obj/item/weapon/gun/energy/e_gun/dragnet,
/obj/item/weapon/gun/energy/e_gun/dragnet,
/turf/open/floor/plasteel/red/corner{
dir = 8
},
@@ -19615,6 +19617,7 @@
tag = "icon-4-8";
icon_state = "4-8"
},
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"aFe" = (
@@ -21721,12 +21724,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aIi" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "plasma";
name = "plasma filter";
on = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -21735,6 +21732,11 @@
tag = ""
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/trinary/filter/flipped{
tag = "icon-filter_off_f (EAST)";
icon_state = "filter_off_f";
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aIj" = (
@@ -21782,7 +21784,7 @@
/area/engine/engineering)
"aIl" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
dir = 8;
name = "Gas to Filter";
on = 1
},
@@ -27106,14 +27108,12 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQK" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
icon_state = "pump_map";
name = "Gas to Loop"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQL" = (
@@ -27126,13 +27126,12 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQM" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/obj/machinery/meter,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQN" = (
@@ -27178,15 +27177,14 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQR" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped{
tag = "icon-filter_off_f (EAST)";
icon_state = "filter_off_f";
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aQS" = (
@@ -27568,7 +27566,7 @@
/area/engine/engineering)
"aRG" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
dir = 2;
name = "Gas to Cooling Loop";
on = 1
},
@@ -27679,7 +27677,7 @@
/area/engine/engineering)
"aRQ" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 2;
dir = 1;
name = "Gas to Cooling Loop";
on = 1
},
@@ -39231,6 +39229,17 @@
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/chapel/main)
"blK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
icon_state = "pump_map";
name = "Gas to Loop"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
(1,1,1) = {"
aaa
@@ -71737,7 +71746,7 @@ aMY
aOb
aOE
aLO
aQL
blK
aRP
aSZ
aEt
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+10 -2
View File
@@ -61215,6 +61215,14 @@
/obj/item/weapon/reagent_containers/blood/random,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"cCq" = (
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"cCr" = (
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
(1,1,1) = {"
aaa
@@ -99888,7 +99896,7 @@ aRB
aSL
aTN
aVD
aVz
cCq
cAg
bak
bbz
@@ -100145,7 +100153,7 @@ aRG
aSO
aTO
aVG
aVz
cCr
aVz
bak
bbz