Skip to content

Commit

Permalink
Wheelchair Re-Balance so that's like 1.0 again (#2740)
Browse files Browse the repository at this point in the history
* luke moment

* Update wheelchair.dm

* review changes
  • Loading branch information
CannibalHunter authored Aug 8, 2024
1 parent 1add151 commit 1e65601
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions code/datums/components/riding/riding_vehicle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,13 @@

// special messaging for those without arms
/datum/component/riding/vehicle/wheelchair/hand/driver_move(obj/vehicle/vehicle_parent, mob/living/user, direction)
var/delay_multiplier = 6.7 // magic number from wheelchair code
var/delay_multiplier = 4 // magic number from wheelchair code //MONKESTATION EDIT
vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * delay_multiplier) / clamp(user.usable_hands, 1, 2)
return ..()

/datum/component/riding/vehicle/wheelchair/motorized/driver_move(obj/vehicle/vehicle_parent, mob/living/user, direction)
var/speed = 1 // Should never be under 1
var/delay_multiplier = 6.7 // magic number from wheelchair code
var/delay_multiplier = 4 // magic number from wheelchair code //MONKESTATION EDIT

var/obj/vehicle/ridden/wheelchair/motorized/our_chair = parent
for(var/datum/stock_part/manipulator/manipulator in our_chair.component_parts)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vehicles/wheelchair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
icon = 'icons/obj/vehicles.dmi'
icon_state = "wheelchair"
layer = OBJ_LAYER
max_integrity = 100
max_integrity = 50 //MONKESTATION EDIT
armor_type = /datum/armor/ridden_wheelchair
density = FALSE //Thought I couldn't fix this one easily, phew
/// Run speed delay is multiplied with this for vehicle move delay.
Expand Down Expand Up @@ -87,7 +87,7 @@
desc = "Damn, must've been through a lot."
icon_state = "gold_wheelchair"
overlay_icon = "gold_wheelchair_overlay"
max_integrity = 200
max_integrity = 90 //MONKESTATION EDIT
armor_type = /datum/armor/wheelchair_gold
custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*5)
foldabletype = /obj/item/wheelchair/gold
Expand Down
7 changes: 7 additions & 0 deletions monkestation/code/modules/vehicles/wheelchair.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//modular modification of 'code\modules\vehicles\wheelchair.dm' so that there is a do_after
/obj/vehicle/ridden/wheelchair/unbuckle_mob(mob/living/buckled_mob, force = FALSE, can_fall = TRUE)
if(usr == buckled_mob)
. = ..()
else
if(do_after(usr, 1 SECONDS))
. = ..()
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7647,6 +7647,7 @@
#include "monkestation\code\modules\uplink\uplink_items\species.dm"
#include "monkestation\code\modules\uplink\uplink_items\weapons.dm"
#include "monkestation\code\modules\vehicles\monkey_ball.dm"
#include "monkestation\code\modules\vehicles\wheelchair.dm"
#include "monkestation\code\modules\vehicles\mecha\mecha_actions.dm"
#include "monkestation\code\modules\vehicles\mecha\equipment\tools\other_tools.dm"
#include "monkestation\code\modules\vending\megaseed.dm"
Expand Down

0 comments on commit 1e65601

Please sign in to comment.