TG sync Sunday (#201)

* 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
+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{