From a7b71d465cc8082ae66e9a956a03738c2388b9e8 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:54:57 -0400 Subject: [PATCH] Fix glass tables. Fix crafting. lower price / stun (#26062) * Fix glass tables. Fix crafting. lower price / stun * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * Update code/modules/vehicle/tg_vehicles/scooter.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/structures/tables_racks.dm | 4 +++- .../supply/supply_packs/pack_miscellaneous.dm | 2 +- code/modules/vehicle/tg_vehicles/scooter.dm | 21 ++++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 9cb2b4c2db4..4fc3af78a53 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -459,7 +459,9 @@ check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) - if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL && !HAS_TRAIT(M?.buckled, TRAIT_NO_BREAK_GLASS_TABLES)) + if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL) + if(M.buckled && HAS_TRAIT(M.buckled, TRAIT_NO_BREAK_GLASS_TABLES)) + return table_shatter(M) /obj/structure/table/glass/flip(direction) diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 74de3b62f21..9ebab24b925 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -529,7 +529,7 @@ /datum/supply_packs/misc/hoverboard name = "Hoverboard Crate" contains = list(/obj/item/melee/skateboard/hoverboard) - cost = 1000 //Price of cool + cost = 999 // Price of cool. Also under 1000 so it's not grand theft if stolen, lmao containername = "hoverboard crate" ///////////// Station Goals diff --git a/code/modules/vehicle/tg_vehicles/scooter.dm b/code/modules/vehicle/tg_vehicles/scooter.dm index e4e55e304a0..d7d0032538d 100644 --- a/code/modules/vehicle/tg_vehicles/scooter.dm +++ b/code/modules/vehicle/tg_vehicles/scooter.dm @@ -117,13 +117,13 @@ rider.adjustBrainLoss(5) rider.updatehealth() visible_message("[src] crashes into [bumped_thing], sending [rider] flying!") - rider.Weaken(8 SECONDS) + rider.Weaken(6 SECONDS) if(iscarbon(bumped_thing)) var/mob/living/carbon/victim = bumped_thing var/grinding_mulitipler = 1 if(grinding) grinding_mulitipler = 2 - victim.Weaken(2 * grinding_mulitipler SECONDS) + victim.Weaken(2.5 SECONDS) // This is easier said than done, so probably fine. If officers or crew weaponize it I'll kill it fully. victim.KnockDown(4 * grinding_mulitipler SECONDS) else var/backdir = REVERSE_DIR(dir) @@ -246,11 +246,14 @@ /obj/item/scooter_frame/attackby(obj/item/I, mob/user, params) if(!istype(I, /obj/item/stack/sheet/metal)) return ..() - if(!I.tool_start_check(user, amount = 5)) + var/obj/item/stack/S = I + if(S.get_amount() < 5) return to_chat(user, "You begin to add wheels to [src].") - if(!I.use_tool(src, user, 80, volume = 50, amount = 5)) - return + if(do_after(user, 5 SECONDS, target = src)) + if(!loc || !S || S.get_amount() < 2) + return + S.use(2) to_chat(user, "You finish making wheels for [src].") new /obj/tgvehicle/scooter/skateboard/improvised(user.loc) qdel(src) @@ -269,11 +272,13 @@ /obj/tgvehicle/scooter/skateboard/improvised/attackby(obj/item/I, mob/user, params) if(!istype(I, /obj/item/stack/rods)) return ..() - if(!I.tool_start_check(user, amount = 2)) + var/obj/item/stack/S = I + if(S.get_amount() < 2) return to_chat(user, "You begin making handlebars for [src].") - if(!I.use_tool(src, user, 25, volume = 50, amount = 2)) - return + if(do_after(user, 2.5 SECONDS, target = src)) + if(!loc || !S || S.get_amount() < 2 || !S.use(2)) + return to_chat(user, "You add the rods to [src], creating handlebars.") var/obj/tgvehicle/scooter/skaterskoot = new(loc) if(has_buckled_mobs())