Scrap Vehicles 1.5

code/__DEFINES/exosuit_fab.dm

@@ -36,8 +36,12 @@
 #define EXOSUIT_MODULE_MAKESHIFT (1<<11)
 // Module is compatbile with ambulance "mechs"
 #define EXOSUIT_MODULE_AMBULANCE (1<<12)
-// Module is compatbile with tank "mechs"
+// Module is compatbile with makeshift tank "mechs"
 #define EXOSUIT_MODULE_TRASHTANK (1<<13)
+// Module is compatbile with tank "mechs"
+#define EXOSUIT_MODULE_TANK (1<<14)
+// Module is compatbile with drilling "mechs"
+#define EXOSUIT_MODULE_DRILL (1<<15)
 //monkestation edit end
 
 

code/__DEFINES/mecha.dm

@@ -58,4 +58,6 @@
 #define MECHA_AMMO_PIPEGUN "Improvised shell"
 #define MECHA_AMMO_PEASHOOTER "Peashooter bullet"
 #define MECHA_AMMO_ISG "IED grenades"
+#define MECHA_AMMO_LIGHTTANK "40mm shell"
+#define MECHA_AMMO_LIGHTTANKMG "12.7x70mm malone"
 //monke edit end

code/genesis_call.dme

@@ -50,3 +50,12 @@
  */
 /world/proc/_()
 	var/static/_ = world.Genesis()
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+// BEGIN_INCLUDE
+// END_INCLUDE

code/modules/projectiles/projectile/bullets/lmg.dm

@@ -77,3 +77,16 @@
 	ricochet_decay_chance = 0.9
 	speed = 0.6 //monke edit
 
+
+// 12.7x70mm (Malone / tank MG)
+
+/obj/projectile/bullet/mm127x70
+	name = "12.7x70mm bullet"
+	damage = 15
+	armour_penetration = 5
+	wound_bonus = -50
+	wound_falloff_tile = 0
+
+
+
+

code/modules/projectiles/projectile/special/rocket.dm

@@ -59,6 +59,19 @@ among other potential differences. This granularity is helpful for things like t
 /obj/projectile/bullet/rocket/heap/do_boom(atom/target, blocked=0)
 	explosion(target, devastation_range = -1, heavy_impact_range = 1, light_impact_range = 3, flame_range = 4, flash_range = 1, adminlog = FALSE)
 
+/// 40mm tank shell - tank on a space station wtf, extremely good at anti tank, still explosive.
+/obj/projectile/bullet/rocket/lighttankshell
+	name = "\improper 40mm tank shell"
+	desc = "mechanized warfare in spess."
+	icon_state = "LIGHTTANKSHELL"
+	damage = 80
+	armour_penetration = 100
+	dismemberment = 100
+	anti_armour_damage = 200
+
+/obj/projectile/bullet/rocket/lighttankshell/do_boom(atom/target, blocked=0)
+	explosion(target, devastation_range = -1, heavy_impact_range = 2, light_impact_range = 2, flame_range = 3, flash_range = 1, adminlog = TRUE)
+
 /// PM9 weak rocket - just kind of a failure
 /obj/projectile/bullet/rocket/weak
 	name = "low-yield rocket"

code/modules/uplink/uplink_items/ammunition.dm

@@ -60,3 +60,17 @@
 	cost = 4
 	purchasable_from = ~UPLINK_CLOWN_OPS
 	illegal_tech = FALSE
+
+
+/datum/uplink_item/ammo/lighttankammo
+	name = "40mm cannon ammo"
+	desc = "5 crated shells for use with the Devitt Mk3 light tank."
+	item = /obj/item/mecha_ammo/makeshift/lighttankammo
+	cost = 4
+
+/datum/uplink_item/ammo/lighttankmgammo
+	name = "12.7x70mm tank mg ammo"
+	desc = "60 rounds of 12.7x70mm for use with the Devitt Mk3 light tank."
+	item = /obj/item/mecha_ammo/makeshift/lighttankmg
+	cost = 2
+

code/modules/uplink/uplink_items/dangerous.dm

@@ -112,3 +112,17 @@
 	desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
 	item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie
 	cost = 12
+
+/datum/uplink_item/dangerous/minipea
+	name = "5 peashooters strapped together"
+	desc = "For use in a trash tank, 5 small machineguns strapped together using syndicate technology. It burns through ammo like no other."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/minipea
+	cost = 8
+	purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+/datum/uplink_item/dangerous/devitt
+	name = "Devitt Mk3 Light Tank"
+	desc = "An ancient tank teleported in for your machinations, comes prepared with a cannon and machinegun. REQUIRES TWO CREWMEMBERS TO OPPERATE EFFECTIVELY."
+	item = /obj/vehicle/sealed/mecha/devitt
+	cost = 40
+	purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)

code/modules/uplink/uplink_items/nukeops.dm

