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
@@ -258,4 +258,4 @@
if(!wet && wet_time)
wet_time = 0
if(wet)
addtimer(CALLBACK(src, .proc/HandleWet), 15)
addtimer(CALLBACK(src, .proc/HandleWet), 15, TIMER_UNIQUE)
+4 -4
View File
@@ -55,7 +55,7 @@
/turf/open/chasm/proc/drop(atom/movable/AM)
//Make sure the item is still there after our sleep
if(!AM || qdeleted(AM))
if(!AM || QDELETED(AM))
return
var/turf/T = locate(drop_x, drop_y, drop_z)
@@ -84,7 +84,7 @@
/turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
//Make sure the item is still there after our sleep
if(!AM || qdeleted(AM))
if(!AM || QDELETED(AM))
return
AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>You stumble and stare into an abyss before you. It stares back, and you fall \
into the enveloping dark.</span>")
@@ -96,13 +96,13 @@
animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
for(var/i in 1 to 5)
//Make sure the item is still there after our sleep
if(!AM || qdeleted(AM))
if(!AM || QDELETED(AM))
return
AM.pixel_y--
sleep(2)
//Make sure the item is still there after our sleep
if(!AM || qdeleted(AM))
if(!AM || QDELETED(AM))
return
if(iscyborg(AM))
@@ -199,6 +199,6 @@
. = ..()
//Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
for(var/obj/structure/spacevine/SV in src)
if(!qdestroying(SV))//Helps avoid recursive loops
if(!QDESTROYING(SV))//Helps avoid recursive loops
qdel(SV)
UpdateAffectingLights()
+1 -3
View File
@@ -21,7 +21,7 @@
var/explosion_level = 0 //for preventing explosion dodging
var/explosion_id = 0
var/list/decals
/turf/New()
@@ -426,8 +426,6 @@
return T
/turf/handle_fall(mob/faller, forced)
if(!faller)
return
faller.lying = pick(90, 270)
if(!forced)
return