From 3a2f21ca318d989bde0682d5b54b3176f67ba81d Mon Sep 17 00:00:00 2001 From: Mechoid Date: Tue, 8 May 2018 16:19:44 -0700 Subject: [PATCH 1/2] Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets. --- code/game/objects/structures.dm | 4 ++-- code/game/objects/structures/crates_lockers/closets.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index b41743799bf..b6e7462d768 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -10,7 +10,7 @@ /obj/structure/Destroy() if(parts) new parts(loc) - . = ..() + . = ..() /obj/structure/attack_hand(mob/user) if(breakable) @@ -177,7 +177,7 @@ return 1 /obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker) - if(!breakable || !damage || !wallbreaker) + if(!breakable || !damage || damage < 10 || !wallbreaker) return 0 visible_message("[user] [attack_verb] the [src] apart!") user.do_attack_animation(src) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e25553d3611..3a007bd4673 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -345,7 +345,7 @@ icon_state = icon_opened /obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker) - if(!damage || !wallbreaker) + if(!damage || damage < 10 || !wallbreaker) return user.do_attack_animation(src) visible_message("[user] [attack_message] the [src]!") From 4d028ee0f3be85d8f4ded5dedd04d7b39d4469fe Mon Sep 17 00:00:00 2001 From: Mechoid Date: Tue, 8 May 2018 18:41:47 -0700 Subject: [PATCH 2/2] Removes my incompetence. Re-adds my incompetence. --- code/game/objects/structures.dm | 2 +- code/game/objects/structures/crates_lockers/closets.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index b6e7462d768..faa9f024f07 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -177,7 +177,7 @@ return 1 /obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker) - if(!breakable || !damage || damage < 10 || !wallbreaker) + if(!breakable || damage < 10 || !wallbreaker) return 0 visible_message("[user] [attack_verb] the [src] apart!") user.do_attack_animation(src) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3a007bd4673..9ca1ab51a55 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -345,7 +345,7 @@ icon_state = icon_opened /obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker) - if(!damage || damage < 10 || !wallbreaker) + if(damage < 10 || !wallbreaker) return user.do_attack_animation(src) visible_message("[user] [attack_message] the [src]!")