@@ -614,6 +614,24 @@
 	item = /obj/vehicle/sealed/mecha/marauder/mauler/loaded
 	cost = 140
 
+/datum/uplink_item/support/devitt
+	name = "Devitt Mk3 Light Tank"
+	desc = "An ancient tank found in the wearhouse, comes prepared with a cannon and machinegun. REQUIRES TWO CREWMEMBERS TO OPPERATE EFFECTIVELY."
+	item = /obj/vehicle/sealed/mecha/devitt
+	cost = 80
+
+/datum/uplink_item/support/lighttankammo
+	name = "40mm cannon ammo"
+	desc = "5 crated shells for use with the Devitt Mk3 light tank."
+	item = /obj/item/mecha_ammo/makeshift/lighttankammo
+	cost = 2
+
+/datum/uplink_item/support/lighttankmgammo
+	name = "12.7x70mm tank mg ammo"
+	desc = "60 rounds of 12.7x70mm for use with the Devitt Mk3 light tank."
+	item = /obj/item/mecha_ammo/makeshift/lighttankmg
+	cost = 1
+
 /datum/uplink_item/support/turretbox
 	name = "Disposable Sentry Gun"
 	desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality."

code/modules/vehicles/mecha/mecha_wreckage.dm

@@ -241,3 +241,11 @@
 			/obj/item/mecha_parts/part/odysseus_right_arm,
 			/obj/item/mecha_parts/part/odysseus_left_leg,
 			/obj/item/mecha_parts/part/odysseus_right_leg)
+
+/obj/structure/mecha_wreckage/devitt
+	name = "\improper Devitt Mk3 Wreckage"
+	icon = 'monkestation/icons/mecha/tanks.dmi'
+	icon_state = "devitt-broken"
+	welder_salvage = list(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/iron, /obj/item/stack/rods) //get it, it's a glass cannon
+
+

monkestation/code/datums/components/crafting/makeshift_mechs.dm

@@ -35,6 +35,36 @@
 	time = 5 SECONDS
 	category = CAT_ROBOT
 
+
+/datum/crafting_recipe/sheetmetaldrill
+	name = "Sheet metal drill"
+	result = /obj/vehicle/sealed/mecha/makeshift_drill
+	reqs = list(/obj/item/stack/cable_coil = 30,
+				/obj/item/stack/sheet/iron = 20,
+				/obj/item/storage/toolbox = 2,
+				/obj/item/tank/internals/oxygen = 4,
+				/obj/item/electronics/airlock = 1,
+				/obj/item/extinguisher = 1,
+				/obj/item/paper = 10,
+				/obj/item/flashlight = 4,
+				/obj/item/stack/rods = 16,
+				/obj/item/stack/conveyor = 2,
+				/obj/item/chair = 1)
+	tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 20 SECONDS
+	category = CAT_ROBOT
+
+/datum/crafting_recipe/giantdrill
+	name = "Giant drill"
+	result = /obj/item/mecha_parts/mecha_equipment/drill/giantdrill
+	reqs = list(/obj/item/stack/cable_coil = 10,
+				/obj/item/stack/sheet/plasteel = 20,
+				/obj/item/stock_parts/manipulator = 4,)
+	tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_WRENCH)
+	time = 30 SECONDS
+	category = CAT_ROBOT
+
+
 /datum/crafting_recipe/ambulance
 	name = "Porta Potty Ambulance"
 	result = /obj/vehicle/sealed/mecha/makeshift_ambulance
@@ -176,3 +206,25 @@
 	)
 	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WIRECUTTER)
 	time = 0.5 SECONDS
+
+/datum/crafting_recipe/light_tank_ammo
+	name = "40mm Tank Shells"
+	result = /obj/item/mecha_ammo/makeshift/lighttankammo
+	reqs = list(/datum/reagent/rdx = 50,
+		/obj/item/stack/sheet/plasteel = 10,
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/assembly/igniter = 5
+	)
+	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_CROWBAR, TOOL_WIRECUTTER)
+	time = 0.5 SECONDS
+
+
+
+/datum/crafting_recipe/lightankmg_ammo
+	name = "12.7x70mm ammunition belt"
+	result = /obj/item/mecha_ammo/makeshift/lighttankmg
+	reqs = list(/datum/reagent/gunpowder = 30,
+		/obj/item/stack/sheet/iron = 20,
+	)
+	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 0.5 SECONDS

monkestation/code/game/mecha/makeshift/devitt.dm

