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
+3 -3
View File
@@ -190,7 +190,7 @@
playsound(loc, I.usesound, 75, 1)
user << "<span class='notice'> You begin to disassemble [src]...</span>"
if(do_after(user, 40*I.toolspeed, target = src))
if(qdeleted(src))
if(QDELETED(src))
return
var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount)
@@ -233,7 +233,7 @@
/obj/structure/window/deconstruct(disassembled = TRUE)
if(qdeleted(src))
if(QDELETED(src))
return
if(!disassembled)
playsound(src, "shatter", 70, 1)
@@ -335,7 +335,7 @@
//merges adjacent full-tile windows into one
/obj/structure/window/update_icon()
if(!qdeleted(src))
if(!QDELETED(src))
if(!fulltile)
return