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

Fix gliding issues #1622

Merged
merged 2 commits into from
Dec 10, 2023
Merged

Fix gliding issues #1622

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
31e0354
Fix mobs glide incorrectly when buckled
SuhEugene Dec 10, 2023
17e131b
Fix grabs and pulls gliding
SuhEugene Dec 10, 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
12 changes: 11 additions & 1 deletion code/datums/movement/mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,18 @@
return

// Something with pulling things
var/extra_delay = HandleGrabs(direction, old_turf)
// [SIERRA-EDIT] - SSINPUT
// var/extra_delay = HandleGrabs(direction, old_turf) // SIERRA-EDIT - ORIGINAL
// mob.ExtraMoveCooldown(extra_delay) // SIERRA-EDIT - ORIGINAL
var/extra_delay = 0
for (var/obj/item/grab/G in mob)
if(G.assailant == G.affecting)
return
extra_delay = max(extra_delay, G.grab_slowdown())

mob.ExtraMoveCooldown(extra_delay)
HandleGrabs(direction, old_turf)
// [/SIERRA-EDIT]

for (var/obj/item/grab/G in mob)
if (G.assailant_reverse_facing())
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/buckling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@
if (!buckled_mob)
return
if (loc)
// [SIERRA-ADD] - SSINPUT
buckled_mob.set_glide_size(glide_size)
// [/SIERRA-ADD]
buckled_mob.forceMove(loc)
else
unbuckle_mob()
Expand All @@ -383,6 +386,9 @@
if (!buckled_mob)
return
if (loc)
// [SIERRA-ADD] - SSINPUT
buckled_mob.set_glide_size(glide_size)
// [/SIERRA-ADD]
buckled_mob.forceMove(loc)
else
unbuckle_mob()
3 changes: 3 additions & 0 deletions code/modules/mob/grab/grab_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@
var/adir = get_dir(assailant, affecting)

if(same_tile)
// [SIERRA-ADD] - SSINPUT
affecting.set_glide_size(assailant.glide_size)
// [/SIERRA-ADD]
affecting.forceMove(assailant.loc)
adir = assailant.dir
affecting.set_dir(assailant.dir)
Expand Down
3 changes: 3 additions & 0 deletions mods/ssinput/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ ID мода: SSINPUT
- `code/__defines/subsystem-priority.dm`: `#define SS_PRIORITY_INPUT`
- `code/__defines/subsystems.dm`: `#define SS_INIT_INPUT`
- `code/_onclick/click.dm`: `/mob/proc/MiddleClickOn()`
- `code/datums/movement/mob.dm`: `/datum/movement_handler/mob/movement/DoMove()`
- `code/game/objects/buckling.dm`: `/obj/Move()`, `/obj/forceMove()`
- `code/game/verbs/ooc.dm`: `/client/verb/ooc()`, `/client/verb/looc()`
- `code/modules/admin/callproc/callproc.dm`: `/client/Click()`
- `code/modules/client/client_procs.dm`: `/client/New()`
- `code/modules/goonchat/browserOutput.dm`: `/datum/chatOutput/Topic()`
- `code/modules/mob/grab/grab_datum.dm`: `/datum/grab/proc/adjust_position()`
- `code/modules/mob/living/silicon/robot/login.dm`: `/mob/living/silicon/robot/Login()`
- `code/modules/mob/observer/ghost/ghost.dm`: `/mob/observer/ghost/appearance_flags`
- `code/modules/mob/login.dm`: `/mob/Login()`
Expand Down