Merge pull request #512 from Markolie/master

Fix player panel, other fixes
This commit is contained in:
ZomgPonies
2015-03-04 10:23:36 -05:00
8 changed files with 26 additions and 14 deletions
+9 -5
View File
@@ -3,13 +3,19 @@
#define GC_FORCE_DEL_PER_TICK 60
//#define GC_DEBUG
var/list/gc_hard_del_types = new
var/list/gc_hard_del_types = list()
var/datum/garbage_collector/garbageCollector
/client/proc/gc_dump_hdl()
set name = "(GC) Hard Del List"
set desc = "List types that are hard del()'d by the GC."
set category = "Debug"
if(!check_rights(R_DEBUG))
return
if(!gc_hard_del_types || !gc_hard_del_types.len)
usr << "<span class='notice'>No hard del()'d types found.</span>"
for(var/A in gc_hard_del_types)
usr << "[A] = [gc_hard_del_types[A]]"
@@ -60,8 +66,7 @@ var/datum/garbage_collector/garbageCollector
#endif
AM.hard_deleted = 1
if(!AM.type in gc_hard_del_types)
gc_hard_del_types += AM.type
gc_hard_del_types |= AM.type
del AM
hard_dels++
@@ -95,8 +100,7 @@ var/datum/garbage_collector/garbageCollector
if(!istype(AM))
WARNING("qdel() passed object of type [AM.type]. qdel() can only handle /atom/movable types.")
if(!AM.type in gc_hard_del_types)
gc_hard_del_types += AM.type
gc_hard_del_types |= AM.type
del(AM)
garbageCollector.hard_dels++
garbageCollector.dels_count++
+2 -2
View File
@@ -72,11 +72,11 @@ datum/mind
if(current) //remove ourself from our old body's mind variable
current.mind = null
nanomanager.user_transferred(current, new_character)
if(new_character.mind) //remove any mind currently in our new body's mind variable
new_character.mind.current = null
nanomanager.user_transferred(current, new_character)
current = new_character //link ourself to our new body
new_character.mind = src //and link our new body to ourself
+1 -1
View File
@@ -30,7 +30,7 @@
/mob/camera/blob/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
del(ghostimage)
ghostimage = null;
updateallghostimages()
+10 -2
View File
@@ -873,7 +873,9 @@ About the new airlock wires panel:
if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) )
return 0
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(istype(src, /obj/machinery/door/airlock/glass))
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
@@ -902,8 +904,14 @@ About the new airlock wires panel:
return
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(istype(src, /obj/machinery/door/airlock/glass))
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/mime))
// Do nothing
else
playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
for(var/turf/turf in locs)
+1 -1
View File
@@ -89,7 +89,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
/mob/dead/observer/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
del(ghostimage)
ghostimage = null
updateallghostimages()
..()
+1 -1
View File
@@ -160,7 +160,7 @@ var/list/ai_verbs_default = list(
if(!safety)//Only used by AIize() to successfully spawn an AI.
if (!B)//If there is no player/brain inside.
new/obj/structure/AIcore/deactivated(loc)//New empty terminal.
del(src)//Delete AI.
qdel(src)//Delete AI.
return
else
if (B.brainmob.mind)
@@ -26,7 +26,7 @@
/mob/aiEye/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
del(ghostimage)
ghostimage = null;
updateallghostimages()
+1 -1
View File
@@ -220,7 +220,7 @@
*/
/datum/nanomanager/proc/user_transferred(var/mob/oldMob, var/mob/newMob)
//testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]")
if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
if (!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
//testing("nanomanager/user_transferred mob [oldMob.name] has no open uis")
return 0 // has no open uis