Merge branch 'rip-scooterborgs' of https://github.com/PKPenguin321/-tg-station into rip-scooterborgs

# Conflicts:
#	code/modules/vehicles/scooter.dm
This commit is contained in:
PKPenguin321
2016-06-08 15:38:00 -07:00
+2 -2
View File
@@ -25,7 +25,7 @@
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
if(buckled_mobs.get_num_legs() > 0)
switch(buckled_mobs.dir)
switch(buckled_mob.dir)
if(NORTH)
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 4
@@ -137,4 +137,4 @@
user << "<span class='notice'>You add the rods to [src], creating handlebars.</span>"
C.use(2)
new/obj/vehicle/scooter(get_turf(src))
qdel(src)
qdel(src)