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
@@ -34,7 +34,7 @@
var/target_area
target_area = input("Area to land", "Select a Landing Zone", target_area) in teleportlocs
var/area/picked_area = teleportlocs[target_area]
if(!src || qdeleted(src))
if(!src || QDELETED(src))
return
var/turf/T = safepick(get_area_turfs(picked_area))
+1 -1
View File
@@ -64,7 +64,7 @@
return
switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1))
if(0)
usr << "<span class='notice'>Shuttle received message and will be sent shortly.</span>"
say("Shuttle departing. Please stand away from the doors.")
if(1)
usr << "<span class='warning'>Invalid shuttle requested.</span>"
else