cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix glass tables. Fix crafting. lower price / stun (#26062)

Browse Source 
* 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>
This commit is contained in:
Qwertytoforty
2024-07-01 18:54:57 +00:00
committed by GitHub
co-authored by 1080pCat DGamerL
parent 87c38ccb41
commit a7b71d465c
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/supply/supply_packs/pack_miscellaneous.dm
+1 -1
View File
@@ -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
code/modules/vehicle/tg_vehicles/scooter.dm
+13 -8
View File
@@ -117,13 +117,13 @@
rider.adjustBrainLoss(5)
rider.updatehealth()
visible_message("<span class='danger'>[src] crashes into [bumped_thing], sending [rider] flying!</span>")
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, "<span class='notice'>You begin to add wheels to [src].</span>")
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, "<span class='notice'>You finish making wheels for [src].</span>")
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, "<span class='notice'>You begin making handlebars for [src].</span>")
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, "<span class='notice'>You add the rods to [src], creating handlebars.</span>")
var/obj/tgvehicle/scooter/skaterskoot = new(loc)
if(has_buckled_mobs())