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
@@ -241,7 +241,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
/obj/effect/proc_holder/spell/proc/start_recharge()
if(action)
action.UpdateButtonIcon()
while(charge_counter < charge_max && !qdeleted(src))
while(charge_counter < charge_max && !QDELETED(src))
sleep(1)
charge_counter++
if(action)
+1 -1
View File
@@ -65,7 +65,7 @@
cooldown_min = 10
/obj/effect/proc_holder/spell/targeted/conjure_item/cast(list/targets, mob/user = usr)
if (item && !qdeleted(item))
if (item && !QDELETED(item))
qdel(item)
item = null
else
@@ -41,4 +41,4 @@
for(var/mob/C in targets)
if(!C.client)
continue
C.client.view = input("Select view range:", "Range", 4) in ranges
C.client.change_view(input("Select view range:", "Range", 4) in ranges)
@@ -54,7 +54,7 @@
new jaunt_in_type(mobloc, holder.dir)
sleep(jaunt_in_time)
qdel(holder)
if(!qdeleted(target))
if(!QDELETED(target))
if(mobloc.density)
for(var/direction in alldirs)
var/turf/T = get_step(mobloc, direction)
+1 -1
View File
@@ -24,7 +24,7 @@
target.dna.add_mutation(A)
target.disabilities |= disabilities
spawn(duration)
if(target && !qdeleted(target))
if(target && !QDELETED(target))
for(var/A in mutations)
target.dna.remove_mutation(A)
target.disabilities &= ~disabilities
+1 -1
View File
@@ -55,7 +55,7 @@
charge_counter = charge_max
return
if(!marked_item || qdeleted(marked_item)) //Wait nevermind
if(!marked_item || QDELETED(marked_item)) //Wait nevermind
M << "<span class='warning'>Your phylactery is gone!</span>"
return
+2 -1
View File
@@ -28,6 +28,7 @@
var/max_distance = 13
var/mob/living/wizard
var/turf/start_turf
notify = FALSE
/obj/effect/immovablerod/wizard/Move()
if(get_dist(start_turf, get_turf(src)) >= max_distance)
@@ -39,4 +40,4 @@
wizard.status_flags &= ~GODMODE
wizard.notransform = 0
wizard.forceMove(get_turf(src))
return ..()
return ..()
@@ -43,7 +43,7 @@
name = "Instant Summons"
marked_item = null
else if(marked_item && qdeleted(marked_item)) //the item was destroyed at some point
else if(marked_item && QDELETED(marked_item)) //the item was destroyed at some point
message = "<span class='warning'>You sense your marked item has been destroyed!</span>"
name = "Instant Summons"
marked_item = null