Skip to content

Commit

Permalink
yes.
Browse files Browse the repository at this point in the history
  • Loading branch information
githubuser4141 committed May 25, 2024
1 parent d50db0d commit 699a8c9
Show file tree
Hide file tree
Showing 29 changed files with 1,208 additions and 1,418 deletions.
104 changes: 104 additions & 0 deletions code/__DEFINES/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1055,3 +1055,107 @@ GLOBAL_LIST_INIT(all_armor_types, list(
"acid" = 0, \
"wound" = 0, \
"damage_threshold" = 10)

/* VEHICLE ARMOR VALUES
*
*
********/

/*
* Uncovered vehicle 'armor', for buggies or bicycles
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_BUGGY list(\
"melee" = 20, \
"bullet" = 10, \
"laser" = 10, \
"energy" = 5, \
"bomb" = 0, \
"bio" = 50, \
"rad" = 25, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 0)

/*
* Light duty vehicles like regular cars
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_CAR list(\
"melee" = 30, \
"bullet" = 15, \
"laser" = 15, \
"energy" = 5, \
"bomb" = 10, \
"bio" = 50, \
"rad" = 25, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 3)

/*
* Heavy-duty vehicles like trucks
* Built tough to withstand more abuse
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_TRUCK list(\
"melee" = 45, \
"bullet" = 20, \
"laser" = 20, \
"energy" = 10, \
"bomb" = 25, \
"bio" = 50, \
"rad" = 25, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 5)

/*
* Light vehicles with DIY armor added to vulnerable areas
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_ARMORED_LIGHT list(\
"melee" = 50, \
"bullet" = 25, \
"laser" = 20, \
"energy" = 20, \
"bomb" = 35, \
"bio" = 50, \
"rad" = 50, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 8)

/*
* Heavy vehicles with a significant amount of armor added
* Generally, purpose-built to withstand a decent amount of attacks
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_ARMORED list(\
"melee" = 65, \
"bullet" = 40, \
"laser" = 40, \
"energy" = 35, \
"bomb" = 35, \
"bio" = 50, \
"rad" = 50, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 10)

/*
* Very sturdy vehicles designed for frontline combat
* Expected to survive a lot of attacks and dish out punishment
* * * * * * * * * * * */
#define ARMOR_VALUE_VEHICLE_TANK list(\
"melee" = 75, \
"bullet" = 55, \
"laser" = 55, \
"energy" = 50, \
"bomb" = 50, \
"bio" = 50, \
"rad" = 50, \
"fire" = 50, \
"acid" = 50, \
"wound" = 50, \
"damage_threshold" = 12)
2 changes: 2 additions & 0 deletions code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
//#define CAT_EXPLOSIVE "Explosives"
#define CAT_VEHICLES "Vehicles"
#define CAT_VEHICLEPARTS "Vehicle Parts"
#define CAT_VEHICLEWEAPONS "Vehicle Weapons"
#define CAT_VEHICLEAMMO "Vehicle Ammo"

#define RCD_FLOORWALL 1
#define RCD_AIRLOCK 2
Expand Down
26 changes: 0 additions & 26 deletions code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -567,19 +567,6 @@
category = CAT_WEAPONRY
subcategory = CAT_AMMO

/datum/crafting_recipe/lmgammo
name = "LMG Ammo for vehicules"
result = /obj/item/mecha_ammo/lmg/craftable
reqs = list(/obj/item/stack/crafting/metalparts = 5,
/obj/item/stack/sheet/prewar = 5,
/obj/item/ammo_box/a556 = 2,
/obj/item/stack/sheet/mineral/titanium = 1,
)
tools = list(TOOL_AWORKBENCH)
time = 5
category = CAT_WEAPONRY
subcategory = CAT_AMMO

/////////////////
///GUN CRAFTING//
/////////////////
Expand Down Expand Up @@ -681,19 +668,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/gun/HMGvehicule
name = "Improvised HMG (for vehicules)"
result = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
reqs = list(/obj/item/gun/ballistic/automatic/autopipe = 2,
/obj/item/stack/crafting/metalparts = 10,
/obj/item/stack/sheet/prewar = 8,
/obj/item/stack/sheet/mineral/titanium = 8,
/obj/item/stack/rods = 2)
tools = list(TOOL_WORKBENCH)
time = 180
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/gun/shotgunbat
name = "Shotgun bat"
result = /obj/item/gun/ballistic/revolver/hobo/single_shotgun
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/datum/crafting_recipe/lmgammo
name = "LMG Ammo for vehicules"
result = /obj/item/mecha_ammo/lmg/craftable
reqs = list(/obj/item/ammo_box/a556 = 1)
tools = list(TOOL_WORKBENCH)
time = 5
category = CAT_VEHICLES
subcategory = CAT_VEHICLEAMMO

