diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 701691495a..76107d869e 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -871,7 +871,11 @@ Turf and target are seperate in case you want to teleport some distance from a t "parent_type", "verbs", "ckey", - "key" + "key", + "_active_timers", // ChompEDIT - blacklist timers + "_datum_components", // ChompEDIT - blacklist DCS + "_listen_lookup", // ChompEDIT - blacklist signal listeners + "_signal_procs" // ChompEDIT - blacklist signal procs ) if(perfectcopy) if((O) && (original)) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 938ed1d8e0..41b2fb578c 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -147,7 +147,7 @@ target = tray times_idle = 0 //VOREStation Add - Idle shutoff time return - if(!target && refills_water && tank && tank.reagents.total_volume < tank.reagents.maximum_volume) + if(!target && refills_water && tank && tank.reagents?.total_volume < tank.reagents.maximum_volume) // ChompEDIT - runtime for(var/obj/structure/sink/source in view(7, src)) target = source times_idle = 0 //VOREStation Add - Idle shutoff time @@ -419,4 +419,4 @@ created_name = t /obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob) - return //it's a converted watertank, no you cannot pick it up and put it in your backpack \ No newline at end of file + return //it's a converted watertank, no you cannot pick it up and put it in your backpack diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index a732d3c8ef..7b7403b013 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -209,7 +209,7 @@ else to_chat(owner, "You will no longer aim rather than fire.") owner.client.remove_gun_icons() - owner.gun_setting_icon.icon_state = "gun[active]" + owner.gun_setting_icon?.icon_state = "gun[active]" /obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0) if(!aiming_with || !aiming_at) @@ -224,4 +224,3 @@ aiming_at = null loc = null STOP_PROCESSING(SSobj, src) - diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm index bea4826baf..e4df307f71 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm @@ -402,7 +402,7 @@ projectile_dispersion = 100 projectile_accuracy = -100 - base_attack_cooldown = 0 + base_attack_cooldown = 0.01 // Division by zero error if 0 /mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee name = "Lunar Eclipse Ravanger"