@@ -0,0 +1,60 @@
+/obj/vehicle/sealed/mecha/devitt
+	desc = "A multi hundred year old tank. How the hell it is running and on a space station is the least of your worries."
+	name = "Devitt Mk3"
+	icon = 'monkestation/icons/mecha/tanks.dmi'
+	icon_state = "devitt_0_0"
+	base_icon_state = "devitt"
+	max_integrity = 500 // its a hunk of steel that didnt need to be limited by mecha legs
+	force = 50
+	movedelay = 1.2
+	step_energy_drain = 20
+	bumpsmash = TRUE
+	stepsound = 'monkestation/sound/mecha/tank_treads.ogg'
+	turnsound = 'monkestation/sound/mecha/tank_treads.ogg'
+	mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE | OMNIDIRECTIONAL_ATTACKS //can't strafe bruv & has 360 tank turret
+	armor_type = /datum/armor/devitt //its neigh on immune to bullets, but explosives and melee will ruin it.
+	internal_damage_threshold = 30 //Its old but no electronics
+	wreckage = /obj/structure/mecha_wreckage/devitt
+//	max_occupants = 2 // gunner + Driver otherwise it would be OP
+	mech_type = EXOSUIT_MODULE_TANK
+	equip_by_category = list(
+		MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/light_tank_cannon,
+		MECHA_R_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lighttankmg,
+		MECHA_UTILITY = list(),
+		MECHA_POWER = /obj/item/mecha_parts/mecha_equipment/generator,
+		MECHA_ARMOR = list(),
+	)
+	max_occupants = 2 //driver+gunner, otherwise this thing would be gods OP  (commented out untill I do this.)
+	max_equip_by_category = list(
+		MECHA_UTILITY = 0,
+		MECHA_POWER = 1, // you can put an engine in it, wow!
+		MECHA_ARMOR = 0,
+	)
+
+/datum/armor/devitt
+	melee = 10
+	bullet = 70
+	laser = 70
+	energy = 70
+	bomb = 10
+	fire = 90
+	acid = 20
+
+
+// trying to add multi crew 2, deisel boogaloo
+// yes I am just ripping this from the savannah ivanov how did you know?
+
+/obj/vehicle/sealed/mecha/devitt/get_mecha_occupancy_state()
+	var/driver_present = driver_amount() != 0
+	var/gunner_present = return_amount_of_controllers_with_flag(VEHICLE_CONTROL_EQUIPMENT) > 0
+	return "[base_icon_state]_[gunner_present]_[driver_present]"
+
+/obj/vehicle/sealed/mecha/devitt/auto_assign_occupant_flags(mob/new_occupant)
+	if(driver_amount() < max_drivers) //movement
+		add_control_flags(new_occupant, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_SETTINGS)
+	else //weapons
+		add_control_flags(new_occupant, VEHICLE_CONTROL_MELEE|VEHICLE_CONTROL_EQUIPMENT)
+
+/obj/vehicle/sealed/mecha/devitt/generate_actions()
+	initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/swap_seat)
+	. = ..()

monkestation/code/game/mecha/makeshift/makeshift_ammo.dm

@@ -20,3 +20,17 @@
 	custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5)
 	rounds = 3
 	ammo_type = MECHA_AMMO_ISG
+
+/obj/item/mecha_ammo/makeshift/lighttankammo
+	name = "40mm tankshells"
+	desc = "An ancient box of 1.6in tank shells, for use with a small tank cannon."
+	icon_state = "light_tank_ammo"
+	rounds = 5
+	ammo_type = MECHA_AMMO_LIGHTTANK
+
+/obj/item/mecha_ammo/makeshift/lighttankmg
+	name = "12.7mm ammo box"
+	icon_state = "lighttankmg_ammo"
+	rounds = 60
+	ammo_type = MECHA_AMMO_LIGHTTANKMG
+

monkestation/code/game/mecha/makeshift/makeshift_drill.dm

@@ -0,0 +1,27 @@
+/obj/vehicle/sealed/mecha/makeshift_drill
+	desc = "a square of rusted sheetmetal bolted to tracks and housing a comically large drill. This pile of junk looks especially fragile."
+	name = "Sheet metal drill"
+	icon = 'monkestation/icons/mecha/makeshift_mechs.dmi'
+	icon_state = "sheetmetaldrill"
+	base_icon_state = "sheetmetaldrill"
+	silicon_icon_state = "null"
+	max_integrity = 65
+	lights_power = 8
+	movedelay = 2.5
+	mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS //can't strafe bruv
+	armor_type = /datum/armor/scrap_vehicles //Same armour as a locker (like it matters with that hp)
+	internal_damage_threshold = 30 //Its got shitty durability
+	wreckage = null
+	mech_type = EXOSUIT_MODULE_DRILL
+	equip_by_category = list(
+		MECHA_L_ARM = null,
+		MECHA_R_ARM = null,
+		MECHA_UTILITY = list(),
+		MECHA_POWER = list(),
+		MECHA_ARMOR = list(),
+	)
+	max_equip_by_category = list(
+		MECHA_UTILITY = 0,
+		MECHA_POWER = 0,
+		MECHA_ARMOR = 0,
+	)