diff --git a/baystation12.dme b/baystation12.dme
index 35c47edeb64..38e54e0b4ea 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -432,9 +432,9 @@
#include "code\game\mecha\equipment\tools\medical_tools.dm"
#include "code\game\mecha\equipment\tools\tools.dm"
#include "code\game\mecha\equipment\weapons\weapons.dm"
+#include "code\game\mecha\hoverpod\hoverpod.dm"
#include "code\game\mecha\medical\medical.dm"
#include "code\game\mecha\medical\odysseus.dm"
-#include "code\game\mecha\working\hoverpod.dm"
#include "code\game\mecha\working\ripley.dm"
#include "code\game\mecha\working\working.dm"
#include "code\game\objects\empulse.dm"
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 7e19e787a92..2a6e2b62144 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -95,6 +95,9 @@
return
/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M as obj)
+ if(M.equipment.len >= M.max_equip)
+ return 0
+
if (ispath(required_type))
return istype(M, required_type)
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 2adf280a6ba..d7783b351c9 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -5,7 +5,7 @@
energy_drain = 10
var/dam_force = 20
var/obj/mecha/working/ripley/cargo_holder
- required_type = /obj/mecha/working
+ required_type = list(/obj/mecha/working, /obj/mecha/hoverpod) //so that hoverpods are a bit more useful as space transportation
attach(obj/mecha/M as obj)
..()
diff --git a/code/game/mecha/working/hoverpod.dm b/code/game/mecha/hoverpod/hoverpod.dm
similarity index 70%
rename from code/game/mecha/working/hoverpod.dm
rename to code/game/mecha/hoverpod/hoverpod.dm
index 38b2815ca23..4d8c2d77b01 100644
--- a/code/game/mecha/working/hoverpod.dm
+++ b/code/game/mecha/hoverpod/hoverpod.dm
@@ -1,8 +1,9 @@
-/obj/mecha/working/hoverpod
+/obj/mecha/hoverpod
desc = "Stubby and round, this space-capable craft is an ancient favorite."
name = "Hover Pod"
icon_state = "engineering_pod"
initial_icon = "engineering_pod"
+ internal_damage_threshold = 80
step_in = 4
step_energy_drain = 5
max_temperature = 20000
@@ -11,10 +12,21 @@
wreckage = /obj/effect/decal/mecha_wreckage/hoverpod
var/list/cargo = new
var/cargo_capacity = 3
- max_equip = 3
+ max_equip = 2
+ var/ion_trail = new /datum/effect/effect/system/ion_trail_follow()
-//duplicate of parent proc, but without space drifting
-/obj/mecha/working/hoverpod/dyndomove(direction)
+/obj/mecha/hoverpod/New()
+ ..()
+ var/turf/T = get_turf(src)
+ if(T.z != 2)
+ new /obj/item/mecha_parts/mecha_tracking(src)
+ return
+
+/obj/mecha/hoverpod/range_action(atom/target as obj|mob|turf)
+ return
+
+//No space drifting
+/obj/mecha/hoverpod/dyndomove(direction)
if(!can_move)
return 0
if(src.pr_inertial_movement.active())
@@ -41,56 +53,30 @@
return 0
//these three procs overriden to play different sounds
-/obj/mecha/working/hoverpod/mechturn(direction)
+/obj/mecha/hoverpod/mechturn(direction)
dir = direction
//playsound(src,'sound/machines/hiss.ogg',40,1)
return 1
-/obj/mecha/working/hoverpod/mechstep(direction)
+/obj/mecha/hoverpod/mechstep(direction)
var/result = step(src,direction)
if(result)
playsound(src,'sound/machines/hiss.ogg',40,1)
return result
-/obj/mecha/working/hoverpod/mechsteprand()
+/obj/mecha/hoverpod/mechsteprand()
var/result = step_rand(src)
if(result)
playsound(src,'sound/machines/hiss.ogg',40,1)
return result
-/*
-/obj/mecha/working/hoverpod/New()
- ..()
- return
-*/
-
-/obj/mecha/working/hoverpod/combatpod
- desc = "An ancient, ghetto fighter." // Ideally would have a seperate icon.
- name = "Combat Hoverpod"
-
-/obj/mecha/working/hoverpod/combatpod/New()
- ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive
- ME.attach(src)
-
-/obj/mecha/working/hoverpod/shuttlepod
- desc = "Who knew a tiny ball could fit three people?"
-/obj/mecha/working/hoverpod/shuttlepod/New()
- ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
- ME.attach(src)
-
-/obj/mecha/working/hoverpod/Exit(atom/movable/O)
+/obj/mecha/hoverpod/Exit(atom/movable/O)
if(O in cargo)
return 0
return ..()
-/obj/mecha/working/hoverpod/Topic(href, href_list)
+/obj/mecha/hoverpod/Topic(href, href_list)
..()
if(href_list["drop_from_cargo"])
var/obj/O = locate(href_list["drop_from_cargo"])
@@ -105,7 +91,7 @@
return
-/obj/mecha/working/hoverpod/get_stats_part()
+/obj/mecha/hoverpod/get_stats_part()
var/output = ..()
output += "Cargo Compartment Contents:"
if(src.cargo.len)
@@ -116,7 +102,7 @@
output += "
"
return output
-/obj/mecha/working/hoverpod/Del()
+/obj/mecha/hoverpod/Del()
for(var/mob/M in src)
if(M==src.occupant)
continue
@@ -130,4 +116,32 @@
T.Entered(A)
step_rand(A)
..()
- return
\ No newline at end of file
+ return
+
+//Hoverpod variants
+
+/* Commented out the combatpod as they can't reattach their equipment if it ever gets dropped,
+ * and making a special exception for them seems lame.
+/obj/mecha/hoverpod/combatpod
+ desc = "An ancient, run-down combat spacecraft." // Ideally would have a seperate icon.
+ name = "Combat Hoverpod"
+ health = 200
+ internal_damage_threshold = 35
+
+/obj/mecha/hoverpod/combatpod/New()
+ ..()
+ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive
+ ME.attach(src)
+*/
+
+/obj/mecha/hoverpod/shuttlepod
+ desc = "Who knew a tiny ball could fit three people?"
+
+/obj/mecha/hoverpod/shuttlepod/New()
+ ..()
+ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
+ ME.attach(src)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 51c0ec2baa8..2923ba2321b 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -70,5 +70,5 @@
/obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/crowbar))
- new /obj/mecha/working/hoverpod(loc)
+ new /obj/mecha/hoverpod(loc)
..()
\ No newline at end of file