diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index d7f8966bed..7b7298f31c 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -746,10 +746,11 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl for(var/i = 0, i[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:" else world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" - robo.laws.show_laws(world) + + if(robo) //How the hell do we lose robo between here and the world messages directly above this? + robo.laws.show_laws(world) mode.declare_completion()//To declare normal completion. diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 45a897d398..68c71aeff1 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -165,7 +165,7 @@ return ..() - +/* //Testing purposes only! /obj/item/weapon/meteorgun name = "Meteor Gun" @@ -174,7 +174,7 @@ icon_state = "lasercannon" item_state = "gun" -/obj/item/weapon/attack_self() +/obj/item/weapon/meteorgun/attack_self() var/start_x = usr.loc.x var/start_y = usr.loc.y var/start_z = usr.loc.z @@ -209,4 +209,5 @@ spawn(0) walk_towards(M, M.dest, 1) - return \ No newline at end of file + return +*/ \ No newline at end of file diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 0d2ad8387c..7fcdb63973 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -222,7 +222,7 @@ /obj/machinery/shieldgen/process() if(malfunction && active) - if(deployed_shields && prob(5)) + if(deployed_shields.len && prob(5)) del(pick(deployed_shields)) return diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 70e744d595..548ba32ea6 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -75,7 +75,7 @@ if(!action_checks(target)) return if(isobj(target)) var/obj/target_obj = target - if(target_obj.unacidable) return + if(!target_obj.vars.Find("unacidable") || target_obj.unacidable) return set_ready_state(0) chassis.use_power(energy_drain) chassis.visible_message("[chassis] starts to drill [target]", "You hear the drill.") diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm index 8ecc24d814..4595841929 100644 --- a/code/game/objects/stacks/glass.dm +++ b/code/game/objects/stacks/glass.dm @@ -21,7 +21,7 @@ SHARDS src.use(1) user << "\blue You attach wire to the [name]." new /obj/item/stack/light_w(user.loc) - if(CC.amount <= 0) + if(CC && CC.amount <= 0) //CC may have already been deleted by 'CC.use(5)' a few lines up. user.u_equip(CC) del(CC) if(src.amount <= 0)