/datum/crafting_recipe/gun/LMGvehicule
name = "Improvised LMG (for vehicules)"
result = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
reqs = list(/obj/item/gun/ballistic/automatic/autopipe = 2,
/obj/item/stack/crafting/metalparts = 10,
/obj/item/stack/sheet/prewar = 8,
/obj/item/stack/sheet/mineral/titanium = 8,
/obj/item/stack/rods = 2)
tools = list(TOOL_WORKBENCH)
time = 180
category = CAT_VEHICLES
subcategory = CAT_VEHICLEWEAPONS

/datum/crafting_recipe/gun/lasermount_vehicle
name = "vehicle-mounted laser rifle"
result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
reqs = list(/obj/item/stock_parts/scanning_module/phasic = 3,
/obj/item/stack/crafting/goodparts = 5,
/obj/item/stack/sheet/prewar = 10,
/obj/item/stack/sheet/mineral/titanium = 5,
/obj/item/stack/sheet/mineral/gold = 3,
/obj/item/stack/rods = 2)
tools = list(TOOL_AWORKBENCH)
time = 180
category = CAT_VEHICLES
subcategory = CAT_VEHICLEWEAPONS

/datum/crafting_recipe/gun/heavylasermount_vehicle
name = "vehicle-mounted heavy laser rifle"
result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
reqs = list(/obj/item/stock_parts/scanning_module/phasic = 6,
/obj/item/stack/crafting/goodparts = 10,
/obj/item/stack/sheet/prewar = 10,
/obj/item/stack/sheet/mineral/titanium = 10,
/obj/item/stack/sheet/mineral/gold = 5,
/obj/item/stack/rods = 2)
tools = list(TOOL_AWORKBENCH)
time = 180
category = CAT_VEHICLES
subcategory = CAT_VEHICLEWEAPONS

/datum/crafting_recipe/gun/plasmamount_vehicle
name = "vehicle-mounted Plasma caster"
result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
reqs = list(/obj/item/stock_parts/micro_laser/ultra = 6,
/obj/item/stack/crafting/goodparts = 10,
/obj/item/stack/sheet/prewar = 10,
/obj/item/stack/sheet/mineral/titanium = 10,
/obj/item/stack/sheet/mineral/diamond = 5,
/obj/item/stack/sheet/mineral/gold = 10,
/obj/item/stack/rods = 2)
tools = list(TOOL_AWORKBENCH)
time = 180
category = CAT_VEHICLES
subcategory = CAT_VEHICLEWEAPONS
1 change: 0 additions & 1 deletion code/game/mecha/combat/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
armor = ARMOR_VALUE_HEAVY
mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
deflect_chance = 0
max_equip = 4
stepsound = 'sound/mecha/neostep2.ogg'

/obj/mecha/combat/proc/max_ammo() //Max the ammo stored for Nuke Ops mechs, or anyone else that calls this
Expand Down
1 change: 0 additions & 1 deletion code/game/mecha/combat/gygax.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
max_temperature = 35000
leg_overload_coeff = 100
wreckage = /obj/structure/mecha_wreckage/gygax/dark
max_equip = 4

/obj/mecha/combat/gygax/dark/loaded/Initialize()
. = ..()
Expand Down
3 changes: 0 additions & 3 deletions code/game/mecha/combat/marauder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
wreckage = /obj/structure/mecha_wreckage/seraph
internal_damage_threshold = 20
force = 65
max_equip = 5

/obj/mecha/combat/marauder/seraph/Initialize()
. = ..()
Expand All @@ -74,8 +73,6 @@
name = "\improper Mauler"
icon_state = "mauler"
wreckage = /obj/structure/mecha_wreckage/mauler
max_equip = 5

/obj/mecha/combat/marauder/mauler/loaded/Initialize()
. = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src)
Expand Down
Loading

0 comments on commit 699a8c9

Please sign in to comment.