From 96fe6feb32bf3e198319004c2ed43b3acf193f5f Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:54:12 -0500 Subject: [PATCH 1/3] luke moment --- code/datums/components/riding/riding_vehicle.dm | 4 ++-- code/modules/vehicles/wheelchair.dm | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index cc961a134ffd..1d3979817a38 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -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) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index ed72f90ac750..694038ecc1cc 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/vehicles.dmi' icon_state = "wheelchair" layer = OBJ_LAYER - max_integrity = 100 + max_integrity = 40 //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. @@ -56,6 +56,15 @@ . = ..() update_appearance() +//MONKESTATION ADDITION START +/obj/vehicle/ridden/wheelchair/unbuckle_mob(mob/living/buckled_mob, force = FALSE, can_fall = TRUE) + if(usr == buckled_mob) + ..() + else + if(do_after(usr, 3 SECONDS)) + ..() +//MONKESTATION ADDITION END + /obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon ..() to_chat(user, span_notice("You begin to detach the wheels...")) @@ -87,7 +96,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 From 415347c58d946c380df351e43159bf666b8723f5 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:18:26 -0500 Subject: [PATCH 2/3] Update wheelchair.dm --- code/modules/vehicles/wheelchair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 694038ecc1cc..64bad3c84bda 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -61,7 +61,7 @@ if(usr == buckled_mob) ..() else - if(do_after(usr, 3 SECONDS)) + if(do_after(usr, 2 SECONDS)) ..() //MONKESTATION ADDITION END From 5198ffb359f2596107ce52f187fa1da78cc72d34 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Sat, 27 Jul 2024 03:38:53 -0500 Subject: [PATCH 3/3] review changes --- code/modules/vehicles/wheelchair.dm | 11 +---------- monkestation/code/modules/vehicles/wheelchair.dm | 7 +++++++ tgstation.dme | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 monkestation/code/modules/vehicles/wheelchair.dm diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 64bad3c84bda..7ccf99495a9a 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/vehicles.dmi' icon_state = "wheelchair" layer = OBJ_LAYER - max_integrity = 40 //MONKESTATION EDIT + 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. @@ -56,15 +56,6 @@ . = ..() update_appearance() -//MONKESTATION ADDITION START -/obj/vehicle/ridden/wheelchair/unbuckle_mob(mob/living/buckled_mob, force = FALSE, can_fall = TRUE) - if(usr == buckled_mob) - ..() - else - if(do_after(usr, 2 SECONDS)) - ..() -//MONKESTATION ADDITION END - /obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon ..() to_chat(user, span_notice("You begin to detach the wheels...")) diff --git a/monkestation/code/modules/vehicles/wheelchair.dm b/monkestation/code/modules/vehicles/wheelchair.dm new file mode 100644 index 000000000000..7550e2485800 --- /dev/null +++ b/monkestation/code/modules/vehicles/wheelchair.dm @@ -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)) + . = ..() diff --git a/tgstation.dme b/tgstation.dme index cd4bbd6cb2ea..4dec98a91ac1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7580,6 +7580,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"