diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 7fe146d3e47..3744ed17aec 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -194,6 +194,7 @@ /obj/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) if(resistance_flags & INDESTRUCTIBLE) + to_chat(S, "High value materials detected, consuming [src] would waste them. Aborting.") return FALSE for(var/mob/living/L in contents) if(!issilicon(L) && !isbrain(L)) @@ -202,7 +203,9 @@ return ..() /obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - return S.Integrate(src) + if(..()) + return S.Integrate(src) + return FALSE /atom/movable/proc/IntegrateAmount() return 0 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 4f9e051ef44..2c2eea24f56 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -43,6 +43,7 @@ attack_verb = list("lunged at", "stabbed") hitsound = 'sound/weapons/rapierhit.ogg' materials = list(MAT_METAL = 1000) + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy /obj/item/melee/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK)