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

Ghost & Cyborg can climb (sea) ladders #16816

Merged
merged 2 commits into from Nov 6, 2023
Merged

Ghost & Cyborg can climb (sea) ladders #16816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fffb94
Allow Ghosts and Cyborgs to use sea ladders, and let ghosts use norma…
DasBrain Nov 6, 2023
6a71bb5
Update code/modules/fluids/fluid_objects.dm
pali6 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/modules/fluids/fluid_objects.dm
View file
Open in desktop
Expand Up @@ -441,6 +441,16 @@ TYPEINFO(/obj/machinery/fluid_canister)
user.set_loc(target)
user.show_text("You climb [src].")

Click(location, control, params)
if (isobserver(usr))
return src.attack_hand(usr)
..()

attack_ai(mob/user)
if (!user.stat && !user.getStatusDuration("weakened") && BOUNDS_DIST(user, src) <= 0)
pali6 marked this conversation as resolved.
Show resolved Hide resolved
return src.attack_hand(user)
. = ..()


TYPEINFO(/obj/item/sea_ladder)
mats = 7
Expand Down
8 changes: 8 additions & 0 deletions code/obj/ladder.dm
View file
Open in desktop
Expand Up @@ -147,6 +147,14 @@ ADMIN_INTERACT_PROCS(/obj/ladder/embed, proc/toggle_hidden)
/obj/ladder/attack_ai(mob/user)
return src.attack_hand(user)

/obj/ladder/Click(location, control, params)
if (isobserver(usr))
var/obj/ladder/otherLadder = src.get_other_ladder()
if (get_turf(otherLadder))
usr.set_loc(get_turf(otherLadder))
return
..()

/obj/ladder/attackby(obj/item/W, mob/user)
if (src.unclimbable) return
if (istype(W, /obj/item/grab))
Expand Down