Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions code/datums/components/riding.dm
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,18 @@
/datum/component/riding/cyborg/force_dismount(mob/living/M)
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
var/mob/living/silicon/robot/S = AM
if(S.throwcooldown)
to_chat(S, "You have to wait for your motors to recharge")
return
var/turf/target = get_edge_target_turf(AM, AM.dir)
var/turf/targetm = get_step(get_turf(AM), AM.dir)
M.Move(targetm)
M.visible_message("<span class='warning'>[M] is thrown clear of [AM]!</span>")
M.throw_at(target, 14, 5, AM)
M.Paralyze(60)
S.throwcooldown = TRUE
addtimer(VARSET_CALLBACK(S, throwcooldown, FALSE), 10 SECONDS)

/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
var/atom/movable/AM = parent
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/silicon/robot/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
var/obj/item/robot_suit/robot_suit = null ///Used for deconstruction to remember what the borg was constructed out of..
var/obj/item/mmi/mmi = null

var/throwcooldown = FALSE /// Used to determine cooldown for spin.

var/shell = FALSE
var/deployed = FALSE
var/mob/living/silicon/ai/mainframe = null
Expand Down