From c12f351e30cbc5e6b3e8d04211fc50c2c8de10fa Mon Sep 17 00:00:00 2001
From: PKPenguin321 <pkpenguin321.git@gmail.com>
Date: Thu, 16 Jun 2016 18:59:12 -0700
Subject: [PATCH] makes them go inside each other ;)

---
 code/game/objects/items/weapons/weaponry.dm | 14 +++++++++++---
 code/modules/vehicles/scooter.dm            | 11 ++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index c17bd4c21f9..966cdad0859 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -296,7 +296,15 @@
 	throwforce = 4
 	w_class = 5.0
 	attack_verb = list("smacked", "whacked", "slammed", "smashed")
+	var/obj/vehicle/scooter/skateboard/linked_board
 
-/obj/item/weapon/melee/skateboard/attack_self(mob/user)
-	new /obj/vehicle/scooter/skateboard(get_turf(user))
-	qdel(src)
+/obj/item/weapon/melee/skateboard/attack_self(mob/user)//get_turf(user)
+	if(!user.drop_item())
+		return
+	linked_board.loc = get_turf(user)
+	loc = linked_board
+
+/obj/item/weapon/melee/skateboard/New()
+	..()
+	linked_board = new /obj/vehicle/scooter/skateboard(src)
+	linked_board.linked_board = src
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index dcd29d0a221..9aad681560c 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -54,6 +54,12 @@
 	icon_state = "skateboard"
 	vehicle_move_delay = 0//fast
 	density = 0
+	var/obj/item/weapon/melee/skateboard/linked_board
+
+/obj/vehicle/scooter/skateboard/New()
+	..()
+	linked_board = new /obj/item/weapon/melee/skateboard(src)
+	linked_board.linked_board = src
 
 /obj/vehicle/scooter/skateboard/post_buckle_mob(mob/living/M)//allows skateboards to be non-dense but still allows 2 skateboarders to collide with each other
 	if(has_buckled_mobs())
@@ -82,9 +88,8 @@
 		M << "<span class='warning'>You can't lift this up when somebody's on it.</span>"
 		return
 	if(over_object == M)
-		var/obj/item/weapon/melee/skateboard/board = new /obj/item/weapon/melee/skateboard()
-		M.put_in_hands(board)
-		qdel(src)
+		loc = linked_board
+		M.put_in_hands(linked_board)
 
 //CONSTRUCTION
 /obj/item/scooter_frame