TG: - Fixed one of the ways the Core R&D Computer can lock up and become completely

unusable. If it gets stuck from using this method, just close the window and
click on the computer again. Fixes  issue 316 .

- Vaccine bottles from the panD.E.M.I.C. now auto-name. There was a bug where
you could very quickly create a ton of bottles which could cause clients to
crash. Fixes  issue 326 .

- Changed various ASSERT()'s to sanity ifs. ASSERT should really only be used
during debugging, not in release. Runtime prevention.
Revision: r3368
Author: 	 johnsonmt88
This commit is contained in:
Ren Erthilo
2012-05-01 00:17:29 +01:00
parent a30f3f7b72
commit e9dcbd5916
7 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -59,7 +59,7 @@
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40))
ASSERT(gibbed == 0)
if(gibbed != 0) return 0
var/list/candidates = list() // Picks a random ghost in the world to shove in the larva -- TLE
for(var/mob/dead/observer/G in world)
if(G.client)
@@ -52,7 +52,7 @@
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40)) //So everyone can feel like robot Seth Brundle
ASSERT(src.gibbed == 0)
if(src.gibbed != 0) return 0
var/turf/T = find_loc(affected_mob)
gibs(T)
src.cure(0)
+1 -1
View File
@@ -52,7 +52,7 @@
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40))
ASSERT(gibbed == 0)
if(gibbed != 0) return 0
var/turf/T = find_loc(affected_mob)
gibs(T)
src.cure(0)
+2 -2
View File
@@ -57,12 +57,12 @@ PriorityQueue
j >>= 1
Dequeue()
ASSERT(L.len)
if(!L.len) return 0
. = L[1]
Remove(1)
Remove(i)
ASSERT(i <= L.len)
if(i > L.len) return 0
L.Swap(i,L.len)
L.Cut(L.len)
if(i < L.len)
+1 -1
View File
@@ -448,7 +448,7 @@ proc
currentLayer = current:layer
if(currentLayer<0) // Special case for FLY_LAYER
ASSERT(currentLayer > -1000)
if(currentLayer <= -1000) return 0
if(pSet == 0) // Underlay
currentLayer = A.layer+currentLayer/1000
else // Overlay
+1 -1
View File
@@ -87,7 +87,7 @@ obj/hud/New(var/type = 0)
/obj/hud/proc/instantiate(var/type = 0)
mymob = loc
ASSERT(istype(mymob, /mob))
if(!istype(mymob, /mob)) return 0
if(ishuman(mymob))
human_hud(mymob.UI) // Pass the player the UI style chosen in preferences
+1 -1
View File
@@ -198,7 +198,7 @@
if(part)
parts[i] = part
//debug below
ASSERT(istype(parts[i],/obj/item))
if(!istype(parts[i],/obj/item)) return 0
return