Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fence nerf + fuel cell recycler + showcase is now destroyable #6471

Merged
merged 3 commits into from
Jun 20, 2024
Merged

fence nerf + fuel cell recycler + showcase is now destroyable #6471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
509d513
less stupid crap blocking movement
iloveloopers Jun 15, 2024
b5fefd7
less stupid crap blocking movement
iloveloopers Jun 15, 2024
1128c2d
density
iloveloopers Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions code/game/machinery/fuelcell_recycler.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"].")
Expand Down Expand Up @@ -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()
Expand Down
16 changes: 15 additions & 1 deletion code/game/objects/structures/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -273,7 +287,7 @@
. = ..()
if(over_object != usr || !Adjacent(usr))
return

if(!ishuman(usr))
return

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading