diff --git a/code/game/machinery/fuelcell_recycler.dm b/code/game/machinery/fuelcell_recycler.dm index 89024adb41fb..12ae7c40f80f 100644 --- a/code/game/machinery/fuelcell_recycler.dm +++ b/code/game/machinery/fuelcell_recycler.dm @@ -3,7 +3,6 @@ desc = "A large machine with whirring fans and two cylindrical holes in the top. Used to regenerate fuel cells." icon = 'icons/obj/structures/machinery/fusion_eng.dmi' icon_state = "recycler" - density = TRUE active_power_usage = 15000 unslashable = TRUE unacidable = TRUE @@ -21,6 +20,11 @@ QDEL_NULL(cell_left) QDEL_NULL(cell_right) +/obj/structure/machinery/fuelcell_recycler/ex_act(severity) + if(indestructible) + return + . = ..() + /obj/structure/machinery/fuelcell_recycler/get_examine_text(mob/user) . = ..() . += SPAN_INFO("It is [machine_processing ? "online" : "offline"].") @@ -151,11 +155,6 @@ return icon_state = "recycler_on" -/obj/structure/machinery/fuelcell_recycler/ex_act(severity) - if(indestructible) - return - . = ..() - /obj/structure/machinery/fuelcell_recycler/proc/turn_off() visible_message(SPAN_NOTICE("[src] stops whirring as it turns off.")) stop_processing() diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 89bc3da6ab23..0ab3e98356d5 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -7,6 +7,20 @@ anchored = TRUE health = 250 +/obj/structure/showcase/attack_alien(mob/living/carbon/xenomorph/xeno) + if(xeno.a_intent == INTENT_HARM) + if(unslashable) + return + xeno.animation_attack_on(src) + playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] slices [src] apart!"), + SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) + deconstruct(FALSE) + return XENO_ATTACK_ACTION + else + attack_hand(xeno) + return XENO_NONCOMBAT_ACTION + /obj/structure/showcase/initialize_pass_flags(datum/pass_flags_container/PF) ..() if (PF) @@ -273,7 +287,7 @@ . = ..() if(over_object != usr || !Adjacent(usr)) return - + if(!ishuman(usr)) return diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 2576d0bc599b..de0cefeea76d 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -504,7 +504,7 @@ //Slashing fences /obj/structure/fence/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) - var/damage_dealt = 5 + var/damage_dealt = 25 M.visible_message(SPAN_DANGER("[M] mangles [src]!"), \ SPAN_DANGER("We mangle [src]!"), \ SPAN_DANGER("We hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT)