From 8bdd31c4c26c1fc40b106c7ded3c64ebcc421410 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 27 Mar 2017 09:01:36 +0100 Subject: [PATCH] Latest batch of fixes - bad :snowflake: --- code/game/objects/items/weapons/dnascrambler.dm | 8 +++++--- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 6 ++++-- .../objects/structures/stool_bed_chair_nest/chairs.dm | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 1876b2003ad..e691fce0961 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -22,9 +22,11 @@ if(src.used) return - if(M.get_species() == "Machine") - to_chat(user, "You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.") - return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.species.flags & NO_DNA) + to_chat(user, "You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.") + return if(M == user) user.visible_message("[user] injects \himself with [src]!") diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 7210d919804..1835a1bb31a 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -50,8 +50,10 @@ /obj/structure/stool/bed/proc/handle_rotation() return -/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever - if(M.environment_smash) +/obj/structure/stool/bed/attack_animal(mob/living/simple_animal/user) + if(user.environment_smash) + user.do_attack_animation(src) + visible_message("[user] smashes [src] apart!") new buildstacktype(loc, buildstackamount) qdel(src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 79dfbf5013e..a6a4e715ed3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -87,7 +87,7 @@ buildstacktype = /obj/item/stack/sheet/wood // TODO: Special ash subtype that looks like charred chair legs -/obj/structure/stool/bed/chair/wood/attack_animal(mob/living/simple_animal/user) // Snowflakey, but limited current uses. Future refactor +/obj/structure/stool/bed/chair/wood/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) user.do_attack_animation(src) visible_message("[user] smashes [src] apart!")