diff --git a/code/datums/diseases/alien_embryo.dm b/code/datums/diseases/alien_embryo.dm index 1008c7f54b4..fe1f3bff51c 100644 --- a/code/datums/diseases/alien_embryo.dm +++ b/code/datums/diseases/alien_embryo.dm @@ -58,7 +58,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) diff --git a/code/datums/diseases/robotic_transformation.dm b/code/datums/diseases/robotic_transformation.dm index d68952d9a0b..34b074e34f4 100644 --- a/code/datums/diseases/robotic_transformation.dm +++ b/code/datums/diseases/robotic_transformation.dm @@ -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) diff --git a/code/datums/diseases/xeno_transformation.dm b/code/datums/diseases/xeno_transformation.dm index f3a822fb952..9d3289708ff 100644 --- a/code/datums/diseases/xeno_transformation.dm +++ b/code/datums/diseases/xeno_transformation.dm @@ -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) diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 7909d6cd475..12bbedfc673 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -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) diff --git a/code/defines/procs/icon_procs.dm b/code/defines/procs/icon_procs.dm index 3069645c828..16245997006 100644 --- a/code/defines/procs/icon_procs.dm +++ b/code/defines/procs/icon_procs.dm @@ -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 diff --git a/code/game/hud.dm b/code/game/hud.dm index 24741b333e7..2d8174b37cb 100644 --- a/code/game/hud.dm +++ b/code/game/hud.dm @@ -78,7 +78,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 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d4c83378534..f0f47032ba4 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -194,7 +194,7 @@ if(part) parts[i] = part //debug below - ASSERT(istype(parts[i],/obj/item)) + if(!istype(parts[i],/obj/item)) return 0 return diff --git a/code/modules/chemical/Chemistry-Machinery.dm b/code/modules/chemical/Chemistry-Machinery.dm index 1d4184cee6d..809ce4300d9 100644 --- a/code/modules/chemical/Chemistry-Machinery.dm +++ b/code/modules/chemical/Chemistry-Machinery.dm @@ -388,24 +388,23 @@ if (href_list["create_vaccine"]) if(!src.wait) var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc) - var/vaccine_type = text2path(href_list["create_vaccine"])//the path is received as string - converting - var/datum/disease/D = new vaccine_type - var/name = input(usr,"Name:","Name the vaccine",D.name) - if(!name || name == " ") name = D.name if(B) - B.name = "[name] vaccine bottle" - B.reagents.add_reagent("vaccine",15,vaccine_type) - del(D) - wait = 1 - var/datum/reagents/R = beaker.reagents - var/datum/reagent/blood/Blood = null - for(var/datum/reagent/blood/L in R.reagent_list) - if(L) - Blood = L - break - var/list/res = Blood.data["resistances"] - spawn(res.len*500) - src.wait = null + var/vaccine_type = text2path(href_list["create_vaccine"])//the path is received as string - converting + var/datum/disease/D = new vaccine_type + if(D) + B.name = "[D.name] vaccine bottle" + B.reagents.add_reagent("vaccine",15,vaccine_type) + del(D) + wait = 1 + var/datum/reagents/R = beaker.reagents + var/datum/reagent/blood/Blood = null + for(var/datum/reagent/blood/L in R.reagent_list) + if(L) + Blood = L + break + var/list/res = Blood.data["resistances"] + spawn(res.len*500) + src.wait = null else src.temphtml = "The replicator is not ready yet." src.updateUsrDialog() diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index fa6178bdee2..ae45eb779b4 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -268,6 +268,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(!linked_destroy.hacked) if(!linked_destroy.loaded_item) usr <<"\red The destructive analyzer appears to be empty." + screen = 1.0 return if(linked_destroy.loaded_item.reliability >= 90) var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)