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

Xeno interactions with reinforced walls and window frames #4005

Closed
wants to merge 2 commits into from
Closed

Xeno interactions with reinforced walls and window frames #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d291163
Window frame acid ability_helper_procs.dm
GoldenDarkness55 Jul 26, 2023
025db64
Wall melting and ripping r_wall.dm
GoldenDarkness55 Jul 26, 2023
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
4 changes: 2 additions & 2 deletions code/game/turfs/walls/r_wall.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

walltype = WALL_REINFORCED

claws_minimum = CLAW_TYPE_VERY_SHARP
claws_minimum = CLAW_TYPE_SHARP

/turf/closed/wall/r_wall/attackby(obj/item/W, mob/user)
if(hull)
Expand Down Expand Up @@ -179,7 +179,7 @@
if(hull)
return 0
else
return 2
return 1


//Just different looking wall
Expand Down
6 changes: 0 additions & 6 deletions code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
if(isobj(O))
I = O

if(istype(I, /obj/structure/window_frame))
var/obj/structure/window_frame/WF = I
if(WF.reinforced && acid_type != /obj/effect/xenomorph/acid/strong)
to_chat(src, SPAN_WARNING("This [O.name] is too tough to be melted by your weak acid."))
return

wait_time = I.get_applying_acid_time()
if(wait_time == -1)
to_chat(src, SPAN_WARNING("You cannot dissolve \the [I]."))
Expand Down
Loading