shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/scooter.dm
+9 -16
View File
@@ -7,7 +7,7 @@
if(istype(I, /obj/item/weapon/wrench))
user << "<span class='notice'>You begin to remove the handlebars...</span>"
playsound(get_turf(user), 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 40*I.toolspeed, target = src))
if(do_after(user, 40/I.toolspeed, target = src))
new /obj/vehicle/scooter/skateboard(get_turf(src))
new /obj/item/stack/rods(get_turf(src),2)
user << "<span class='notice'>You remove the handlebars from [src].</span>"
@@ -38,18 +38,15 @@
else
buckled_mob.pixel_y = -4
/obj/vehicle/scooter/buckle_mob(mob/living/M, force = 0)
if(!istype(M))
return 0
if(M.get_num_legs() < 2 && M.get_num_arms() <= 0)
M << "<span class='warning'>Your limbless body can't use [src].</span>"
return 0
. = ..()
/obj/vehicle/scooter/post_buckle_mob(mob/living/M)
vehicle_move_delay = initial(vehicle_move_delay)
..()
if(M.get_num_legs() < 2)
vehicle_move_delay ++
if(M.get_num_arms() <= 0)
if(buckled_mobs.len)//to prevent the message displaying twice due to unbuckling
M << "<span class='warning'>Your limbless body flops off \the [src].</span>"
unbuckle_mob(M)
/obj/vehicle/scooter/skateboard
name = "skateboard"
@@ -95,7 +92,7 @@
desc = "A metal frame for building a scooter. Looks like you'll need to add some metal to make wheels."
icon = 'icons/obj/vehicles.dmi'
icon_state = "scooter_frame"
w_class = WEIGHT_CLASS_NORMAL
w_class = 3
/obj/item/scooter_frame/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
@@ -107,13 +104,11 @@
else if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
if(M.get_amount() < 5)
if(M.amount < 5)
user << "<span class='warning'>You need at least five metal sheets to make proper wheels!</span>"
return
user << "<span class='notice'>You begin to add wheels to [src].</span>"
if(do_after(user, 80, target = src))
if(!M || M.get_amount() < 5)
return
M.use(5)
user << "<span class='notice'>You finish making wheels for [src].</span>"
new /obj/vehicle/scooter/skateboard(user.loc)
@@ -122,7 +117,7 @@
/obj/vehicle/scooter/skateboard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
user << "<span class='notice'>You begin to deconstruct and remove the wheels on [src]...</span>"
playsound(get_turf(user), I.usesound, 50, 1)
playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20, target = src))
user << "<span class='notice'>You deconstruct the wheels on [src].</span>"
new /obj/item/stack/sheet/metal(get_turf(src),5)
@@ -136,8 +131,6 @@
return
user << "<span class='notice'>You begin making handlebars for [src].</span>"
if(do_after(user, 25, target = src))
if(!C || C.get_amount() < 2)
return
user << "<span class='notice'>You add the rods to [src], creating handlebars.</span>"
C.use(2)
new/obj/vehicle/scooter(get_turf(src))