diff --git a/code/modules/tents/blockers.dm b/code/modules/tents/blockers.dm index 3a2347c9e881..24765ca2a284 100644 --- a/code/modules/tents/blockers.dm +++ b/code/modules/tents/blockers.dm @@ -35,7 +35,7 @@ PF.flags_can_pass_behind = NONE /obj/structure/blocker/tent/get_projectile_hit_boolean(obj/item/projectile/P) - ..() + . = ..() return FALSE // Always fly through the tent //Blocks all direction, basically an invisible wall diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 941f36b1470d..040a45f1c634 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -94,18 +94,22 @@ /obj/structure/tent/attackby(obj/item/item, mob/user) var/obj/item/tool/shovel/shovel = item - if(istype(shovel) && !shovel.folded) - visible_message(SPAN_HIGHDANGER("[user] is trying to tear down the [src]")) - playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) - if(do_after(user, 150, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, src) && !QDELETED(src)) - visible_message(SPAN_HIGHDANGER("[user] tears down the [src]")) - playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) - qdel(src) + if(!istype(shovel) || shovel.folded) + return + visible_message(SPAN_HIGHDANGER("[user] is trying to tear down the [src]")) + playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) + + if(!do_after(user, 150, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, src) || QDELETED(src)) + return + + visible_message(SPAN_HIGHDANGER("[user] tears down the [src]")) + playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) + qdel(src) /obj/structure/tent/get_projectile_hit_boolean(obj/item/projectile/P) + . = ..() return FALSE // Always fly through the tent - /// Command tent, providing basics for field command: a phone, and an overwatch console /obj/structure/tent/cmd icon_state = "cmd_interior"