diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 762da8f5c1e..65bf834f673 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -644,7 +644,10 @@ Auto Patrol: []"}, src.threatlevel = src.assess_perp(C) else if((src.idcheck) && (istype(C, /mob/living/carbon/monkey))) src.threatlevel = 4 - + else + continue + else + continue /* else if(istype(M, /mob/living/simple_animal/hostile)) if(M.stat == DEAD) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 5e663c34981..698d6725066 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1318,8 +1318,8 @@ proc/formatLocation(location) loc = get_turf(location) var/area/A = get_area(location) - - return "[A.name] - [loc.x],[loc.y],[loc.z]" + var/answer = "[istype(A) ? "[A.name]" : "UNKNOWN"] - [istype(loc) ? "[loc.x],[loc.y],[loc.z]" : "UNKNOWN"]" + return answer proc/formatPlayerPanel(var/mob/U,var/text="PP") return "[text]" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index efc84c16cc6..b720b9d8a50 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -14,7 +14,7 @@ /obj/item/clothing/shoes/syndigaloshes/New() ..() - for(var/Type in typesof(/obj/item/clothing/shoes) - /obj/item/clothing/shoes) + for(var/Type in typesof(/obj/item/clothing/shoes) - list(/obj/item/clothing/shoes, /obj/item/clothing/shoes/syndigaloshes)) clothing_choices += new Type return diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 2e85ab5194b..6151ac64203 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -603,7 +603,7 @@ var/global/list/organ_damage_overlays = list( // This was OP. //environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount) if(environment) - if((environment.oxygen / environment.total_moles()) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing? + if(enviroment.oxygen && enviroment.total_moles() && (environment.oxygen / environment.total_moles()) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing? if(!on_fire) src << "Your body reacts with the atmosphere and bursts into flame!" adjust_fire_stacks(0.5) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 6f02b6b4f85..ac0c1d0d1c2 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -583,8 +583,9 @@ Note that amputating the affected organ does in fact remove the infection from t organ= new /obj/item/weapon/organ/head(owner.loc, owner) var/datum/organ/internal/brain/B = owner.internal_organs_by_name["brain"] var/obj/item/weapon/organ/head/H = organ - H.organ_data = B - B.organ_holder = organ + if(B) + H.organ_data = B + B.organ_holder = organ owner.internal_organs_by_name["brain"] = null owner.internal_organs_by_name -= "brain" owner.internal_organs -= B diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index acfd0c03435..b1bb6204e0f 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -869,7 +869,7 @@ malfai.malfhack = src malfai.malfhacking = 1 sleep(600) - if(src) + if(src && malfai) if (!src.aidisabled) malfai.malfhack = null malfai.malfhacking = 0 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 46217d074b3..89f825b8ca0 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -30,7 +30,7 @@ icon_state = "[initial(icon_state)][stored_magazine ? "-[stored_magazine.max_ammo]" : ""][chambered ? "" : "-e"]" return -/obj/item/weapon/gun/projectile/automatic/Fire() +/obj/item/weapon/gun/projectile/automatic/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0) if(burstfire == 1) if(ready_to_fire()) fire_delay = 0 diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index 7b364e8cdab..54ae509950c 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -297,7 +297,7 @@ src.updateUsrDialog() return -/obj/item/weapon/gun/dartgun/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0) +/obj/item/weapon/gun/dartgun/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0) if(cartridge) spawn(0) fire_dart(target,user) else diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index cd2dbd0a6d2..696a29b604b 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -47,7 +47,7 @@ /obj/item/weapon/gun/syringe/can_hit(var/mob/living/target as mob, var/mob/living/user as mob) return 1 //SHOOT AND LET THE GOD GUIDE IT (probably will hit a wall anyway) -/obj/item/weapon/gun/syringe/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0) +/obj/item/weapon/gun/syringe/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0) if(syringes.len) spawn(0) fire_syringe(target,user) else