FUCKing runtimes

This commit is contained in:
D3athrow
2015-07-03 19:01:34 -05:00
parent 2e0b424014
commit 257b09d586
7 changed files with 16 additions and 6 deletions

View File

@@ -62,7 +62,7 @@ var/global/list/pooledvariables = new
world << text("DEBUG_DATUM_POOL: returnToPool([]) exceeds [] discarding...", D.type, MAINTAINING_DATUM_POOL_COUNT) world << text("DEBUG_DATUM_POOL: returnToPool([]) exceeds [] discarding...", D.type, MAINTAINING_DATUM_POOL_COUNT)
#endif #endif
var/list/pool = masterdatumPool["[D.type]"] var/list/pool = masterdatumPool["[D.type]"]
pool.Cut(End=1) //LET IT GO. LET IT GOOOOOO. pool.Cut(1,2) //LET IT GO. LET IT GOOOOOO. AKA REMOVE THE OLDEST ENTRY
return return
if(isnull(masterdatumPool["[D.type]"])) if(isnull(masterdatumPool["[D.type]"]))
masterdatumPool["[D.type]"] = list() masterdatumPool["[D.type]"] = list()

View File

@@ -40,10 +40,10 @@ var/global/list/blood_list = list()
/obj/effect/decal/cleanable/blood/resetVariables() /obj/effect/decal/cleanable/blood/resetVariables()
Destroy() Destroy()
..("viruses","virus2", "blood_DNA", "random_icon_states", args)
viruses = list() viruses = list()
virus2 = list() virus2 = list()
blood_DNA = list() blood_DNA = list()
..("viruses","virus2", "blood_DNA", "random_icon_states", args)
/obj/effect/decal/cleanable/blood/New() /obj/effect/decal/cleanable/blood/New()
..() ..()

View File

@@ -160,7 +160,8 @@ var/global/list/image/fluidtrack_cache=list()
updated=1 updated=1
dirs |= comingdir|realgoing dirs |= comingdir|realgoing
blood_DNA |= DNA.Copy() if(istype(DNA,/list))
blood_DNA |= DNA.Copy()
if(updated) if(updated)
update_icon() update_icon()

View File

@@ -21,7 +21,7 @@
set category = "Fun" set category = "Fun"
set name = "Play Local Sound" set name = "Play Local Sound"
if(!check_rights(R_SOUNDS)) return if(!check_rights(R_SOUNDS)) return
if(!istype(S)) S = sound(S)
log_admin("[key_name(src)] played a local sound [S]") log_admin("[key_name(src)] played a local sound [S]")
message_admins("[key_name_admin(src)] played a local sound [S]", 1) message_admins("[key_name_admin(src)] played a local sound [S]", 1)
S.status = SOUND_STREAM | SOUND_UPDATE S.status = SOUND_STREAM | SOUND_UPDATE

View File

@@ -14,6 +14,7 @@
update_light() update_light()
/atom/proc/update_light() /atom/proc/update_light()
if(gcDestroyed) return
if(!light_power || !light_range) if(!light_power || !light_range)
if(light) if(light)
light.destroy() light.destroy()

View File

@@ -54,6 +54,9 @@
..(new_loc, "Muton") ..(new_loc, "Muton")
/mob/living/carbon/human/generate_static_overlay() /mob/living/carbon/human/generate_static_overlay()
if(!istype(static_overlays,/list))
static_overlays = list()
static_overlays.Add(list("static", "blank", "letter"))
var/image/static_overlay = image(icon('icons/effects/effects.dmi', "static"), loc = src) var/image/static_overlay = image(icon('icons/effects/effects.dmi', "static"), loc = src)
static_overlay.override = 1 static_overlay.override = 1
static_overlays["static"] = static_overlay static_overlays["static"] = static_overlay

View File

@@ -203,8 +203,13 @@
var/obj/item/weapon/organ/head/B = tool var/obj/item/weapon/organ/head/B = tool
if (B.brainmob.mind) if (B.brainmob.mind)
B.brainmob.mind.transfer_to(target) B.brainmob.mind.transfer_to(target)
var/datum/organ/internal/I = B.organ_data
var/datum/organ/internal/brain/copied = I.Copy() var/datum/organ/internal/brain/copied
if(B.organ_data)
var/datum/organ/internal/I = B.organ_data
copied = I.Copy()
else
copied = new
copied.owner = target copied.owner = target
target.internal_organs_by_name["brain"] = copied target.internal_organs_by_name["brain"] = copied
target.internal_organs += copied target.internal_organs += copied