"
output += "
TerraGov Marine CorpsXenomorph HiveSons of Mars"
diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm
index 2c7f5e7db0534..f4d39682eba5b 100644
--- a/code/modules/projectiles/ammo_datums.dm
+++ b/code/modules/projectiles/ammo_datums.dm
@@ -945,6 +945,22 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
/datum/ammo/bullet/shotgun/buckshot/on_hit_mob(mob/M,obj/projectile/P)
staggerstun(M, P, weaken = 2 SECONDS, stagger = 2 SECONDS, knockback = 2, slowdown = 0.5, max_range = 3)
+/datum/ammo/bullet/hefa_buckshot
+ name = "hefa fragment"
+ handful_icon_state = "shotgun buckshot shell"
+ icon_state = "buckshot"
+ hud_state = "shotgun_buckshot"
+ accuracy_var_low = 9
+ accuracy_var_high = 9
+ accurate_range = 3
+ max_range = 10
+ shrapnel_chance = 15
+ damage = 30
+ damage_falloff = 3
+
+/datum/ammo/bullet/hefa_buckshot/on_hit_mob(mob/mob_hit, obj/projectile/projectile)
+ staggerstun(mob_hit, projectile, knockback = 2, max_range = 4)
+
/datum/ammo/bullet/shotgun/spread
name = "additional buckshot"
icon_state = "buckshot"
@@ -1324,6 +1340,17 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
accurate_range = 25
accurate_range_min = 3
+/datum/ammo/bullet/cupola
+ name = "cupola bullet"
+ bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction
+ hud_state = "smartgun"
+ hud_state_empty = "smartgun_empty"
+ flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SUNDERING|AMMO_IFF
+ accurate_range = 12
+ damage = 25
+ penetration = 5
+ sundering = 1
+
/datum/ammo/bullet/spottingrifle
name = "smart spotting bullet"
bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction
@@ -1463,7 +1490,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
sundering = 1
max_range = 35
///Bonus flat damage to walls, balanced around resin walls.
- var/autocannon_wall_bonus = 20
+ var/autocannon_wall_bonus = 50
/datum/ammo/bullet/auto_cannon/on_hit_turf(turf/T, obj/projectile/P)
P.proj_max_range -= 20
@@ -1488,7 +1515,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
sundering = 5
max_range = 30
airburst_multiplier = 1
- autocannon_wall_bonus = 5
+ autocannon_wall_bonus = 25
/datum/ammo/bullet/auto_cannon/flak/on_hit_mob(mob/victim, obj/projectile/proj)
airburst(victim, proj)
@@ -2150,11 +2177,12 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
flags_ammo_behavior = AMMO_EXPLOSIVE|AMMO_ROCKET
accurate_range = 15
max_range = 40
- penetration = 200
- damage = 300
+ penetration = 50
+ damage = 200
+ hud_state = "bigshell_he"
/datum/ammo/rocket/ltb/drop_nade(turf/T)
- explosion(T, 0, 4, 6, 0, 7)
+ explosion(T, 1, 2, 5, 0, 5)
/datum/ammo/rocket/mech
name = "large high-explosive rocket"
@@ -3447,9 +3475,9 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
glow_color = "#CB0166"
/datum/ammo/energy/xeno/psy_blast/psy_lance/on_hit_obj(obj/O, obj/projectile/P)
- if(ismecha(O))
- var/obj/vehicle/sealed/mecha/mech_victim = O
- mech_victim.take_damage(200, BURN, ENERGY, TRUE, armour_penetration = penetration)
+ if(isvehicle(O))
+ var/obj/vehicle/veh_victim = O
+ veh_victim.take_damage(200, BURN, ENERGY, TRUE, armour_penetration = penetration)
/datum/ammo/energy/xeno/psy_blast/psy_lance/on_hit_mob(mob/M, obj/projectile/P)
if(isxeno(M))
@@ -3762,6 +3790,9 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
/datum/ammo/xeno/sticky/on_hit_obj(obj/O, obj/projectile/P)
+ if(isarmoredvehicle(O))
+ var/obj/vehicle/sealed/armored/tank = O
+ COOLDOWN_START(tank, cooldown_vehicle_move, tank.move_delay)
var/turf/T = get_turf(O)
drop_resin(T.density ? P.loc : T)
diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm
index 478b504f450c7..d0adb7ed07f2b 100644
--- a/code/modules/projectiles/gun_system.dm
+++ b/code/modules/projectiles/gun_system.dm
@@ -260,7 +260,7 @@
///Slowdown for wielding
var/aim_slowdown = 0
///How long between wielding and firing in tenths of seconds
- var/wield_delay = 0.4 SECONDS
+ var/wield_delay = 0.6 SECONDS
///Extra wield delay for untrained operators
var/wield_penalty = 0.2 SECONDS
///Storing value for above
@@ -677,10 +677,10 @@
wdelay += wield_penalty
else
var/skill_value = user.skills.getRating(gun_skill_category)
+ if(skill_value < 0)
+ wdelay += wield_penalty
if(skill_value > 0)
wdelay -= skill_value * 2
- else
- wdelay += wield_penalty
wield_time = world.time + wdelay
do_wield(user, wdelay)
if(HAS_TRAIT(src, TRAIT_GUN_AUTO_AIM_MODE))
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index f322f479e4129..c0142ebe95db2 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -93,7 +93,7 @@
flags_gun_features = GUN_CAN_POINTBLANK|GUN_ENERGY|GUN_AMMO_COUNTER|GUN_AMMO_COUNT_BY_SHOTS_REMAINING|GUN_NO_PITCH_SHIFT_NEAR_EMPTY|GUN_SHOWS_AMMO_REMAINING
reciever_flags = AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_AUTO_EJECT|AMMO_RECIEVER_DO_NOT_EJECT_HANDFULS|AMMO_RECIEVER_CYCLE_ONLY_BEFORE_FIRE
aim_slowdown = 0.75
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
gun_skill_category = SKILL_RIFLES
muzzle_flash_color = COLOR_LASER_RED
@@ -466,7 +466,7 @@
attachable_offset = list("muzzle_x" = 40, "muzzle_y" = 17,"rail_x" = 22, "rail_y" = 21, "under_x" = 29, "under_y" = 10, "stock_x" = 22, "stock_y" = 12)
aim_slowdown = 0.4
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
scatter = 0
scatter_unwielded = 10
fire_delay = 0.2 SECONDS
@@ -565,7 +565,7 @@
attachable_offset = list("muzzle_x" = 23, "muzzle_y" = 22,"rail_x" = 12, "rail_y" = 22, "under_x" = 16, "under_y" = 14, "stock_x" = 22, "stock_y" = 12)
akimbo_additional_delay = 0.9
- wield_delay = 0.2 SECONDS
+ wield_delay = 0.4 SECONDS
scatter = 2
scatter_unwielded = 4
fire_delay = 0.15 SECONDS
@@ -653,7 +653,7 @@
attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 17, "rail_y" = 21, "under_x" = 23, "under_y" = 10, "stock_x" = 22, "stock_y" = 12)
aim_slowdown = 0.2
- wield_delay = 0.3 SECONDS
+ wield_delay = 0.5 SECONDS
scatter = 1
scatter_unwielded = 10
fire_delay = 1.5 SECONDS
@@ -788,7 +788,7 @@
starting_attachment_types = list(/obj/item/attachable/scope/unremovable/laser_sniper_scope)
aim_slowdown = 0.7
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
scatter = -4
scatter_unwielded = 10
fire_delay = 0.8 SECONDS
@@ -887,7 +887,7 @@
attachable_offset = list("muzzle_x" = 41, "muzzle_y" = 15,"rail_x" = 22, "rail_y" = 24, "under_x" = 30, "under_y" = 8, "stock_x" = 22, "stock_y" = 12)
aim_slowdown = 0.7
- wield_delay = 0.8 SECONDS
+ wield_delay = 1 SECONDS
scatter = 1
fire_delay = 0.2 SECONDS
burst_delay = 0.25 SECONDS
@@ -992,7 +992,7 @@
attachable_offset = list("muzzle_x" = 40, "muzzle_y" = 19,"rail_x" = 20, "rail_y" = 21, "under_x" = 30, "under_y" = 13, "stock_x" = 22, "stock_y" = 14)
ammo_level_icon = "tex"
aim_slowdown = 0.4
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
scatter = 0
scatter_unwielded = 10
fire_delay = 0.5 SECONDS
@@ -1053,8 +1053,7 @@
recoil_unwielded = 3
aim_slowdown = 0.35
- wield_delay = 0.4 SECONDS
- wield_penalty = 0.2 SECONDS
+ wield_delay = 0.6 SECONDS
damage_falloff_mult = 0.9
fire_delay = 0.2 SECONDS
@@ -1104,7 +1103,7 @@
recoil_unwielded = 0
movement_acc_penalty_mult = 2
aim_slowdown = 0.1
- wield_delay = 0.2 SECONDS
+ wield_delay = 0.4 SECONDS
/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom
name = "\improper VX-12c Serpenta"
@@ -1193,7 +1192,7 @@
accuracy_mult = 1.1
aim_slowdown = 0.65
damage_falloff_mult = 0.4
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
fire_delay = 0.25 SECONDS
/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/magharness
@@ -1233,7 +1232,7 @@
reciever_flags = AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_DO_NOT_EJECT_HANDFULS|AMMO_RECIEVER_CYCLE_ONLY_BEFORE_FIRE
attachable_offset = list("muzzle_x" = 34, "muzzle_y" = 14,"rail_x" = 11, "rail_y" = 29, "under_x" = 23, "under_y" = 10, "stock_x" = 22, "stock_y" = 12)
aim_slowdown = 1
- wield_delay = 1.2 SECONDS
+ wield_delay = 1.4 SECONDS
fire_delay = 0.15 SECONDS
scatter = 3
accuracy_mult_unwielded = 0.4
diff --git a/code/modules/projectiles/guns/flamer.dm b/code/modules/projectiles/guns/flamer.dm
index 0ba7999819730..14474cae1dd35 100644
--- a/code/modules/projectiles/guns/flamer.dm
+++ b/code/modules/projectiles/guns/flamer.dm
@@ -18,6 +18,7 @@
reload_sound = 'sound/weapons/guns/interact/flamethrower_reload.ogg'
muzzle_flash = null
aim_slowdown = 1.75
+ wield_delay = 0.4 SECONDS
general_codex_key = "flame weapons"
attachable_allowed = list( //give it some flexibility.
/obj/item/attachable/flashlight,
diff --git a/code/modules/projectiles/guns/grenade_launchers.dm b/code/modules/projectiles/guns/grenade_launchers.dm
index 7ce19b0141d4e..d5fb0e8e6dee9 100644
--- a/code/modules/projectiles/guns/grenade_launchers.dm
+++ b/code/modules/projectiles/guns/grenade_launchers.dm
@@ -13,6 +13,7 @@ The Grenade Launchers
throw_speed = 2
throw_range = 10
force = 5
+ wield_delay = 0.4 SECONDS
caliber = CALIBER_40MM //codex
load_method = SINGLE_CASING //codex
icon = 'icons/obj/items/guns/special.dmi'
@@ -62,6 +63,7 @@ The Grenade Launchers
/obj/item/explosive/grenade/chem_grenade/teargas,
/obj/item/explosive/grenade/flashbang/stun,
/obj/item/explosive/grenade/bullet/laser,
+ /obj/item/explosive/grenade/bullet/hefa,
)
reciever_flags = NONE
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index 79f9376b41d80..59df4c0dd34f6 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -422,7 +422,7 @@
max_shells = 150 //codex
force = 40
aim_slowdown = 1.2
- wield_delay = 2 SECONDS
+ wield_delay = 2.2 SECONDS
fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg27.ogg'
fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg27_low.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm
index bcca46ed53d3e..b4d8dc5eebb39 100644
--- a/code/modules/projectiles/guns/pistols.dm
+++ b/code/modules/projectiles/guns/pistols.dm
@@ -18,7 +18,7 @@
w_class = WEIGHT_CLASS_NORMAL
force = 6
movement_acc_penalty_mult = 2
- wield_delay = 0.2 SECONDS //If you modify your pistol to be two-handed, it will still be fast to aim
+ wield_delay = 0.4 SECONDS
type_of_casings = "bullet"
gun_skill_category = SKILL_PISTOLS
attachable_allowed = list(
@@ -108,7 +108,7 @@
flags_gun_features = GUN_CAN_POINTBLANK|GUN_ENERGY|GUN_AMMO_COUNTER|GUN_IS_ATTACHMENT|GUN_SMOKE_PARTICLES
reciever_flags = AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_AUTO_EJECT|AMMO_RECIEVER_DO_NOT_EJECT_HANDFULS|AMMO_RECIEVER_CYCLE_ONLY_BEFORE_FIRE
actions_types = list()
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
muzzle_flash_color = COLOR_GREEN
fire_delay = 1.5 SECONDS
@@ -783,7 +783,7 @@ It is a modified Beretta 93R, and can fire three round burst or single fire. Whe
attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 20,"rail_x" = 13, "rail_y" = 23, "under_x" = 19, "under_y" = 13, "stock_x" = 21, "stock_y" = 17)
aim_slowdown = 0.2
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
fire_delay = 0.2 SECONDS
accuracy_mult = 1.2
accuracy_mult_unwielded = 0.85
diff --git a/code/modules/projectiles/guns/plasma.dm b/code/modules/projectiles/guns/plasma.dm
index adaae967bc6b3..18ad79c862776 100644
--- a/code/modules/projectiles/guns/plasma.dm
+++ b/code/modules/projectiles/guns/plasma.dm
@@ -29,7 +29,7 @@
unload_sound = 'sound/weapons/guns/interact/plasma_unload_3.ogg'
reload_sound = 'sound/weapons/guns/interact/plasma_reload_2.ogg'
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
aim_slowdown = 0.5
accuracy_mult = 1.1
@@ -108,9 +108,10 @@
flags_equip_slot = ITEM_SLOT_BACK
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_AMMO_COUNT_BY_SHOTS_REMAINING|GUN_WIELDED_FIRING_ONLY
w_class = WEIGHT_CLASS_BULKY
+ gun_skill_category = SKILL_HEAVY_WEAPONS
aim_slowdown = 1.2
- wield_delay = 1.5 SECONDS
+ wield_delay = 1.7 SECONDS
movement_acc_penalty_mult = 6
accuracy_mult = 1
diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm
index 9a5d50112bbc1..4c683c5e3572e 100644
--- a/code/modules/projectiles/guns/revolvers.dm
+++ b/code/modules/projectiles/guns/revolvers.dm
@@ -21,7 +21,7 @@
actions_types = list(/datum/action/item_action/aim_mode)
aim_speed_modifier = 0.75
aim_fire_delay = 0.25 SECONDS
- wield_delay = 0.2 SECONDS //If you modify your revolver to be two-handed, it will still be fast to aim
+ wield_delay = 0.4 SECONDS
gun_skill_category = SKILL_PISTOLS
reciever_flags = AMMO_RECIEVER_HANDFULS|AMMO_RECIEVER_ROTATES_CHAMBER|AMMO_RECIEVER_TOGGLES_OPEN|AMMO_RECIEVER_TOGGLES_OPEN_EJECTS
diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
index 2b5845ed165db..fdb3f4fa5ee63 100644
--- a/code/modules/projectiles/guns/rifles.dm
+++ b/code/modules/projectiles/guns/rifles.dm
@@ -10,7 +10,7 @@
flags_gun_features = GUN_CAN_POINTBLANK||GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES
load_method = MAGAZINE //codex
aim_slowdown = 0.35
- wield_delay = 0.6 SECONDS
+ wield_delay = 0.8 SECONDS
gun_skill_category = SKILL_RIFLES
burst_amount = 3
@@ -173,7 +173,7 @@
extra_delay = 0.05 SECONDS
accuracy_mult = 1.1
scatter = -2
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
burst_amount = 3
aim_slowdown = 0.4
damage_falloff_mult = 0.5
@@ -213,7 +213,7 @@
reload_sound = 'sound/weapons/guns/interact/m41a_reload.ogg'
caliber = CALIBER_10x27_CASELESS //codex
aim_slowdown = 0.75
- wield_delay = 0.8 SECONDS
+ wield_delay = 1 SECONDS
force = 20
max_shells = 20 //codex
default_ammo_type = /obj/item/ammo_magazine/rifle/standard_dmr
@@ -293,7 +293,7 @@
reload_sound = 'sound/weapons/guns/interact/m41a_reload.ogg'
caliber = CALIBER_10x265_CASELESS //codex
aim_slowdown = 0.55
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
force = 20
max_shells = 36 //codex
default_ammo_type = /obj/item/ammo_magazine/rifle/standard_br
@@ -406,7 +406,7 @@
burst_delay = 0.15 SECONDS
accuracy_mult = 1.1
scatter = -1
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
burst_amount = 3
aim_slowdown = 0.4
damage_mult = 1.05 //Has smaller magazines
@@ -479,7 +479,7 @@
unload_sound = 'sound/weapons/guns/interact/m41a_unload.ogg'
reload_sound = 'sound/weapons/guns/interact/m41a_reload.ogg'
aim_slowdown = 0.5
- wield_delay = 1.35 SECONDS
+ wield_delay = 1.55 SECONDS
max_shells = 95 //codex
default_ammo_type = /obj/item/ammo_magazine/rifle/m41a
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/m41a)
@@ -580,7 +580,7 @@
burst_amount = 1
fire_delay = 0.25 SECONDS
scatter = 0
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
placed_overlay_iconstate = "ak47"
@@ -658,7 +658,7 @@
caliber = CALIBER_762X39 //codex
muzzleflash_iconstate = "muzzle_flash_medium"
max_shells = 100 //codex
- wield_delay = 1.2 SECONDS
+ wield_delay = 1.4 SECONDS
aim_slowdown = 0.95
fire_sound = 'sound/weapons/guns/fire/ak47.ogg'
unload_sound = 'sound/weapons/guns/interact/ak47_unload.ogg'
@@ -749,7 +749,7 @@
accuracy_mult = 1
scatter = 2
recoil = -1
- wield_delay = 0.9 SECONDS
+ wield_delay = 1.1 SECONDS
aim_slowdown = 0.85
movement_acc_penalty_mult = 4
@@ -812,7 +812,7 @@
extra_delay = -0.05 SECONDS
burst_delay = 0.15 SECONDS
accuracy_mult = 1.1
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
damage_mult = 1.2
/obj/item/weapon/gun/rifle/m16/freelancer
@@ -872,7 +872,7 @@
fire_delay = 0.15 SECONDS
burst_delay = 0.15 SECONDS
accuracy_mult = 1.15
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
damage_mult = 1.2
scatter = 1
movement_acc_penalty_mult = 4
@@ -901,7 +901,7 @@
max_shells = 120 //codex
force = 30
aim_slowdown = 0.8
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg42.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
@@ -982,7 +982,7 @@
max_shells = 200 //codex
force = 35
aim_slowdown = 1.2
- wield_delay = 1.5 SECONDS
+ wield_delay = 1.7 SECONDS
fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg'
fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg60_low.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
@@ -1050,7 +1050,7 @@
caliber = CALIBER_10X24_CASELESS //codex
max_shells = 200 //codex
aim_slowdown = 0.8
- wield_delay = 2 SECONDS
+ wield_delay = 2.2 SECONDS
fire_sound = 'sound/weapons/guns/fire/hmg.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/m41a_unload.ogg'
@@ -1124,7 +1124,7 @@
default_ammo_type = /obj/item/ammo_magazine/rifle/type71
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/type71)
aim_slowdown = 0.6
- wield_delay = 0.7 SECONDS
+ wield_delay = 0.9 SECONDS
attachable_allowed = list(
/obj/item/attachable/reddot,
/obj/item/attachable/verticalgrip,
@@ -1203,7 +1203,7 @@
desc = "An much rarer variant of the standard Type 71, this version contains an integrated supressor, a scope, and lots of fine-tuning. Many parts have been replaced, filed down, and improved upon. As a result, this variant is rarely seen outside of elite units."
icon_state = "type71"
item_state = "type71"
- wield_delay = 0 //Ends up being .5 seconds due to scope
+ wield_delay = 0.2 SECONDS
attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 19,"rail_x" = 10, "rail_y" = 22, "under_x" = 21, "under_y" = 18, "stock_x" = 21, "stock_y" = 18)
starting_attachment_types = list(/obj/item/attachable/suppressor/unremovable/invisible, /obj/item/attachable/scope/unremovable)
@@ -1299,7 +1299,7 @@
max_shells = 300 //codex
force = 30
aim_slowdown = 0.95
- wield_delay = 1.3 SECONDS
+ wield_delay = 1.5 SECONDS
fire_sound = "gun_smartgun"
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
@@ -1361,7 +1361,7 @@
caliber = CALIBER_10x27_CASELESS //codex
max_shells = 40 //codex
aim_slowdown = 0.85
- wield_delay = 0.65 SECONDS
+ wield_delay = 0.85 SECONDS
fire_sound = 'sound/weapons/guns/fire/t62.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
@@ -1452,7 +1452,7 @@
muzzleflash_iconstate = "muzzle_flash_pulse"
default_ammo_type = /obj/item/ammo_magazine/rifle/sectoid_rifle
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/sectoid_rifle)
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_ENERGY|GUN_SMOKE_PARTICLES
gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO, GUN_FIREMODE_BURSTFIRE, GUN_FIREMODE_AUTOBURST)
@@ -1550,7 +1550,7 @@
recoil = 0
recoil_unwielded = 4
aim_slowdown = 1
- wield_delay = 1.3 SECONDS
+ wield_delay = 1.5 SECONDS
cock_delay = 0.7 SECONDS
movement_acc_penalty_mult = 6
@@ -1601,7 +1601,7 @@
recoil = 0
recoil_unwielded = 4
aim_slowdown = 1
- wield_delay = 1.3 SECONDS
+ wield_delay = 1.5 SECONDS
movement_acc_penalty_mult = 6
//-------------------------------------------------------
@@ -1614,7 +1614,7 @@
item_state = "tx11"
caliber = CALIBER_492X34_CASELESS //codex
max_shells = 70 //codex
- wield_delay = 0.65 SECONDS
+ wield_delay = 0.85 SECONDS
fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_ar11.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
@@ -1731,7 +1731,7 @@
burst_delay = 0.15 SECONDS
accuracy_mult = 1.2
scatter = -2
- wield_delay = 0.6 SECONDS
+ wield_delay = 0.8 SECONDS
aim_slowdown = 0.5
damage_falloff_mult = 0.5
@@ -1787,7 +1787,7 @@
scatter = 4
burst_amount = 4
aim_slowdown = 0.3
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
damage_falloff_mult = 3
movement_acc_penalty_mult = 4
@@ -1845,7 +1845,7 @@
burst_amount = 1
fire_delay = 0.2 SECONDS
scatter = 1
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
movement_acc_penalty_mult = 4
//-------------------------------------------------------
@@ -1898,7 +1898,7 @@
gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO)
attachable_offset = list("muzzle_x" = 31, "muzzle_y" = 17,"rail_x" = 12, "rail_y" = 20, "under_x" = 28, "under_y" = 13, "stock_x" = -1, "stock_y" = 17)
aim_slowdown = 0.8
- wield_delay = 0.8 SECONDS
+ wield_delay = 1 SECONDS
burst_amount = 1
accuracy_mult = 1.15
scatter = -2
@@ -1942,7 +1942,7 @@
reload_sound = 'sound/weapons/guns/interact/t18_reload.ogg'
caliber = CALIBER_10X24_CASELESS //codex
max_shells = 36 //codex
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
default_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/standard_carbine)
attachable_allowed = list(
@@ -2065,7 +2065,7 @@
recoil = 0
recoil_unwielded = 4
aim_slowdown = 0.75
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
movement_acc_penalty_mult = 6
//-------------------------------------------------------
@@ -2116,7 +2116,7 @@
attachable_offset = list("muzzle_x" = 45, "muzzle_y" = 16,"rail_x" = 23, "rail_y" = 24, "under_x" = 33, "under_y" = 11, "stock_x" = -1, "stock_y" = 17)
actions_types = list(/datum/action/item_action/aim_mode)
- wield_delay = 0.6 SECONDS
+ wield_delay = 0.8 SECONDS
aim_fire_delay = 0.1 SECONDS
aim_speed_modifier = 2
@@ -2210,7 +2210,7 @@
accuracy_mult = 0.75
scatter = 12
recoil = 1.5
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
aim_slowdown = 0.4
movement_acc_penalty_mult = 4
damage_falloff_mult = 1.4
@@ -2258,7 +2258,7 @@
caliber = CALIBER_10x26_CASELESS
max_shells = 200
force = 35
- wield_delay = 1.5 SECONDS
+ wield_delay = 1.7 SECONDS
fire_sound = 'sound/weapons/guns/fire/v41.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
@@ -2329,7 +2329,7 @@
reload_sound = 'sound/weapons/guns/interact/fal_reload.ogg'
caliber = CALIBER_10x27_CASELESS //codex
aim_slowdown = 0.8
- wield_delay = 0.85 SECONDS
+ wield_delay = 1.05 SECONDS
force = 20
max_shells = 20 //codex
default_ammo_type = /obj/item/ammo_magazine/rifle/icc_sharpshooter
@@ -2443,7 +2443,7 @@
fire_delay = 0.2 SECONDS
scatter = 3
aim_slowdown = 0.35
- wield_delay = 0.35 SECONDS
+ wield_delay = 0.55 SECONDS
damage_falloff_mult = 2.5
movement_acc_penalty_mult = 4
@@ -2505,7 +2505,7 @@
burst_amount = 1
fire_delay = 0.45 SECONDS
aim_slowdown = 0.55
- wield_delay = 0.65 SECONDS
+ wield_delay = 0.85 SECONDS
damage_falloff_mult = 2
movement_acc_penalty_mult = 6.5
@@ -2567,7 +2567,7 @@
accuracy_mult = 1.15
damage_mult = 0.5
aim_slowdown = 0.6
- wield_delay = 0.55 SECONDS
+ wield_delay = 0.75 SECONDS
burst_amount = 1
scatter = 8
movement_acc_penalty_mult = 2
@@ -2616,7 +2616,7 @@
accuracy_mult = 1.15
damage_mult = 1.2
damage_falloff_mult = 1.5
- wield_delay = 0.65 SECONDS
+ wield_delay = 0.85 SECONDS
aim_slowdown = 0.2
scatter = 0
@@ -2647,7 +2647,7 @@
max_shells = 200 //codex
force = 30
aim_slowdown = 0.85
- wield_delay = 0.75 SECONDS
+ wield_delay = 0.95 SECONDS
fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg'
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
index fd9e5a501e3c3..629f2a4973c52 100644
--- a/code/modules/projectiles/guns/shotguns.dm
+++ b/code/modules/projectiles/guns/shotguns.dm
@@ -20,7 +20,7 @@
type_of_casings = "shell"
allowed_ammo_types = list()
aim_slowdown = 0.35
- wield_delay = 0.6 SECONDS //Shotguns are really easy to put up to fire, since they are designed for CQC (at least compared to a rifle)
+ wield_delay = 0.8 SECONDS //Shotguns are really easy to put up to fire, since they are designed for CQC (at least compared to a rifle)
gun_skill_category = SKILL_SHOTGUNS
flags_item_map_variant = NONE
@@ -115,7 +115,7 @@
damage_mult = 0.7 //30% less damage. Faster firerate.
recoil = 2
recoil_unwielded = 4
- wield_delay = 0.8 SECONDS
+ wield_delay = 1 SECONDS
akimbo_additional_delay = 0.9
/obj/item/weapon/gun/shotgun/combat/standardmarine/beginner
@@ -445,7 +445,7 @@
recoil_unwielded = 4
cock_delay = 12
aim_slowdown = 1
- wield_delay = 1.2 SECONDS
+ wield_delay = 1.4 SECONDS
movement_acc_penalty_mult = 4.5
placed_overlay_iconstate = "wood"
@@ -509,7 +509,7 @@
recoil_unwielded = 4
aim_slowdown = 1
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
movement_acc_penalty_mult = 5
placed_overlay_iconstate = "wood"
@@ -544,7 +544,7 @@
recoil = 0
recoil_unwielded = 0
aim_slowdown = 0
- wield_delay = 0.1 SECONDS
+ wield_delay = 0.3 SECONDS
damage_mult = 1
/obj/item/weapon/gun/shotgun/double/derringer/Initialize(mapload)
@@ -791,7 +791,7 @@
fire_delay = 1.75 SECONDS
damage_mult = 0.9
- wield_delay = 0.75 SECONDS
+ wield_delay = 0.95 SECONDS
burst_amount = 2
burst_delay = 0.01 SECONDS //basically instantaneous two shots
extra_delay = 0.5 SECONDS
@@ -843,7 +843,7 @@
recoil = 1
recoil_unwielded = 4
aim_slowdown = 0.35
- wield_delay = 0.65 SECONDS
+ wield_delay = 0.85 SECONDS
/obj/item/weapon/gun/shotgun/som/pointman
starting_attachment_types = list(/obj/item/attachable/bayonet, /obj/item/attachable/motiondetector)
diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm
index 9c660fd2d9bb1..619f34353d05a 100644
--- a/code/modules/projectiles/guns/smgs.dm
+++ b/code/modules/projectiles/guns/smgs.dm
@@ -13,7 +13,7 @@
load_method = MAGAZINE //codex
force = 8
w_class = WEIGHT_CLASS_BULKY
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
attachable_allowed = list(
/obj/item/attachable/suppressor,
/obj/item/attachable/reddot,
@@ -107,7 +107,7 @@
caliber = CALIBER_10X20_CASELESS //codex
max_shells = 50 //codex
flags_equip_slot = ITEM_SLOT_BACK
- wield_delay = 0.5 SECONDS
+ wield_delay = 0.7 SECONDS
force = 20
type_of_casings = null
default_ammo_type = /obj/item/ammo_magazine/smg/standard_smg
@@ -383,7 +383,7 @@
scatter_unwielded = 6
fire_delay = 0.1 SECONDS
aim_slowdown = 0.3
- wield_delay = 0.3 SECONDS
+ wield_delay = 0.5 SECONDS
/obj/item/weapon/gun/smg/skorpion/mag_harness
starting_attachment_types = list(/obj/item/attachable/foldable/skorpion_stock, /obj/item/attachable/magnetic_harness)
@@ -475,7 +475,7 @@
scatter = 0
scatter_unwielded = 4
aim_slowdown = 0.15
- wield_delay = 0.2 SECONDS
+ wield_delay = 0.4 SECONDS
/obj/item/weapon/gun/smg/uzi/mag_harness
default_ammo_type = /obj/item/ammo_magazine/smg/uzi/extended
@@ -523,7 +523,7 @@
fire_delay = 0.15 SECONDS
aim_slowdown = 0.15
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
accuracy_mult = 1.05
accuracy_mult_unwielded = 0.9
@@ -639,7 +639,7 @@
scatter = 2
scatter_unwielded = 5
aim_slowdown = 0.2
- wield_delay = 0.35 SECONDS
+ wield_delay = 0.55 SECONDS
upper_akimbo_accuracy = 5
lower_akimbo_accuracy = 3
@@ -702,7 +702,7 @@
burst_amount = 1
fire_delay = 0.15 SECONDS
aim_slowdown = 0.25
- wield_delay = 0.4 SECONDS
+ wield_delay = 0.6 SECONDS
accuracy_mult = 1.05
accuracy_mult_unwielded = 0.9
diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
index a313385dc4519..cd208aa6ecd01 100644
--- a/code/modules/projectiles/guns/specialist.dm
+++ b/code/modules/projectiles/guns/specialist.dm
@@ -20,7 +20,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
icon = 'icons/obj/items/guns/marksman.dmi'
aim_slowdown = 1
gun_skill_category = SKILL_RIFLES
- wield_delay = 1 SECONDS
+ wield_delay = 1.2 SECONDS
//Pow! Headshot
@@ -47,7 +47,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
/obj/item/ammo_magazine/sniper/flak,
)
force = 12
- wield_delay = 12 //Ends up being 1.6 seconds due to scope
+ wield_delay = 1.4 SECONDS
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 20, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14)
var/targetmarker_on = FALSE
var/targetmarker_primed = FALSE
@@ -319,7 +319,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
accuracy_mult = 1
scatter = -5
recoil = -1
- wield_delay = 1.8 SECONDS
+ wield_delay = 2 SECONDS
movement_acc_penalty_mult = 6
@@ -419,7 +419,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
allowed_ammo_types = list(/obj/item/ammo_magazine/minigun_powerpack)
w_class = WEIGHT_CLASS_HUGE
force = 20
- wield_delay = 12
+ wield_delay = 1.2 SECONDS
gun_skill_category = SKILL_HEAVY_WEAPONS
aim_slowdown = 0.8
flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES
@@ -493,7 +493,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
max_shells = 1000 //codex
caliber = CALIBER_10x26_CASELESS //codex
allowed_ammo_types = list(/obj/item/ammo_magazine/minigun_powerpack/smartgun)
- wield_delay = 1.5 SECONDS
+ wield_delay = 1.7 SECONDS
flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES
gun_skill_category = SKILL_SMARTGUN
attachable_allowed = list(/obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector)
@@ -532,7 +532,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
default_ammo_type = /obj/item/ammo_magazine/rifle/pepperball
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/pepperball)
force = 30 // two shots weeds as it has no bayonet
- wield_delay = 0.5 SECONDS // Very fast to put up.
+ wield_delay = 0.7 SECONDS // Very fast to put up.
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 20, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14)
attachable_allowed = list(
/obj/item/attachable/buildasentry,
@@ -626,7 +626,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
flags_equip_slot = NONE
w_class = WEIGHT_CLASS_HUGE
force = 15
- wield_delay = 12
+ wield_delay = 1.2 SECONDS
wield_penalty = 1.6 SECONDS
aim_slowdown = 1.75
general_codex_key = "explosive weapons"
@@ -709,7 +709,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
flags_equip_slot = NONE
w_class = WEIGHT_CLASS_HUGE
force = 15
- wield_delay = 12
+ wield_delay = 1.2 SECONDS
wield_penalty = 1.6 SECONDS
aim_slowdown = 1.75
general_codex_key = "explosive weapons"
@@ -838,7 +838,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
/obj/item/attachable/shoulder_mount,
)
- gun_skill_category = SKILL_HEAVY_WEAPONS
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 15, "rail_y" = 19, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14)
fire_delay = 1 SECONDS
@@ -1024,7 +1023,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
/obj/item/ammo_magazine/railgun/hvap,
)
force = 40
- wield_delay = 1 SECONDS //You're not quick drawing this.
+ wield_delay = 1.2 SECONDS
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 31, "rail_y" = 23, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14)
attachable_allowed = list(
/obj/item/attachable/magnetic_harness,
@@ -1069,7 +1068,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
/obj/item/ammo_magazine/rifle/icc_coilgun,
)
force = 40
- wield_delay = 1 SECONDS //You're not quick drawing this.
+ wield_delay = 1.2 SECONDS
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 31, "rail_y" = 23, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14)
attachable_allowed = list(
/obj/item/attachable/magnetic_harness,
diff --git a/code/modules/projectiles/mounted.dm b/code/modules/projectiles/mounted.dm
index 49e52959dbe1c..2efd81fba4b6b 100644
--- a/code/modules/projectiles/mounted.dm
+++ b/code/modules/projectiles/mounted.dm
@@ -4,7 +4,7 @@
anchored = TRUE
resistance_flags = XENO_DAMAGEABLE
density = TRUE
- layer = TANK_BARREL_LAYER
+ layer = ABOVE_MOB_PROP_LAYER
use_power = FALSE
hud_possible = list(MACHINE_HEALTH_HUD, MACHINE_AMMO_HUD)
allow_pass_flags = PASSABLE|PASS_LOW_STRUCTURE
diff --git a/code/modules/projectiles/sentries.dm b/code/modules/projectiles/sentries.dm
index c0102411a309e..2106edca55208 100644
--- a/code/modules/projectiles/sentries.dm
+++ b/code/modules/projectiles/sentries.dm
@@ -302,7 +302,7 @@
set_on(FALSE)
update_icon()
-/obj/machinery/deployable/mounted/sentry/take_damage(damage_amount, damage_type, damage_flag, effects, attack_dir, armour_penetration)
+/obj/machinery/deployable/mounted/sentry/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob)
if(damage_amount <= 0)
return
if(prob(10))
diff --git a/code/modules/reagents/reagents.dm b/code/modules/reagents/reagents.dm
index 96cd0c4592fa0..bdfc9d7e5f21b 100644
--- a/code/modules/reagents/reagents.dm
+++ b/code/modules/reagents/reagents.dm
@@ -171,7 +171,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
/// Called when addiction hits stage4, see [/datum/reagents/proc/metabolize]
/datum/reagent/proc/addiction_act_stage4(mob/living/L, metabolism)
if(prob(30))
- to_chat(L, span_boldannounce("You're not feeling good at all! You really need some [name]."))
+ to_chat(L, span_danger("You're not feeling good at all! You really need some [name]."))
///Convert reagent list to a printable string for logging etc
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8dacbdb9675fe..1ba472b8aadec 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -1,52 +1,42 @@
//conveyor2 is pretty much like the original, except it supports corners, but not diverters.
//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
+
+///Max amount of items it will try move in one go
#define MAX_CONVEYOR_ITEMS_MOVE 30
+
+///It don't go
+#define CONVEYOR_OFF 0
+///It go forwards
+#define CONVEYOR_ON_FORWARDS 1
+///It go back
+#define CONVEYOR_ON_REVERSE -1
+
+///true if can operate (no broken segments in this belt run)
+#define CONVEYOR_OPERABLE (1<<0)
+///Inverts the direction the conveyor belt moves, only particularly relevant for diagonals
+#define CONVEYOR_INVERTED (1<<1)
+///Currently has things scheduled for movement. Required to reduce lag
+#define CONVEYOR_IS_CONVEYING (1<<2)
+
GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor
icon = 'icons/obj/recycling.dmi'
icon_state = "conveyor_map"
name = "conveyor belt"
- desc = "A conveyor belt. It can be rotated with a
wrench. It can be reversed with a
screwdriver. The belt can be flipped with a
wirecutter."
+ desc = "A conveyor belt. It can be rotated with a
wrench. It can be reversed with a
screwdriver."
layer = FIREDOOR_OPEN_LAYER
max_integrity = 50
resistance_flags = XENO_DAMAGEABLE
- var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off
- var/operable = 1 // true if can operate (no broken segments in this belt run)
- var/forwards // this is the default (forward) direction, set by the map dir
- var/backwards // hopefully self-explanatory
- var/movedir // the actual direction to move stuff in
-
- var/list/affecting // the list of all items that will be moved this ptick
- var/id = "" // the control ID - must match controller ID
- /// Inverts the direction the conveyor belt moves when false.
- var/verted = FALSE
- /// Is the conveyor's belt flipped? Useful mostly for conveyor belt corners. It makes the belt point in the other direction, rather than just going in reverse.
- var/flipped = FALSE
- /// Are we currently conveying items?
- var/conveying = FALSE
-
-/obj/machinery/conveyor/centcom_auto
- id = "round_end_belt"
-
-/obj/machinery/conveyor/inverted //Directions inverted so you can use different corner pieces.
- icon_state = "conveyor_map_inverted"
- verted = -1
- flipped = TRUE
-
-/obj/machinery/conveyor/inverted/Initialize(mapload)
- . = ..()
- if(mapload && !(ISDIAGONALDIR(dir)))
- stack_trace("[src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
-
-
-/obj/machinery/conveyor/auto/update()
- . = ..()
- if(.)
- operating = TRUE
- update_icon()
+ ///Conveyor specific flags
+ var/conveyor_flags = CONVEYOR_OPERABLE
+ ///Operating direction
+ var/operating = CONVEYOR_OFF
+ ///Current direction of movement
+ var/movedir
+ /// the control ID - must match controller ID
+ var/id = ""
-// create a conveyor
/obj/machinery/conveyor/Initialize(mapload, newdir, newid)
. = ..()
if(newdir)
@@ -57,10 +47,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
update_move_direction()
update_icon()
-/obj/machinery/conveyor/auto/Initialize(mapload, newdir)
- operating = TRUE
- return ..()
-
/obj/machinery/conveyor/Destroy()
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
return ..()
@@ -74,102 +60,17 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
else
return ..()
-/obj/machinery/conveyor/setDir(newdir)
- . = ..()
- update_move_direction()
-
-/obj/machinery/conveyor/proc/update_move_direction()
- switch(dir)
- if(NORTH)
- forwards = NORTH
- backwards = SOUTH
- if(SOUTH)
- forwards = SOUTH
- backwards = NORTH
- if(EAST)
- forwards = EAST
- backwards = WEST
- if(WEST)
- forwards = WEST
- backwards = EAST
- if(NORTHEAST)
- forwards = EAST
- backwards = SOUTH
- if(NORTHWEST)
- forwards = NORTH
- backwards = EAST
- if(SOUTHEAST)
- forwards = SOUTH
- backwards = WEST
- if(SOUTHWEST)
- forwards = WEST
- backwards = NORTH
- if(verted)
- var/temp = forwards
- forwards = backwards
- backwards = temp
- if(flipped)
- var/temp = forwards
- forwards = backwards
- backwards = temp
- if(operating == 1)
- movedir = forwards
- else
- movedir = backwards
- update()
-
/obj/machinery/conveyor/update_icon_state()
. = ..()
if(machine_stat & BROKEN)
icon_state = "conveyor-broken"
- else
- icon_state = "conveyor[verted ? -operating : operating ][flipped ? "-flipped" : ""]"
-
-/obj/machinery/conveyor/proc/update()
- if(machine_stat & BROKEN || !operable || machine_stat & NOPOWER)
- operating = FALSE
- update_icon()
- return FALSE
- return TRUE
-// machine process
-// move items to the target location
-/obj/machinery/conveyor/process()
- if(machine_stat & (BROKEN | NOPOWER))
- return
-
- //If the conveyor is broken or already moving items
- if(!operating || conveying)
- return
-
- //get the first 30 items in contents
- var/turf/locturf = loc
- var/list/items = locturf.contents - src
- if(!LAZYLEN(items))//Dont do anything at all if theres nothing there but the conveyor
- return
- var/list/affecting
- if(length(items) > MAX_CONVEYOR_ITEMS_MOVE)
- affecting = items.Copy(1, MAX_CONVEYOR_ITEMS_MOVE + 1)//Lists start at 1 lol
else
- affecting = items
- conveying = TRUE
-
- INVOKE_NEXT_TICK(src, PROC_REF(convey), affecting)//Movement effect
+ icon_state = "conveyor[!operating ? "_off" : operating == CONVEYOR_ON_FORWARDS ? "_forwards": "_reverse"][conveyor_flags & CONVEYOR_INVERTED ? "_inverted" : ""]"
-/obj/machinery/conveyor/proc/convey(list/affecting)
- for(var/am in affecting)
- if(!ismovable(am)) //This is like a third faster than for(var/atom/movable in affecting)
- continue
- var/atom/movable/movable_thing = am
- //Give this a chance to yield if the server is busy
- stoplag()
- if(QDELETED(movable_thing) || (movable_thing.loc != loc))
- continue
- if(iseffect(movable_thing) || isdead(movable_thing))
- continue
- if(!movable_thing.anchored)
- step(movable_thing, movedir)
- conveying = FALSE
+/obj/machinery/conveyor/setDir(newdir)
+ . = ..()
+ update_move_direction()
/obj/machinery/conveyor/crowbar_act(mob/living/user, obj/item/I)
user.visible_message(span_notice("[user] struggles to pry up \the [src] with \the [I]."), \
@@ -193,16 +94,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor/screwdriver_act(mob/living/user, obj/item/I)
if(machine_stat & BROKEN)
return TRUE
- verted = !verted
- update_move_direction()
- to_chat(user, span_notice("You set [src]'s direction [verted ? "backwards" : "back to default"]."))
-
-/obj/machinery/conveyor/wirecutter_act(mob/living/user, obj/item/I)
- if(machine_stat & BROKEN)
- return TRUE
- flipped = !flipped
+ conveyor_flags ^= CONVEYOR_INVERTED
update_move_direction()
- to_chat(user, span_notice("You flip [src]'s belt [flipped ? "around" : "back to normal"]."))
+ update_icon()
+ balloon_alert(user, "[conveyor_flags & CONVEYOR_INVERTED ? "backwards" : "back to default"]")
/obj/machinery/conveyor/attackby(obj/item/I, mob/living/user, def_zone)
. = ..()
@@ -216,52 +111,149 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
return
user.Move_Pulled(src)
-// make the conveyor broken
-// also propagate inoperability to any connected conveyor with the same ID
-/obj/machinery/conveyor/proc/broken()
- obj_break()
+/obj/machinery/conveyor/power_change()
+ . = ..()
update()
- var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
- if(C)
- C.set_operable(dir, id, 0)
+/obj/machinery/conveyor/process()
+ if(conveyor_flags & CONVEYOR_IS_CONVEYING)
+ return //you've made a lag monster
+ if(!is_operational())
+ return PROCESS_KILL
+ if(!operating)
+ return PROCESS_KILL
+ if(!isturf(loc))
+ return PROCESS_KILL //how
+
+ //get the first 30 items in contents
+ var/list/items_to_move = loc.contents - src
+ if(length(items_to_move) > MAX_CONVEYOR_ITEMS_MOVE)
+ items_to_move = items_to_move.Copy(1, MAX_CONVEYOR_ITEMS_MOVE + 1)
- C = locate() in get_step(src, REVERSE_DIR(dir))
- if(C)
- C.set_operable(REVERSE_DIR(dir), id, 0)
+ conveyor_flags |= CONVEYOR_IS_CONVEYING
+ INVOKE_NEXT_TICK(src, PROC_REF(convey), items_to_move)
+///Attempts to move a batch of AMs
+/obj/machinery/conveyor/proc/convey(list/affecting)
+ if(!is_operational())
+ return
+ if(!operating)
+ return
+ for(var/am in affecting)
+ if(!ismovable(am)) //This is like a third faster than for(var/atom/movable in affecting)
+ continue
+ var/atom/movable/movable_thing = am
+ stoplag() //Give this a chance to yield if the server is busy
+ if(QDELETED(movable_thing))
+ continue
+ if((movable_thing.loc != loc))
+ continue
+ if(iseffect(movable_thing))
+ continue
+ if(isdead(movable_thing))
+ return
+ if(movable_thing.anchored)
+ return
+ step(movable_thing, movedir)
-//set the operable var if ID matches, propagating in the given direction
+ conveyor_flags &= ~CONVEYOR_IS_CONVEYING
-/obj/machinery/conveyor/proc/set_operable(stepdir, match_id, op)
+///Sets the correct movement directions based on dir
+/obj/machinery/conveyor/proc/update_move_direction()
+ var/forwards
+ var/backwards
+ switch(dir)
+ if(NORTH)
+ forwards = NORTH
+ backwards = SOUTH
+ if(SOUTH)
+ forwards = SOUTH
+ backwards = NORTH
+ if(EAST)
+ forwards = EAST
+ backwards = WEST
+ if(WEST)
+ forwards = WEST
+ backwards = EAST
+ if(NORTHEAST)
+ forwards = EAST
+ backwards = SOUTH
+ if(NORTHWEST)
+ forwards = NORTH
+ backwards = EAST
+ if(SOUTHEAST)
+ forwards = SOUTH
+ backwards = WEST
+ if(SOUTHWEST)
+ forwards = WEST
+ backwards = NORTH
+ if(conveyor_flags & CONVEYOR_INVERTED)
+ var/temp = forwards
+ forwards = backwards
+ backwards = temp
+ if(operating == CONVEYOR_ON_FORWARDS)
+ movedir = forwards
+ else
+ movedir = backwards
+ update()
- if(id != match_id)
+///Handles setting its operating status
+/obj/machinery/conveyor/proc/set_operating(new_position)
+ if(operating == new_position)
return
- operable = op
+ operating = new_position
+ update_move_direction()
+ update_icon()
- update()
- var/obj/machinery/conveyor/C = locate() in get_step(src, stepdir)
- if(C)
- C.set_operable(stepdir, id, op)
+ if(operating)
+ start_processing()
+ else
+ stop_processing()
-/obj/machinery/conveyor/power_change()
+///Checks to see if the conveyor needs to be switched off
+/obj/machinery/conveyor/proc/update()
+ if(!is_operational() || !(conveyor_flags & CONVEYOR_OPERABLE))
+ set_operating(CONVEYOR_OFF)
+ return FALSE
+ return TRUE
+
+/obj/machinery/conveyor/centcom_auto
+ id = "round_end_belt"
+
+/obj/machinery/conveyor/inverted //Directions inverted so you can use different corner pieces.
+ icon_state = "conveyor_map_inverted"
+ conveyor_flags = CONVEYOR_OPERABLE|CONVEYOR_INVERTED
+
+/obj/machinery/conveyor/inverted/Initialize(mapload)
. = ..()
- update()
+ if(mapload && !(ISDIAGONALDIR(dir)))
+ stack_trace("[src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
-///////// the conveyor control switch
+/obj/machinery/conveyor/auto/Initialize(mapload, newdir)
+ set_operating(CONVEYOR_ON_FORWARDS)
+ return ..()
+
+/obj/machinery/conveyor/auto/update()
+ . = ..()
+ if(.)
+ set_operating(CONVEYOR_ON_FORWARDS)
+///////// the conveyor control switch
/obj/machinery/conveyor_switch
name = "conveyor switch"
desc = "A conveyor control switch."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
-
- var/position = 0 // 0 off, -1 reverse, 1 forward
- var/last_pos = -1 // last direction setting
- var/oneway = FALSE // if the switch only operates the conveyor belts in a single direction.
- var/invert_icon = FALSE // If the level points the opposite direction when it's turned on.
-
- var/id = "" // must match conveyor IDs to control them
+ ///switch position
+ var/position = CONVEYOR_OFF
+ ///Previous switch position
+ var/last_pos = -1
+ ///If this only works one way
+ var/oneway = FALSE
+ ///If the level points the opposite direction when it's turned on.
+ var/invert_icon = FALSE
+ ///ID. Must match conveyor ID's to control them
+ var/id = ""
/obj/machinery/conveyor_switch/Initialize(mapload, newid)
. = ..()
@@ -287,12 +279,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor_switch/update_icon_state()
. = ..()
- if(position<0)
+ if(position == CONVEYOR_ON_REVERSE)
if(invert_icon)
icon_state = "switch-fwd"
else
icon_state = "switch-rev"
- else if(position>0)
+ else if(position == CONVEYOR_ON_FORWARDS)
if(invert_icon)
icon_state = "switch-rev"
else
@@ -303,13 +295,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/// Updates all conveyor belts that are linked to this switch, and tells them to start processing.
/obj/machinery/conveyor_switch/proc/update_linked_conveyors()
for(var/obj/machinery/conveyor/C in GLOB.conveyors_by_id[id])
- C.operating = position
- C.update_move_direction()
- C.update_icon()
- if(C.operating)
- C.start_processing()
- else
- C.stop_processing()
+ C.set_operating(position)
CHECK_TICK
/// Finds any switches with same `id` as this one, and set their position and icon to match us.
@@ -327,14 +313,14 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
position = oneway
else
if(last_pos < 0)
- position = 1
- last_pos = 0
+ position = CONVEYOR_ON_FORWARDS
+ last_pos = CONVEYOR_OFF
else
- position = -1
- last_pos = 0
+ position = CONVEYOR_ON_REVERSE
+ last_pos = CONVEYOR_OFF
else
last_pos = position
- position = 0
+ position = CONVEYOR_OFF
/// Called when a user clicks on this switch with an open hand.
/obj/machinery/conveyor_switch/interact(mob/user)
diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm
index dca903ea3fa16..b46d551ec5b20 100644
--- a/code/modules/reqs/supplypacks.dm
+++ b/code/modules/reqs/supplypacks.dm
@@ -848,7 +848,7 @@ EXPLOSIVES
name = "M40-AG Anti-Gas grenade box crate"
notes = "Cotains 25 grenades"
contains = list(/obj/item/storage/box/visual/grenade/antigas)
- cost = 700
+ cost = 600
/datum/supply_packs/explosives/explosives_cloak
name = "M40-2 SCDP grenade box crate"
@@ -886,6 +886,12 @@ EXPLOSIVES
contains = list(/obj/item/storage/box/visual/grenade/phosphorus)
cost = 700
+/datum/supply_packs/explosives/explosives_hefa
+ name = "M25 HEFA grenade box crate"
+ notes = "Contains 25 grenades"
+ contains = list(/obj/item/storage/box/visual/grenade/hefa)
+ cost = 550
+
/datum/supply_packs/explosives/plastique
name = "C4 plastic explosive"
contains = list(/obj/item/explosive/plastique)
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index 8be96f27404a4..15622228e91fe 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -166,3 +166,11 @@
var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
if(api)
return api.Visibility()
+
+/world/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE)
+ var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
+ if(api)
+ if(!istype(parameters, /list))
+ parameters = list()
+
+ return api.TriggerEvent(event_name, parameters, wait_for_completion)
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index 07ce3b684584e..898516f12486f 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -17,7 +17,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866
del(world)
world.sleep_offline = FALSE // just in case, this is BYOND after all...
- sleep(1)
+ sleep(world.tick_lag)
TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]")
/datum/tgs_api/latest
@@ -69,3 +69,6 @@ TGS_PROTECT_DATUM(/datum/tgs_api)
/datum/tgs_api/proc/Visibility()
return TGS_UNIMPLEMENTED
+
+/datum/tgs_api/proc/TriggerEvent(event_name, list/parameters, wait_for_completion)
+ return FALSE
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index 945e2e4117671..7c87922750b9b 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -181,7 +181,7 @@
var/json = json_encode(data)
while(requesting_new_port && !override_requesting_new_port)
- sleep(1)
+ sleep(world.tick_lag)
//we need some port open at this point to facilitate return communication
if(!world.port)
@@ -209,7 +209,7 @@
requesting_new_port = FALSE
while(export_lock)
- sleep(1)
+ sleep(world.tick_lag)
export_lock = TRUE
last_interop_response = null
@@ -217,7 +217,7 @@
text2file(json, server_commands_json_path)
for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I)
- sleep(1)
+ sleep(world.tick_lag)
if(!last_interop_response)
TGS_ERROR_LOG("Failed to get export result for: [json]")
diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm
index 616263098fd3e..f4806f7adb97c 100644
--- a/code/modules/tgs/v5/__interop_version.dm
+++ b/code/modules/tgs/v5/__interop_version.dm
@@ -1 +1 @@
-"5.8.0"
+"5.9.0"
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 1c7d67d20cdf6..92c7a8388a711 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -14,6 +14,7 @@
#define DMAPI5_BRIDGE_COMMAND_KILL 4
#define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5
#define DMAPI5_BRIDGE_COMMAND_CHUNK 6
+#define DMAPI5_BRIDGE_COMMAND_EVENT 7
#define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier"
#define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands"
@@ -34,6 +35,7 @@
#define DMAPI5_BRIDGE_PARAMETER_VERSION "version"
#define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage"
#define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel"
+#define DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION "eventInvocation"
#define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort"
#define DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION "runtimeInformation"
@@ -81,6 +83,7 @@
#define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9
#define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10
#define DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST 11
+#define DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT 12
#define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType"
#define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand"
@@ -116,3 +119,9 @@
#define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name"
#define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText"
#define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly"
+
+#define DMAPI5_EVENT_ID "eventId"
+
+#define DMAPI5_EVENT_INVOCATION_NAME "eventName"
+#define DMAPI5_EVENT_INVOCATION_PARAMETERS "parameters"
+#define DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION "notifyCompletion"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index a5c064a8eaf1e..9b64931f8f922 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -27,6 +27,8 @@
var/chunked_requests = 0
var/list/chunked_topics = list()
+ var/list/pending_events = list()
+
var/detached = FALSE
/datum/tgs_api/v5/New()
@@ -125,7 +127,7 @@
TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep")
logged = TRUE
- sleep(1)
+ sleep(world.tick_lag)
TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed")
@@ -249,6 +251,40 @@
WaitForReattach(TRUE)
return chat_channels.Copy()
+/datum/tgs_api/v5/TriggerEvent(event_name, list/parameters, wait_for_completion)
+ RequireInitialBridgeResponse()
+ WaitForReattach(TRUE)
+
+ if(interop_version.minor < 9)
+ TGS_WARNING_LOG("Interop version too low for custom events!")
+ return FALSE
+
+ var/str_parameters = list()
+ for(var/i in parameters)
+ str_parameters += "[i]"
+
+ var/list/response = Bridge(DMAPI5_BRIDGE_COMMAND_EVENT, list(DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION = list(DMAPI5_EVENT_INVOCATION_NAME = event_name, DMAPI5_EVENT_INVOCATION_PARAMETERS = str_parameters, DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION = wait_for_completion)))
+ if(!response)
+ return FALSE
+
+ var/event_id = response[DMAPI5_EVENT_ID]
+ if(!event_id)
+ return FALSE
+
+ TGS_DEBUG_LOG("Created event ID: [event_id]")
+ if(!wait_for_completion)
+ return TRUE
+
+ TGS_DEBUG_LOG("Waiting for completion of event ID: [event_id]")
+
+ while(!pending_events[event_id])
+ sleep(world.tick_lag)
+
+ TGS_DEBUG_LOG("Completed wait on event ID: [event_id]")
+ pending_events -= event_id
+
+ return TRUE
+
/datum/tgs_api/v5/proc/DecodeChannels(chat_update_json)
TGS_DEBUG_LOG("DecodeChannels()")
var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS]
diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm
index a0ab359876704..0c5e701a32b60 100644
--- a/code/modules/tgs/v5/bridge.dm
+++ b/code/modules/tgs/v5/bridge.dm
@@ -65,7 +65,7 @@
if(detached)
// Wait up to one minute
for(var/i in 1 to 600)
- sleep(1)
+ sleep(world.tick_lag)
if(!detached && (!require_channels || length(chat_channels)))
break
@@ -77,8 +77,11 @@
/datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request)
WaitForReattach(FALSE)
+ TGS_DEBUG_LOG("Bridge request start")
// This is an infinite sleep until we get a response
var/export_response = world.Export(bridge_request)
+ TGS_DEBUG_LOG("Bridge request complete")
+
if(!export_response)
TGS_ERROR_LOG("Failed bridge request: [bridge_request]")
return
@@ -88,7 +91,7 @@
TGS_ERROR_LOG("Failed bridge request, missing content!")
return
- var/response_json = file2text(content)
+ var/response_json = TGS_FILE2TEXT_NATIVE(content)
if(!response_json)
TGS_ERROR_LOG("Failed bridge request, failed to load content!")
return
diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm
index 05e6c4e1b2146..e66edc27206a9 100644
--- a/code/modules/tgs/v5/topic.dm
+++ b/code/modules/tgs/v5/topic.dm
@@ -176,6 +176,9 @@
var/list/reattach_response = TopicResponse(error_message)
reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands()
reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort()
+
+ pending_events.Cut()
+
return reattach_response
if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK)
@@ -276,6 +279,15 @@
TGS_WORLD_ANNOUNCE(message)
return TopicResponse()
+ if(DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT)
+ var/event_id = topic_parameters[DMAPI5_EVENT_ID]
+ if (!istext(event_id))
+ return TopicResponse("Invalid or missing [DMAPI5_EVENT_ID]")
+
+ TGS_DEBUG_LOG("Completing event ID [event_id]...")
+ pending_events[event_id] = TRUE
+ return TopicResponse()
+
return TopicResponse("Unknown command: [command]")
/datum/tgs_api/v5/proc/WorldBroadcast(message)
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
index d531d4b7b9dd1..237207fdfd056 100644
--- a/code/modules/tgs/v5/undefs.dm
+++ b/code/modules/tgs/v5/undefs.dm
@@ -14,6 +14,7 @@
#undef DMAPI5_BRIDGE_COMMAND_KILL
#undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND
#undef DMAPI5_BRIDGE_COMMAND_CHUNK
+#undef DMAPI5_BRIDGE_COMMAND_EVENT
#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
@@ -34,6 +35,7 @@
#undef DMAPI5_BRIDGE_PARAMETER_VERSION
#undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE
#undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL
+#undef DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION
#undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT
#undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION
@@ -81,6 +83,7 @@
#undef DMAPI5_TOPIC_COMMAND_SEND_CHUNK
#undef DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK
#undef DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST
+#undef DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT
#undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE
#undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND
@@ -116,3 +119,9 @@
#undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME
#undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT
#undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY
+
+#undef DMAPI5_EVENT_ID
+
+#undef DMAPI5_EVENT_INVOCATION_NAME
+#undef DMAPI5_EVENT_INVOCATION_PARAMETERS
+#undef DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 73da6d9826422..29b0991748b84 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -68,6 +68,7 @@
#include "weed_spread.dm"
#include "xeno_logical_scaling.dm"
#include "item_variant_test.dm"
+#include "xenoaccuracy.dm"
#ifdef REFERENCE_TRACKING //Don't try and parse this file if ref tracking isn't turned on. IE: don't parse ref tracking please mr linter
#include "find_reference_sanity.dm"
diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm
index be40f64df1192..b8b9bc011f2ad 100644
--- a/code/modules/unit_tests/create_and_destroy.dm
+++ b/code/modules/unit_tests/create_and_destroy.dm
@@ -47,6 +47,8 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
ignore += typesof(/obj/effect/temp_visual)
ignore += typesof(/obj/effect/landmark)
ignore += typesof(/obj/effect/baseturf_helper)
+ ///forcespawned abstract type for vehicles, will never spawn outside of it
+ ignore += typesof(/obj/hitbox)
//Screen objects don't play nicely when spawned manually.
ignore += typesof(/atom/movable/screen)
diff --git a/code/modules/unit_tests/xenoaccuracy.dm b/code/modules/unit_tests/xenoaccuracy.dm
new file mode 100644
index 0000000000000..033aa88b5a43c
--- /dev/null
+++ b/code/modules/unit_tests/xenoaccuracy.dm
@@ -0,0 +1,6 @@
+/datum/unit_test/xenoaccuracy
+
+/datum/unit_test/xenoaccuracy/Run()
+ for(var/datum/xeno_caste/caste AS in subtypesof(/datum/xeno_caste))
+ if(initial(caste.accuracy_malus) >= XENO_DEFAULT_ACCURACY)
+ Fail("A xeno accuracy malus of 70 or over was detected, negatives cannot be used in accuracy calculations.")
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/__vehicle.dm
similarity index 97%
rename from code/modules/vehicles/_vehicle.dm
rename to code/modules/vehicles/__vehicle.dm
index 2e7a681eac3d9..58950fb0a47c4 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/__vehicle.dm
@@ -20,6 +20,8 @@
var/max_drivers = 1
var/move_delay = 2
var/lastmove = 0
+ ///multitile hitbox, set to a hitbox type to make this vehicle multitile.
+ var/obj/hitbox/hitbox
/**
* If the driver needs a certain item in hand (or inserted, for vehicles) to drive this. For vehicles, this must be duplicated on their riding component subtype
* [/datum/component/riding/var/keytype] variable because only a few specific checks are handled here with this var, and the majority of it is on the riding component
@@ -42,6 +44,8 @@
/obj/vehicle/Initialize(mapload)
. = ..()
+ if(hitbox)
+ hitbox = new hitbox(loc, src)
occupants = list()
autogrant_actions_passenger = list()
autogrant_actions_controller = list()
diff --git a/code/modules/vehicles/_hitbox.dm b/code/modules/vehicles/_hitbox.dm
new file mode 100644
index 0000000000000..fdda80e9fa100
--- /dev/null
+++ b/code/modules/vehicles/_hitbox.dm
@@ -0,0 +1,223 @@
+/**
+ * HITBOX
+ * The core of multitile. Acts as a relay for damage and stops people from walking onto the multitle sprite
+ * has changed bounds and as thus must always be forcemoved so it doesnt break everything
+ * I would use pixel movement but the maptick caused by it is way too high and a fake tile based movement might work? but I want this to at least pretend to be generic
+ * Thus we just use this relay. it's an obj so we can make sure all the damage procs that work on root also work on the hitbox
+ */
+/obj/hitbox
+ density = TRUE
+ anchored = TRUE
+ invisibility = INVISIBILITY_MAXIMUM
+ bound_width = 96
+ bound_height = 96
+ bound_x = -32
+ bound_y = -32
+ max_integrity = INFINITY
+ move_resist = INFINITY // non forcemoving this could break gliding so lets just say no
+ ///people riding on this hitbox that we want to move with us
+ var/list/atom/movable/tank_desants
+ ///The "parent" that this hitbox is attached to and to whom it will relay damage
+ var/obj/vehicle/root = null
+
+/obj/hitbox/Initialize(mapload, obj/vehicle/new_root)
+ . = ..()
+ root = new_root
+ allow_pass_flags = root.allow_pass_flags
+ flags_atom = root.flags_atom
+ resistance_flags = root.resistance_flags
+ RegisterSignal(new_root, COMSIG_MOVABLE_MOVED, PROC_REF(root_move))
+ RegisterSignal(new_root, COMSIG_QDELETING, PROC_REF(root_delete))
+ RegisterSignals(new_root, list(COMSIG_RIDDEN_DRIVER_MOVE, COMSIG_VEHICLE_MOVE), PROC_REF(on_attempt_drive))
+ RegisterSignal(new_root, COMSIG_ATOM_DIR_CHANGE, PROC_REF(owner_turned))
+
+ var/static/list/connections = list(
+ COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_cross_hitbox),
+ COMSIG_TURF_JUMP_ENDED_HERE = PROC_REF(on_jump_landed),
+ COMSIG_ATOM_EXITED = PROC_REF(on_exited),
+ )
+ AddElement(/datum/element/connect_loc, connections)
+
+/obj/hitbox/Destroy(force)
+ if(!force) // only when the parent is deleted
+ return QDEL_HINT_LETMELIVE
+ root?.hitbox = null
+ root = null
+ return ..()
+
+///signal handler for handling PASS_WALKOVER
+/obj/hitbox/proc/can_cross_hitbox(datum/source, atom/mover)
+ SIGNAL_HANDLER
+ if(locate(src) in mover.loc)
+ return TRUE
+
+///Signal handler to spin the desants as well when the tank turns
+/obj/hitbox/proc/owner_turned(datum/source, old_dir, new_dir)
+ SIGNAL_HANDLER
+ if(!new_dir || new_dir == old_dir)
+ return
+ for(var/mob/living/desant AS in tank_desants)
+ if(desant.loc == root.loc)
+ continue
+ var/turf/new_pos
+ //doesnt work with diags, but that shouldnt happen, right?
+ if(REVERSE_DIR(old_dir) == new_dir)
+ new_pos = get_step(root, REVERSE_DIR(get_dir(desant, root)))
+ else if(turn(old_dir, 90) == new_dir)
+ new_pos = get_step(root, turn(get_dir(desant, root), -90))
+ else
+ new_pos = get_step(root, turn(get_dir(desant, root), 90))
+ desant.forceMove(new_pos)
+
+///signal handler when someone jumping lands on us
+/obj/hitbox/proc/on_jump_landed(datum/source, atom/lander)
+ SIGNAL_HANDLER
+ if(HAS_TRAIT(lander, TRAIT_TANK_DESANT))
+ return
+ ADD_TRAIT(lander, TRAIT_TANK_DESANT, VEHICLE_TRAIT)
+ LAZYSET(tank_desants, lander, lander.layer)
+ RegisterSignal(lander, COMSIG_QDELETING, PROC_REF(on_desant_del))
+ lander.layer = ABOVE_MOB_PLATFORM_LAYER
+
+///signal handler when we leave a turf under the hitbox
+/obj/hitbox/proc/on_exited(atom/source, atom/movable/AM, direction)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(AM, TRAIT_TANK_DESANT))
+ return
+ if(locate(src) in AM.loc) //Î'd cut the locate but for some reason it wdoesnt work lol
+ return
+ REMOVE_TRAIT(AM, TRAIT_TANK_DESANT, VEHICLE_TRAIT)
+ AM.layer = LAZYACCESS(tank_desants, AM)
+ LAZYREMOVE(tank_desants, AM)
+ UnregisterSignal(AM, COMSIG_QDELETING)
+
+///cleanup riders on deletion
+/obj/hitbox/proc/on_desant_del(datum/source)
+ SIGNAL_HANDLER
+ LAZYREMOVE(tank_desants, source)
+
+///when root deletes is the only time we want to be deleting
+/obj/hitbox/proc/root_delete()
+ SIGNAL_HANDLER
+ qdel(src, TRUE)
+
+///when the owner moves, let's move with them!
+/obj/hitbox/proc/root_move(atom/movable/mover, atom/oldloc, direction)
+ SIGNAL_HANDLER
+ //direction is null here, so we improvise
+ direction = get_dir(oldloc, mover)
+ var/move_dist = get_dist(oldloc, mover)
+ forceMove(mover.loc)
+ for(var/mob/living/tank_desant AS in tank_desants)
+ step(tank_desant, direction, root.step_size)
+ if(isxeno(tank_desant) || move_dist > 1) //skips xenos, and
+ return
+ var/away_dir = get_dir(tank_desant, root)
+ if(!away_dir)
+ away_dir = pick(GLOB.alldirs)
+ away_dir = REVERSE_DIR(away_dir)
+ var/turf/target = get_step(get_step(root, away_dir), away_dir)
+ tank_desant.throw_at(target, 3, 3, root)
+
+///called when the tank is off movement cooldown and someone tries to move it
+/obj/hitbox/proc/on_attempt_drive(atom/movable/movable_parent, mob/living/user, direction)
+ SIGNAL_HANDLER
+ if(ISDIAGONALDIR(direction))
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ if((root.dir != direction) && (root.dir != REVERSE_DIR(direction)))
+ root.setDir(direction) // tivi todo dupe on medium size kill me
+ if(isarmoredvehicle(root))
+ var/obj/vehicle/sealed/armored/armor = root
+ playsound(armor, armor.engine_sound, 100, TRUE, 20)
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ //Due to this being a hot proc this part here is inlined and set on a by-hitbox-size basis
+ /////////////////////////////
+ var/turf/centerturf = get_step(get_step(root, direction), direction)
+ var/list/enteringturfs = list(centerturf)
+ enteringturfs += get_step(centerturf, turn(direction, 90))
+ enteringturfs += get_step(centerturf, turn(direction, -90))
+ /////////////////////////////
+ var/canstep = TRUE
+ for(var/turf/T AS in enteringturfs) //No break because we want to crush all the turfs before we start trying to move
+ if(!T.Enter(root, direction)) //Check if we can cross the turf first/bump the turf
+ canstep = FALSE
+
+ for(var/atom/movable/O AS in T.contents) // this is checked in turf/enter but it doesnt return false so lmao
+ if(O.CanPass(root)) // Then check for obstacles to crush
+ continue
+ root.Bump(O) //manually call bump on everything
+ canstep = FALSE
+
+ if(canstep)
+ return NONE
+ return COMPONENT_DRIVER_BLOCK_MOVE
+
+/obj/hitbox/CanAllowThrough(atom/movable/mover, turf/target)
+ . = ..()
+ if(.)
+ return
+ if((allow_pass_flags & PASS_TANK) && (mover.pass_flags & PASS_TANK))
+ return TRUE
+
+/obj/hitbox/projectile_hit(obj/projectile/proj)
+ if(proj.firer == root)
+ return FALSE
+ return root.projectile_hit(arglist(args))
+
+/obj/hitbox/bullet_act(obj/projectile/proj)
+ SHOULD_CALL_PARENT(FALSE) // this is an abstract object: we have to avoid everything on parent
+ SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, proj)
+ return root.bullet_act(proj)
+
+/obj/hitbox/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob)
+ return root.take_damage(arglist(args))
+
+/obj/hitbox/ex_act(severity)
+ return
+
+///2x2 hitbox version
+/obj/hitbox/medium
+ bound_width = 64
+ bound_height = 64
+ bound_x = 0
+ bound_y = -32
+
+/obj/hitbox/medium/on_attempt_drive(atom/movable/movable_parent, mob/living/user, direction)
+ if(ISDIAGONALDIR(direction))
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ if((root.dir != direction) && (root.dir != REVERSE_DIR(direction)))
+ root.setDir(direction)
+ if(isarmoredvehicle(root))
+ var/obj/vehicle/sealed/armored/armor = root
+ playsound(armor, armor.engine_sound, 100, TRUE, 20)
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ ///////////////////////////
+ var/turf/centerturf = get_step(root, direction)
+ var/list/enteringturfs = list()
+ switch(direction)
+ if(NORTH)
+ enteringturfs += get_step(centerturf, turn(direction, -90))
+ if(SOUTH)
+ centerturf = get_step(centerturf, direction)
+ enteringturfs += get_step(centerturf, turn(direction, 90))
+ if(EAST)
+ centerturf = get_step(centerturf, direction)
+ enteringturfs += get_step(centerturf, turn(direction, -90))
+ if(WEST)
+ enteringturfs += get_step(centerturf, turn(direction, 90))
+ enteringturfs += centerturf
+ ////////////////////////////////////
+ var/canstep = TRUE
+ for(var/turf/T AS in enteringturfs) //No break because we want to crush all the turfs before we start trying to move
+ if(!T.Enter(root, direction)) //Check if we can cross the turf first/bump the turf
+ canstep = FALSE
+
+ for(var/atom/movable/O AS in T.contents) // this is checked in turf/enter but it doesnt return false so lmao
+ if(O.CanPass(root)) // Then check for obstacles to crush
+ continue
+ root.Bump(O) //manually call bump on everything
+ canstep = FALSE
+
+ if(canstep)
+ return NONE
+ return COMPONENT_DRIVER_BLOCK_MOVE
diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm
new file mode 100644
index 0000000000000..da2795a558c95
--- /dev/null
+++ b/code/modules/vehicles/armored/__armored.dm
@@ -0,0 +1,541 @@
+
+/obj/vehicle/sealed/armored
+ name = "\improper TAV - Shortstreet MK4"
+ desc = "An adorable chunk of metal with an alarming amount of firepower designed to crush, immolate, destroy and maim anything that Nanotrasen wants it to. This model contains advanced Bluespace technology which allows a TARDIS-like amount of room on the inside."
+ icon = 'icons/obj/armored/1x1/tinytank.dmi'
+ icon_state = "tank"
+ pixel_x = -16
+ pixel_y = -8
+ layer = ABOVE_MOB_LAYER
+ max_drivers = 1
+ move_resist = INFINITY
+ flags_atom = BUMP_ATTACKABLE|PREVENT_CONTENTS_EXPLOSION
+ allow_pass_flags = PASS_TANK|PASS_AIR|PASS_WALKOVER
+ resistance_flags = XENO_DAMAGEABLE|UNACIDABLE|PLASMACUTTER_IMMUNE|PORTAL_IMMUNE
+
+ // placeholder, make skill check or similar later
+ req_access = list(ACCESS_MARINE_MECH)
+ move_delay = 0.7 SECONDS
+ max_integrity = 600
+ light_range = 10
+ ///Tank bitflags
+ var/flags_armored = ARMORED_HAS_PRIMARY_WEAPON|ARMORED_HAS_HEADLIGHTS
+ ///Sound file(s) to play when we drive around
+ var/engine_sound = 'sound/ambience/tank_driving.ogg'
+ ///frequency to play the sound with
+ var/engine_sound_length = 2 SECONDS
+ /// How long it takes to rev (vrrm vrrm!) TODO: merge this up to /vehicle here and on tg because of cars
+ COOLDOWN_DECLARE(enginesound_cooldown)
+
+ ///Cool and good turret overlay that allows independently swiveling guns
+ var/atom/movable/vis_obj/turret_overlay/turret_overlay
+ ///Icon for the rotating turret icon. also should hold the icons for the weapon icons
+ var/turret_icon = 'icons/obj/armored/1x1/tinytank_gun.dmi'
+ ///Iconstate for the rotating main turret
+ var/turret_icon_state = "turret"
+ ///secondary independently rotating overlay, if we only have a secondary weapon
+ var/image/secondary_weapon_overlay
+ ///Icon for the secondary rotating turret, should contain all possible icons. iconstate is fetched from the attached weapon
+ var/secondary_turret_icon
+ ///Damage overlay for when the vehicle gets damaged
+ var/atom/movable/vis_obj/tank_damage/damage_overlay
+ ///Icon file path for the damage overlay
+ var/damage_icon_path
+ ///Overlay for larger vehicles that need under parts
+ var/image/underlay
+
+ ///What weapon we have in our primary slot
+ var/obj/item/armored_weapon/primary_weapon
+ ///What weapon we have in our secondary slot
+ var/obj/item/armored_weapon/secondary_weapon
+ ///Our driver utility module
+ var/obj/item/tank_module/driver_utility_module
+ ///Our driver utility module
+ var/obj/item/tank_module/gunner_utility_module
+ //What kind of primary tank weaponry we start with. Defaults to a tank gun.
+ var/primary_weapon_type = /obj/item/armored_weapon
+ //What kind of secondary tank weaponry we start with. Default minigun as standard.
+ var/secondary_weapon_type = /obj/item/armored_weapon/secondary_weapon
+ ///if true disables stops users from being able to shoot weapons
+ var/weapons_safety = FALSE
+ //Bool for zoom on/off
+ var/zoom_mode = FALSE
+ /// damage done by rams
+ var/ram_damage = 20
+
+/obj/vehicle/sealed/armored/Initialize(mapload)
+ . = ..()
+ if(flags_armored & ARMORED_HAS_UNDERLAY)
+ underlay = new(icon, icon_state + "_underlay", layer = layer-0.1)
+ add_overlay(underlay)
+ if(damage_icon_path)
+ damage_overlay = new()
+ damage_overlay.icon = damage_icon_path
+ damage_overlay.layer = layer+0.001
+ vis_contents += damage_overlay
+ if(flags_armored & ARMORED_HAS_PRIMARY_WEAPON)
+ turret_overlay = new()
+ turret_overlay.icon = turret_icon
+ turret_overlay.icon_state = turret_icon_state
+ turret_overlay.setDir(dir)
+ turret_overlay.layer = layer+0.002
+ if(flags_armored & ARMORED_HAS_MAP_VARIANTS)
+ switch(SSmapping.configs[GROUND_MAP].armor_style)
+ if(MAP_ARMOR_STYLE_JUNGLE)
+ turret_overlay.icon_state += "_jungle"
+ if(MAP_ARMOR_STYLE_ICE)
+ turret_overlay.icon_state += "_snow"
+ if(MAP_ARMOR_STYLE_PRISON)
+ turret_overlay.icon_state += "_urban"
+ if(MAP_ARMOR_STYLE_DESERT)
+ turret_overlay.icon_state += "_desert"
+ vis_contents += turret_overlay
+ if(primary_weapon_type)
+ var/obj/item/armored_weapon/primary = new primary_weapon_type(src)
+ primary.attach(src, TRUE)
+ if(flags_armored & ARMORED_HAS_SECONDARY_WEAPON)
+ if(secondary_weapon_type)
+ var/obj/item/armored_weapon/secondary = new secondary_weapon_type(src)
+ secondary.attach(src, FALSE)
+ if(flags_armored & ARMORED_HAS_MAP_VARIANTS)
+ switch(SSmapping.configs[GROUND_MAP].armor_style)
+ if(MAP_ARMOR_STYLE_JUNGLE)
+ icon_state += "_jungle"
+ if(MAP_ARMOR_STYLE_ICE)
+ icon_state += "_snow"
+ if(MAP_ARMOR_STYLE_PRISON)
+ icon_state += "_urban"
+ if(MAP_ARMOR_STYLE_DESERT)
+ icon_state += "_desert"
+ GLOB.tank_list += src
+
+/obj/vehicle/sealed/armored/Destroy()
+ QDEL_NULL(primary_weapon)
+ QDEL_NULL(secondary_weapon)
+ QDEL_NULL(driver_utility_module)
+ QDEL_NULL(gunner_utility_module)
+ QDEL_NULL(damage_overlay)
+ QDEL_NULL(turret_overlay)
+ underlay = null
+ GLOB.tank_list -= src
+ return ..()
+
+/obj/vehicle/sealed/armored/generate_actions()
+ initialize_passenger_action_type(/datum/action/vehicle/sealed/armored/eject)
+ initialize_passenger_action_type(/datum/action/vehicle/sealed/armored/swap_seat)
+ if(flags_armored & ARMORED_HAS_HEADLIGHTS)
+ initialize_controller_action_type(/datum/action/vehicle/sealed/armored/toggle_lights, VEHICLE_CONTROL_SETTINGS)
+
+/obj/vehicle/sealed/armored/obj_destruction(damage_amount, damage_type, damage_flag)
+ . = ..()
+ playsound(get_turf(src), 'sound/weapons/guns/fire/tank_cannon1.ogg', 100, TRUE)
+
+/obj/vehicle/sealed/armored/update_icon()
+ . = ..()
+ if(!damage_overlay)
+ return
+ switch(PERCENT(obj_integrity / max_integrity))
+ if(0 to 29)
+ damage_overlay.icon_state = "damage_veryhigh"
+ if(29 to 59)
+ damage_overlay.icon_state = "damage_high"
+ if(59 to 70)
+ damage_overlay.icon_state = "damage_medium"
+ if(70 to 90)
+ damage_overlay.icon_state = "damage_small"
+ else
+ damage_overlay.icon_state = "null"
+
+/obj/vehicle/sealed/armored/update_overlays()
+ . = ..()
+ if(secondary_weapon_overlay)
+ . += secondary_weapon_overlay
+
+/obj/vehicle/sealed/armored/setDir(newdir)
+ . = ..()
+ if(secondary_weapon_overlay)
+ cut_overlay(secondary_weapon_overlay)
+ secondary_weapon_overlay.icon_state = secondary_weapon.icon_state + "_" + "[newdir]"
+ add_overlay(secondary_weapon_overlay)
+
+/obj/vehicle/sealed/armored/examine(mob/user)
+ . = ..()
+ if(!isxeno(user))
+ . += "To fire its main cannon, left click a tile."
+ . += "To fire its secondary weapon, right click a tile."
+ . += "Middle click to toggle weapon safety."
+ . += "It's currently holding [LAZYLEN(occupants)]/[max_occupants] crew."
+ . += span_notice("There is [isnull(primary_weapon) ? "nothing" : "[primary_weapon]"] in the primary attachment point, [isnull(secondary_weapon) ? "nothing" : "[secondary_weapon]"] installed in the secondary slot, [isnull(driver_utility_module) ? "nothing" : "[driver_utility_module]"] in the driver utility slot and [isnull(gunner_utility_module) ? "nothing" : "[gunner_utility_module]"] in the gunner utility slot.")
+ if(!isxeno(user))
+ . += "
It is currently at [PERCENT(obj_integrity / max_integrity)]% integrity."
+
+/obj/vehicle/sealed/armored/vehicle_move(mob/living/user, direction)
+ . = ..()
+ if(!.)
+ return
+ if(COOLDOWN_CHECK(src, enginesound_cooldown))
+ COOLDOWN_START(src, enginesound_cooldown, engine_sound_length)
+ playsound(get_turf(src), engine_sound, 100, TRUE, 20)
+ after_move(direction)
+ forceMove(get_step(src, direction)) // still animates and calls moved() and all that stuff BUT we skip checks
+
+/obj/vehicle/sealed/armored/resisted_against(mob/living/user)
+ balloon_alert(user, "exiting...")
+ if(do_after(user, enter_delay, NONE, src))
+ balloon_alert(user, "exited")
+ mob_exit(user, TRUE)
+
+/obj/vehicle/sealed/armored/CanAllowThrough(atom/movable/mover, turf/target)
+ . = ..()
+ if(.)
+ return
+ if((allow_pass_flags & PASS_TANK) && (mover.pass_flags & PASS_TANK))
+ return TRUE
+
+/obj/vehicle/sealed/armored/Bump(atom/A)
+ . = ..()
+ if(HAS_TRAIT(A, TRAIT_STOPS_TANK_COLLISION))
+ if(!TIMER_COOLDOWN_CHECK(src, COOLDOWN_VEHICLE_CRUSHSOUND))
+ visible_message(span_danger("[src] is stopped by [A]!"))
+ playsound(src, 'sound/effects/metal_crash.ogg', 45)
+ TIMER_COOLDOWN_START(src, COOLDOWN_VEHICLE_CRUSHSOUND, 1 SECONDS)
+ return
+ var/pilot
+ var/list/drivers = return_drivers()
+ if(length(drivers))
+ pilot = drivers[1]
+ A.vehicle_collision(src, get_dir(src, A), get_turf(loc), get_turf(loc), pilot)
+
+/obj/vehicle/sealed/armored/auto_assign_occupant_flags(mob/new_occupant)
+ if(max_occupants == 1)
+ add_control_flags(new_occupant, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_SETTINGS|VEHICLE_CONTROL_MELEE|VEHICLE_CONTROL_EQUIPMENT)
+ return
+
+ if(driver_amount() < max_drivers) //movement controllers
+ add_control_flags(new_occupant, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_SETTINGS)
+ else if(length(return_controllers_with_flag(VEHICLE_CONTROL_EQUIPMENT)) < 1)
+ add_control_flags(new_occupant, VEHICLE_CONTROL_MELEE|VEHICLE_CONTROL_EQUIPMENT)
+
+/obj/vehicle/sealed/armored/exit_location(mob/M)
+ return get_step(src, REVERSE_DIR(dir))
+
+/obj/vehicle/sealed/armored/mob_try_enter(mob/M)
+ if(!ishuman(M))
+ return FALSE
+ return ..()
+
+/obj/vehicle/sealed/armored/add_occupant(mob/M, control_flags)
+ RegisterSignal(M, COMSIG_MOB_DEATH, PROC_REF(mob_exit), TRUE)
+ RegisterSignal(M, COMSIG_MOB_MOUSEDOWN, PROC_REF(on_mouseclick), TRUE)
+ RegisterSignal(M, COMSIG_LIVING_DO_RESIST, TYPE_PROC_REF(/atom/movable, resisted_against), TRUE)
+ . = ..()
+ if(primary_weapon)
+ var/list/primary_icons
+ if(primary_weapon.ammo)
+ primary_icons = list(primary_weapon.ammo.default_ammo.hud_state, primary_weapon.ammo.default_ammo.hud_state_empty)
+ else
+ primary_icons = list(primary_weapon.hud_state_empty, primary_weapon.hud_state_empty)
+ M.hud_used.add_ammo_hud(primary_weapon, primary_icons, primary_weapon.ammo.current_rounds)
+ if(secondary_weapon)
+ var/list/secondary_icons
+ if(secondary_weapon.ammo)
+ secondary_icons = list(secondary_weapon.ammo.default_ammo.hud_state, secondary_weapon.ammo.default_ammo.hud_state_empty)
+ else
+ secondary_icons = list(secondary_weapon.hud_state_empty, secondary_weapon.hud_state_empty)
+ M.hud_used.add_ammo_hud(secondary_weapon, secondary_icons, secondary_weapon.ammo.current_rounds)
+
+/obj/vehicle/sealed/armored/remove_occupant(mob/M)
+ M.hud_used.remove_ammo_hud(primary_weapon)
+ M.hud_used.remove_ammo_hud(secondary_weapon)
+ UnregisterSignal(M, COMSIG_MOB_DEATH)
+ UnregisterSignal(M, COMSIG_MOB_MOUSEDOWN)
+ UnregisterSignal(M, COMSIG_LIVING_DO_RESIST)
+ if(M.client)
+ M.update_mouse_pointer()
+ M.client.view_size.reset_to_default()
+ if(is_equipment_controller(M))
+ zoom_mode = FALSE
+ return ..()
+
+/obj/vehicle/sealed/armored/projectile_hit(obj/projectile/proj, cardinal_move, uncrossing)
+ for(var/mob/living/carbon/human/crew AS in occupants)
+ if(crew.wear_id?.iff_signal & proj.iff_signal)
+ return FALSE
+ return ..()
+
+/obj/vehicle/sealed/armored/attack_hand(mob/living/user)
+ . = ..()
+ if(!primary_weapon)
+ balloon_alert(user, "no primary")
+ return
+ if(!length(primary_weapon.ammo_magazine))
+ balloon_alert(user, "magazine empty")
+ return
+ var/choice
+ if(length(primary_weapon.ammo_magazine) == 1)
+ choice = primary_weapon.ammo_magazine[1]
+ else
+ choice = tgui_input_list(user, "Select a magazine to take out", primary_weapon.name, primary_weapon.ammo_magazine)
+ if(!choice)
+ return
+ if(!do_after(user, 1 SECONDS, NONE, src))
+ return
+ balloon_alert(user, "magazine removed")
+ primary_weapon.ammo_magazine -= choice
+ user.put_in_hands(choice)
+
+/obj/vehicle/sealed/armored/attack_hand_alternate(mob/living/user)
+ . = ..()
+ if(!secondary_weapon)
+ balloon_alert(user, "no secondary")
+ return
+ if(!length(secondary_weapon.ammo_magazine))
+ balloon_alert(user, "magazine empty")
+ return
+ var/choice
+ if(length(secondary_weapon.ammo_magazine) == 1)
+ choice = secondary_weapon.ammo_magazine[1]
+ else
+ choice = tgui_input_list(user, "Select a magazine to take out", secondary_weapon.name, secondary_weapon.ammo_magazine)
+ if(!choice)
+ return
+ if(!do_after(user, 1 SECONDS, NONE, src))
+ return
+ balloon_alert(user, "magazine removed")
+ secondary_weapon.ammo_magazine -= choice
+ user.put_in_hands(choice)
+
+/obj/vehicle/sealed/armored/attackby(obj/item/I, mob/user, params)
+ . = ..()
+ if(istype(I, /obj/item/armored_weapon))
+ var/obj/item/armored_weapon/gun = I
+ if(!(gun.weapon_slot & MODULE_PRIMARY))
+ balloon_alert(user, "not a primary weapon")
+ return
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ user.temporarilyRemoveItemFromInventory(I)
+ gun.attach(src, TRUE)
+ return
+ if(istype(I, /obj/item/ammo_magazine))
+ if(!primary_weapon)
+ balloon_alert(user, "no primary weapon")
+ return
+ if(!(I.type in primary_weapon.accepted_ammo))
+ balloon_alert(user, "not accepted ammo")
+ return
+ if(length(primary_weapon.ammo_magazine) >= primary_weapon.maximum_magazines)
+ balloon_alert(user, "magazine already full")
+ return
+ user.temporarilyRemoveItemFromInventory(I)
+ I.forceMove(primary_weapon)
+ if(!primary_weapon.ammo)
+ primary_weapon.ammo = I
+ balloon_alert(user, "primary gun loaded")
+ for(var/mob/occupant AS in occupants)
+ occupant.hud_used.update_ammo_hud(src, list(primary_weapon.ammo.default_ammo.hud_state, primary_weapon.ammo.default_ammo.hud_state_empty), primary_weapon.ammo.current_rounds)
+ else
+ primary_weapon.ammo_magazine += I
+ balloon_alert(user, "magazines [length(primary_weapon.ammo_magazine)]/[primary_weapon.maximum_magazines]")
+ return
+ if(istype(I, /obj/item/tank_module))
+ var/obj/item/tank_module/mod = I
+ mod.on_equip(src, user)
+
+/obj/vehicle/sealed/armored/attackby_alternate(obj/item/I, mob/user, params)
+ . = ..()
+ if(istype(I, /obj/item/armored_weapon))
+ var/obj/item/armored_weapon/gun = I
+ if(!(gun.weapon_slot & MODULE_SECONDARY))
+ balloon_alert(user, "not a secondary weapon")
+ return
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ user.temporarilyRemoveItemFromInventory(I)
+ gun.attach(src, FALSE)
+ return
+ if(istype(I, /obj/item/ammo_magazine))
+ if(!secondary_weapon)
+ balloon_alert(user, "no primary weapon")
+ return
+ if(!(I.type in secondary_weapon.accepted_ammo))
+ balloon_alert(user, "not accepted ammo")
+ return
+ if(length(secondary_weapon.ammo_magazine) >= secondary_weapon.maximum_magazines)
+ balloon_alert(user, "magazine already full")
+ return
+ user.temporarilyRemoveItemFromInventory(I)
+ I.forceMove(secondary_weapon)
+ if(!secondary_weapon.ammo)
+ secondary_weapon.ammo = I
+ balloon_alert(user, "secondary gun loaded")
+ for(var/mob/occupant AS in occupants)
+ occupant.hud_used.update_ammo_hud(src, list(secondary_weapon.ammo.default_ammo.hud_state, secondary_weapon.ammo.default_ammo.hud_state_empty), secondary_weapon.ammo.current_rounds)
+ else
+ secondary_weapon.ammo_magazine += I
+ balloon_alert(user, "magazines [length(secondary_weapon.ammo_magazine)]/[secondary_weapon.maximum_magazines]")
+ return
+ if(!isscrewdriver(I))
+ return
+ if(!gunner_utility_module)
+ balloon_alert(user, "no gunner utility module")
+ return
+ balloon_alert(user, "detaching gunner utility")
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ gunner_utility_module.on_unequip(user)
+ balloon_alert(user, "detached")
+
+
+/obj/vehicle/sealed/armored/welder_act(mob/living/user, obj/item/I)
+ return welder_repair_act(user, I, 50, 5 SECONDS, 0, SKILL_ENGINEER_METAL, 5, 2 SECONDS)
+
+/obj/vehicle/sealed/armored/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!primary_weapon)
+ balloon_alert(user, "no primary weapon")
+ return
+ balloon_alert(user, "detaching primary")
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ var/obj/item/armored_weapon/gun = primary_weapon
+ primary_weapon.detach(loc)
+ user.put_in_hands(gun)
+ balloon_alert(user, "detached")
+
+/obj/vehicle/sealed/armored/wrench_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!secondary_weapon)
+ balloon_alert(user, "no secondary weapon")
+ return
+ balloon_alert(user, "detaching secondary")
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ var/obj/item/armored_weapon/gun = secondary_weapon
+ secondary_weapon.detach(loc)
+ user.put_in_hands(gun)
+ balloon_alert(user, "detached")
+
+/obj/vehicle/sealed/armored/screwdriver_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!driver_utility_module)
+ balloon_alert(user, "no driver utility module")
+ return
+ balloon_alert(user, "detaching driver utility")
+ if(!do_after(user, 2 SECONDS, NONE, src))
+ return
+ driver_utility_module.on_unequip(user)
+ balloon_alert(user, "detached")
+
+/obj/vehicle/sealed/armored/plastique_act(mob/living/plastique_user)
+ ex_act(EXPLODE_LIGHT)
+
+/**
+ * Toggles Weapons Safety
+ *
+ * Handles enabling or disabling the safety function.
+ */
+/obj/vehicle/sealed/armored/proc/set_safety(mob/user)
+ weapons_safety = !weapons_safety
+ SEND_SOUND(user, sound('sound/machines/beep.ogg', volume = 25))
+ balloon_alert(user, "equipment [weapons_safety ? "safe" : "ready"]")
+ // todo maybe make tanks also update the mouse icon?
+
+///Rotates the cannon overlay
+/obj/vehicle/sealed/armored/proc/swivel_turret(atom/A)
+ var/new_weapon_dir = angle_to_cardinal_dir(Get_Angle(src, A))
+ if(turret_overlay.dir == new_weapon_dir)
+ return FALSE
+ if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TANK_SWIVEL)) //Slight cooldown to avoid spam
+ return FALSE
+ playsound(src, 'sound/effects/tankswivel.ogg', 80,1)
+ TIMER_COOLDOWN_START(src, COOLDOWN_TANK_SWIVEL, 3 SECONDS)
+ turret_overlay.setDir(new_weapon_dir)
+ return TRUE
+
+///handles mouseclicks by a user in the vehicle
+/obj/vehicle/sealed/armored/proc/on_mouseclick(mob/user, atom/target, turf/location, control, list/modifiers)
+ SIGNAL_HANDLER
+ modifiers = params2list(modifiers)
+ if(isnull(location) && target.plane == CLICKCATCHER_PLANE) //Checks if the intended target is in deep darkness and adjusts target based on params.
+ target = params2turf(modifiers["screen-loc"], get_turf(user), user.client)
+ modifiers["icon-x"] = num2text(ABS_PIXEL_TO_REL(text2num(modifiers["icon-x"])))
+ modifiers["icon-y"] = num2text(ABS_PIXEL_TO_REL(text2num(modifiers["icon-y"])))
+ if(modifiers[SHIFT_CLICK]) //Allows things to be examined.
+ return
+ if(!isturf(target) && !isturf(target.loc)) // Prevents inventory from being drilled
+ return
+ if(HAS_TRAIT(user, TRAIT_INCAPACITATED))
+ return
+ if(src == target)
+ return
+ if(!is_equipment_controller(user))
+ balloon_alert(user, "wrong seat for equipment!")
+ return COMSIG_MOB_CLICK_CANCELED
+ if(LAZYACCESS(modifiers, MIDDLE_CLICK))
+ set_safety(user)
+ return COMSIG_MOB_CLICK_CANCELED
+ var/dir_to_target = get_cardinal_dir(src, target)
+ var/obj/item/armored_weapon/selected
+ if(modifiers[BUTTON] == RIGHT_CLICK)
+ selected = secondary_weapon
+ else
+ if(!turret_overlay)
+ return COMSIG_MOB_CLICK_CANCELED
+ if(turret_overlay.dir != dir_to_target)
+ swivel_turret(target)
+ return COMSIG_MOB_CLICK_CANCELED
+ selected = primary_weapon
+ if(!selected)
+ return
+ if(weapons_safety || zoom_mode)
+ return
+ INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/armored_weapon, begin_fire), user, target, modifiers)
+
+/atom/movable/vis_obj/turret_overlay
+ name = "Tank gun turret"
+ desc = "The shooty bit on a tank."
+ icon = 'icons/obj/armored/3x3/tank_gun.dmi' //set by owner
+ icon_state = "turret"
+ layer = ABOVE_ALL_MOB_LAYER
+ ///overlay for the attached gun
+ var/image/gun_overlay
+ ///overlay for the shooting version of that gun
+ var/image/flash_overlay
+ ///currently using the flashing overlay
+ var/flashing = FALSE
+ ///icon state for the secondary
+ var/image/secondary_overlay
+
+/atom/movable/vis_obj/turret_overlay/proc/update_gun_overlay(gun_icon_state)
+ cut_overlays()
+ if(!gun_icon_state)
+ flash_overlay = null
+ gun_overlay = null
+ return
+ flashing = FALSE
+ flash_overlay = image(icon, gun_icon_state + "_fire", pixel_x = -70, pixel_y = -69)
+ gun_overlay = image(icon, gun_icon_state, pixel_x = -40, pixel_y = -48)
+ update_appearance(UPDATE_OVERLAYS)
+
+/atom/movable/vis_obj/turret_overlay/proc/set_flashing(new_flashing)
+ flashing = new_flashing
+ update_appearance(UPDATE_OVERLAYS)
+
+/atom/movable/vis_obj/turret_overlay/update_overlays()
+ . = ..()
+ . += (flashing ? flash_overlay : gun_overlay)
+
+/atom/movable/vis_obj/turret_overlay/setDir(newdir)
+ . = ..()
+ if(secondary_overlay)
+ cut_overlay(secondary_overlay)
+ secondary_overlay.icon_state = copytext(secondary_overlay.icon_state, 1, length(secondary_overlay.icon_state)) + "[dir]"
+ add_overlay(secondary_overlay)
+
+/atom/movable/vis_obj/tank_damage
+ name = "Tank damage overlay"
+ desc = "ow."
+ icon = 'icons/obj/armored/3x3/tank_damage.dmi' //set by owner
+ icon_state = "null" // set on demand
+ vis_flags = VIS_INHERIT_DIR
diff --git a/code/modules/vehicles/armored/_multitile.dm b/code/modules/vehicles/armored/_multitile.dm
new file mode 100644
index 0000000000000..f52e150d14ef3
--- /dev/null
+++ b/code/modules/vehicles/armored/_multitile.dm
@@ -0,0 +1,38 @@
+/obj/vehicle/sealed/armored/multitile
+ name = "TAV - Rhino"
+ desc = "A gigantic wall of metal designed for maximum Xeno destruction. Drag yourself onto it at an entrance to get inside."
+ icon = 'icons/obj/armored/3x3/tank.dmi'
+ turret_icon = 'icons/obj/armored/3x3/tank_gun.dmi'
+ secondary_turret_icon = 'icons/obj/armored/3x3/tank_secondary_gun.dmi'
+ damage_icon_path = 'icons/obj/armored/3x3/tank_damage.dmi'
+ icon_state = "tank"
+ hitbox = /obj/hitbox
+ flags_atom = DIRLOCK|BUMP_ATTACKABLE|PREVENT_CONTENTS_EXPLOSION
+ flags_armored = ARMORED_HAS_PRIMARY_WEAPON|ARMORED_HAS_SECONDARY_WEAPON|ARMORED_HAS_UNDERLAY|ARMORED_HAS_MAP_VARIANTS|ARMORED_HAS_HEADLIGHTS
+ pixel_x = -48
+ pixel_y = -48
+ max_integrity = 900
+ soft_armor = list(MELEE = 50, BULLET = 100 , LASER = 90, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 50, ACID = 50)
+ hard_armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
+ max_occupants = 4
+ move_delay = 0.9 SECONDS
+ ram_damage = 70
+
+///returns a list of possible locations that this vehicle may be entered from
+/obj/vehicle/sealed/armored/multitile/proc/enter_locations(mob/M)
+ return list(get_step_away(get_step(src, REVERSE_DIR(dir)), src, 2))
+
+/obj/vehicle/sealed/armored/multitile/exit_location(mob/M)
+ return pick(enter_locations(M))
+
+/obj/vehicle/sealed/armored/multitile/mob_try_enter(mob/M)
+ if(!(M.loc in enter_locations(M)))
+ balloon_alert(M, "Not at entrance")
+ return FALSE
+ return ..()
+
+/obj/vehicle/sealed/armored/multitile/enter_checks(mob/M)
+ . = ..()
+ if(!.)
+ return
+ return (M.loc in enter_locations(M))
diff --git a/code/modules/vehicles/armored/ammo_magazine.dm b/code/modules/vehicles/armored/ammo_magazine.dm
new file mode 100644
index 0000000000000..82ab75c8f2c06
--- /dev/null
+++ b/code/modules/vehicles/armored/ammo_magazine.dm
@@ -0,0 +1,88 @@
+//FEB 2024 NOTE: some of these are missing loading_sounds, fix it before using these ingame
+//Special ammo magazines for hardpoint modules. Some may not here since you can use normal magazines on them
+/obj/item/ammo_magazine/tank
+ flags_magazine = NONE
+ ///loading sound to play when
+ var/loading_sound
+
+/obj/item/ammo_magazine/tank/ltb_cannon
+ name = "LTB Cannon Magazine"
+ desc = "A primary armament cannon magazine"
+ caliber = "86mm" //Making this unique on purpose
+ icon_state = "ltbcannon_4"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/rocket/ltb
+ max_rounds = 4
+ loading_sound = 'sound/vehicles/weapons/ltb_reload.ogg'
+
+/obj/item/ammo_magazine/tank/ltb_cannon/update_icon_state()
+ icon_state = "ltbcannon_[current_rounds]"
+
+
+/obj/item/ammo_magazine/tank/ltaap_minigun
+ name = "LTA-AP Minigun Magazine"
+ desc = "A primary armament minigun magazine"
+ caliber = "7.62x51mm" //Correlates to miniguns
+ icon_state = "painless"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/bullet/minigun
+ max_rounds = 500
+ loading_sound = 'sound/weapons/guns/interact/working_the_bolt.ogg'
+
+
+/obj/item/ammo_magazine/tank/flamer
+ name = "Flamer Magazine"
+ desc = "A secondary armament flamethrower magazine"
+ caliber = "UT-Napthal Fuel" //correlates to flamer mags
+ icon_state = "flametank_large"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/flamethrower/tank_flamer
+ max_rounds = 120
+
+/obj/item/ammo_magazine/tank/towlauncher
+ name = "TOW Launcher Magazine"
+ desc = "A secondary armament rocket magazine"
+ caliber = "rocket" //correlates to any rocket mags
+ icon_state = "quad_rocket"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/rocket/ap //Fun fact, AP rockets seem to be a straight downgrade from normal rockets. Maybe I'm missing something...
+ max_rounds = 5
+
+/obj/item/ammo_magazine/tank/secondary_cupola
+ name = "M56 Cupola Magazine"
+ desc = "A secondary armament MG magazine"
+ caliber = "10x28mm" //Correlates to smartguns
+ icon_state = "big_ammo_box"
+ loading_sound = 'sound/weapons/guns/interact/working_the_bolt.ogg'
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/bullet/cupola
+ max_rounds = 50
+
+/obj/item/ammo_magazine/tank/tank_glauncher
+ name = "Grenade Launcher Magazine"
+ desc = "A secondary armament grenade magazine"
+ caliber = "grenade"//grenades
+ icon_state = "glauncher_2"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/grenade_container
+ max_rounds = 10
+
+/obj/item/ammo_magazine/tank/tank_glauncher/update_icon_state()
+ if(current_rounds >= max_rounds)
+ icon_state = "glauncher_2"
+ else if(current_rounds <= 0)
+ icon_state = "glauncher_0"
+ else
+ icon_state = "glauncher_1"
+
+/obj/item/ammo_magazine/tank/tank_slauncher
+ name = "Smoke Launcher Magazine"
+ desc = "A support armament grenade magazine"
+ caliber = "grenade"
+ icon_state = "slauncher_1"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ default_ammo = /datum/ammo/grenade_container/smoke
+ max_rounds = 6
+
+/obj/item/ammo_magazine/tank/tank_slauncher/update_icon_state()
+ icon_state = "slauncher_[current_rounds <= 0 ? "0" : "1"]"
diff --git a/code/modules/vehicles/armored/apc.dm b/code/modules/vehicles/armored/apc.dm
new file mode 100644
index 0000000000000..75fb4ad86d8b2
--- /dev/null
+++ b/code/modules/vehicles/armored/apc.dm
@@ -0,0 +1,18 @@
+/obj/vehicle/sealed/armored/multitile/apc
+ name = "TAV - Athena"
+ desc = "An unarmed command APC designed to command and transport troops in the battlefield."
+ icon = 'icons/obj/armored/3x3/apc.dmi'
+ icon_state = "apc"
+ damage_icon_path = 'icons/obj/armored/3x3/apc_damage_overlay.dmi'
+ flags_armored = ARMORED_HAS_HEADLIGHTS
+ turret_icon = null
+ secondary_turret_icon = null
+ primary_weapon_type = null
+ secondary_weapon_type = null
+ flags_armored = NONE
+ pixel_x = -48
+ pixel_y = -40
+ obj_integrity = 2000
+ max_integrity = 2000
+ max_occupants = 10 //Clown car? Clown car.
+ move_delay = 0.5 SECONDS
diff --git a/code/modules/vehicles/armored/armored_actions.dm b/code/modules/vehicles/armored/armored_actions.dm
new file mode 100644
index 0000000000000..fb48a9fd3495c
--- /dev/null
+++ b/code/modules/vehicles/armored/armored_actions.dm
@@ -0,0 +1,128 @@
+/obj/vehicle/sealed/armored/generate_action_type()
+ . = ..()
+ if(istype(., /datum/action/vehicle/sealed/armored))
+ var/datum/action/vehicle/sealed/armored/armor = .
+ armor.chassis = src
+
+///yes this is a blatant mech copypaste
+/datum/action/vehicle/sealed/armored
+ action_icon = 'icons/mob/actions/actions_mecha.dmi'
+ ///mech owner of this action
+ var/obj/vehicle/sealed/armored/chassis
+
+/datum/action/vehicle/sealed/armored/Destroy()
+ chassis = null
+ return ..()
+
+/datum/action/vehicle/sealed/armored/eject
+ name = "Eject From Mech"
+ action_icon_state = "mech_eject"
+
+/datum/action/vehicle/sealed/armored/eject/action_activate(trigger_flags)
+ if(!owner)
+ return
+ if(!chassis || !(owner in chassis.occupants))
+ return
+ chassis.resisted_against(owner)
+
+/datum/action/vehicle/sealed/armored/swap_seat
+ name = "Switch Seats"
+ action_icon_state = "mech_seat_swap"
+
+#define ARMOR_DRIVER "Driver"
+#define ARMOR_GUNNER "Gunner"
+#define ARMOR_PASSENGER "Passenger"
+
+/datum/action/vehicle/sealed/armored/swap_seat/action_activate(trigger_flags)
+ if(!transfer_checks())
+ return
+ var/list/choices = list()
+ if(!chassis.is_driver(owner))
+ choices += ARMOR_DRIVER
+ if(!chassis.is_equipment_controller(owner))
+ choices += ARMOR_GUNNER
+ choices += ARMOR_PASSENGER
+ var/choice = tgui_input_list(owner, "Select a seat", chassis.name, choices)
+ if(!choice)
+ return
+ if(!transfer_checks(choice))
+ return
+ chassis.balloon_alert(owner, "moving to other seat...")
+ if(!do_after(owner, chassis.enter_delay, target = chassis, extra_checks=CALLBACK(src, PROC_REF(transfer_checks), choice)))
+ chassis.balloon_alert(owner, "interrupted!")
+ return
+ chassis.remove_control_flags(owner, VEHICLE_CONTROL_MELEE|VEHICLE_CONTROL_EQUIPMENT|VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_SETTINGS)
+ switch(choice)
+ if(ARMOR_GUNNER)
+ chassis.balloon_alert(owner, "controlling gunner seat")
+ chassis.add_control_flags(owner, VEHICLE_CONTROL_MELEE|VEHICLE_CONTROL_EQUIPMENT)
+ if(ARMOR_DRIVER)
+ chassis.balloon_alert(owner, "controlling pilot seat")
+ chassis.add_control_flags(owner, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_SETTINGS)
+ if(ARMOR_PASSENGER)
+ chassis.balloon_alert(owner, "entered passenger seat")
+
+///checks if owner can still transfer
+/datum/action/vehicle/sealed/armored/swap_seat/proc/transfer_checks(choice)
+ if(!owner || !chassis || !(owner in chassis.occupants))
+ return FALSE
+ if(length(chassis.occupants) >= chassis.max_occupants)
+ chassis.balloon_alert(owner, "other seats occupied!")
+ return FALSE
+ switch(choice)
+ if(ARMOR_GUNNER)
+ if(length(chassis.return_controllers_with_flag(VEHICLE_CONTROL_EQUIPMENT)) >= 1)
+ chassis.balloon_alert(owner, "gunner occupied!")
+ return FALSE
+ if(ARMOR_DRIVER)
+ if(chassis.driver_amount() >= chassis.max_drivers)
+ chassis.balloon_alert(owner, "driver occupied!")
+ return FALSE
+ return TRUE
+
+#undef ARMOR_DRIVER
+#undef ARMOR_GUNNER
+#undef ARMOR_PASSENGER
+
+/datum/action/vehicle/sealed/armored/toggle_lights
+ name = "Toggle Lights"
+ action_icon_state = "mech_lights_off"
+
+/datum/action/vehicle/sealed/armored/toggle_lights/action_activate(trigger_flags)
+ if(!owner || !chassis || !(owner in chassis.occupants))
+ return
+
+ if(!(chassis.flags_armored & ARMORED_HAS_HEADLIGHTS))
+ chassis.balloon_alert(owner, "the vehicle's lights are broken!")
+ return
+ chassis.flags_armored ^= ARMORED_LIGHTS_ON
+ if(chassis.flags_armored & ARMORED_LIGHTS_ON)
+ action_icon_state = "mech_lights_on"
+ else
+ action_icon_state = "mech_lights_off"
+ chassis.set_light_on(chassis.flags_armored & ARMORED_LIGHTS_ON)
+ chassis.balloon_alert(owner, "toggled lights [chassis.flags_armored & ARMORED_LIGHTS_ON ? "on":"off"]")
+ playsound(chassis,'sound/mecha/brass_skewer.ogg', 40, TRUE)
+ chassis.log_message("Toggled lights [(chassis.flags_armored & ARMORED_LIGHTS_ON)?"on":"off"].", LOG_MECHA)
+ update_button_icon()
+
+/datum/action/vehicle/sealed/armored/zoom
+ name = "Zoom"
+ action_icon_state = "mech_zoom_off"
+ keybinding_signals = list(
+ KEYBINDING_NORMAL = COMSIG_MECHABILITY_TOGGLE_ZOOM,
+ )
+
+/datum/action/vehicle/sealed/armored/zoom/action_activate(trigger_flags)
+ if(!owner?.client || !chassis || !(owner in chassis.occupants))
+ return
+ chassis.zoom_mode = !chassis.zoom_mode
+ action_icon_state = "mech_zoom_[chassis.zoom_mode ? "on" : "off"]"
+ chassis.log_message("Toggled zoom mode.", LOG_MECHA)
+ to_chat(owner, "
Zoom mode [chassis.zoom_mode?"en":"dis"]abled.")
+ if(chassis.zoom_mode)
+ owner.client.view_size.set_view_radius_to(4.5)
+ SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg', volume=50))
+ else
+ owner.client.view_size.reset_to_default()
+ update_button_icon()
diff --git a/code/modules/vehicles/armored/armored_modules.dm b/code/modules/vehicles/armored/armored_modules.dm
new file mode 100644
index 0000000000000..79209699cc326
--- /dev/null
+++ b/code/modules/vehicles/armored/armored_modules.dm
@@ -0,0 +1,127 @@
+/**
+ *TANK MODULES
+ *
+ * Attached to the tank and provide abilities/ passive upgrades
+ */
+/obj/item/tank_module
+ name = "Tank Module"
+ desc = "Yell at the admin that spawned this in please."
+ icon = 'icons/obj/armored/hardpoint_modules.dmi'
+ icon_state = "ltb_cannon"
+ ///reference to current overlay added to owner
+ var/image/overlay
+ ///vehicle this overlay is attached to
+ var/obj/vehicle/sealed/armored/owner
+ ///Bool whether this module is a driver module or not
+ var/is_driver_module = TRUE
+
+///Called to apply modules to a vehicle
+/obj/item/tank_module/proc/on_equip(obj/vehicle/sealed/armored/vehicle, mob/living/user)
+ SHOULD_CALL_PARENT(TRUE)
+ if(!istype(vehicle))
+ return FALSE
+ var/slot = is_driver_module ? vehicle.driver_utility_module : vehicle.gunner_utility_module
+ if(slot)
+ user?.balloon_alert(user, "module slot full")
+ return FALSE
+ user?.temporarilyRemoveItemFromInventory(src)
+ forceMove(vehicle)
+ if(is_driver_module)
+ vehicle.driver_utility_module = src
+ else
+ vehicle.gunner_utility_module = src
+ if(!vehicle.turret_overlay)
+ overlay = image(vehicle.icon, null, icon_state)
+ vehicle.add_overlay(overlay)
+ else
+ overlay = image(vehicle.turret_overlay.icon, null, icon_state)
+ vehicle.turret_overlay.add_overlay(overlay)
+ owner = vehicle
+ return TRUE
+
+///called to remove this module from its vehicle
+/obj/item/tank_module/proc/on_unequip(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
+ if(owner.driver_utility_module == src)
+ owner.driver_utility_module = null
+ else
+ owner.gunner_utility_module = null
+ forceMove(owner.drop_location())
+ owner.cut_overlay(overlay)
+ owner.turret_overlay?.cut_overlay(overlay)
+ owner = null
+ overlay = null
+ user?.put_in_hands(src)
+ return TRUE
+
+/obj/item/tank_module/Destroy()
+ if(owner)
+ on_unequip()
+ return ..()
+
+
+/obj/item/tank_module/overdrive
+ name = "overdrive module"
+ desc = "A module that enhances the speed of armored combat vehicles by increasing fuel efficiency."
+ icon_state = "overdrive"
+
+/obj/item/tank_module/overdrive/on_equip(target)
+ . = ..()
+ if(!.)
+ return
+ var/obj/vehicle/sealed/armored/vehicle = target
+ vehicle.move_delay -= 0.15 SECONDS
+
+/obj/item/tank_module/overdrive/on_unequip()
+ owner.move_delay += 0.15 SECONDS
+ return ..()
+
+/obj/item/tank_module/passenger
+ name = "passenger module"
+ desc = "A module that increases the carrying capacity of a vehicle with extra seats."
+ icon_state = "uninstalled APC frieght carriage"
+
+/obj/item/tank_module/passenger/on_equip(target)
+ . = ..()
+ if(!.)
+ return
+ var/obj/vehicle/sealed/armored/vehicle = target
+ vehicle.max_occupants += 4
+
+/obj/item/tank_module/passenger/on_unequip(target)
+ owner.max_occupants -= 4
+ return ..()
+
+
+/obj/item/tank_module/ability
+ name = "Ability Module"
+ desc = "You shouldnt be seeing this."
+ icon_state = "overdrive"
+ ///typepaths for the ability we want to grant
+ var/ability_to_grant
+ ///if given, a single flag of who we want this ability to be granted to
+ var/flag_controller = NONE
+
+/obj/item/tank_module/ability/on_equip(obj/vehicle/sealed/armored/vehicle, attach_right)
+ . = ..()
+ if(!.)
+ return
+ if(flag_controller)
+ vehicle.initialize_controller_action_type(ability_to_grant, flag_controller)
+ else
+ vehicle.initialize_passenger_action_type(ability_to_grant)
+
+/obj/item/tank_module/ability/on_unequip(atom/moveto)
+ if(flag_controller)
+ owner.destroy_controller_action_type(ability_to_grant, flag_controller)
+ else
+ owner.destroy_passenger_action_type(ability_to_grant)
+ return ..()
+
+/obj/item/tank_module/ability/zoom
+ name = "zoom module"
+ desc = "Allows gunners to see further while looking through it. Weapons cannot be used while looking through it."
+ icon_state = "zoom"
+ is_driver_module = FALSE
+ flag_controller = VEHICLE_CONTROL_EQUIPMENT
+ ability_to_grant = /datum/action/vehicle/sealed/armored/zoom
diff --git a/code/modules/vehicles/armored/armored_weapons.dm b/code/modules/vehicles/armored/armored_weapons.dm
new file mode 100644
index 0000000000000..454284363e6ff
--- /dev/null
+++ b/code/modules/vehicles/armored/armored_weapons.dm
@@ -0,0 +1,311 @@
+/obj/item/armored_weapon
+ name = "LTB main battle tank cannon"
+ desc = "A TGMC vehicle's main turret cannon. It fires 86mm rocket propelled shells"
+ icon = 'icons/obj/armored/hardpoint_modules.dmi'
+ icon_state = "ltb_cannon"
+ ///owner this is attached to
+ var/obj/vehicle/sealed/armored/chassis
+ ///The turret icon if we equip the weapon in a secondary slot, you should null this if its unequippable as such
+ var/secondary_equipped_icon
+ ///Weapon slot this weapon fits in
+ var/weapon_slot = MODULE_PRIMARY
+
+ ///currently loaded ammo. initial value is ammo we start with
+ var/obj/item/ammo_magazine/ammo = /obj/item/ammo_magazine/tank/ltb_cannon
+ ///Current loaded magazines: top one empties into ammo
+ var/list/obj/item/ammo_magazine/ammo_magazine = list()
+ ///maximum magazines ammo_magazine can hold
+ var/maximum_magazines = 5
+ ///ammo types we'll be able to accept
+ var/list/accepted_ammo = list(
+ /obj/item/ammo_magazine/tank/tank_glauncher,
+ /obj/item/ammo_magazine/tank/ltb_cannon,
+ )
+ ///current tracked target for fire(), updated when user drags
+ var/atom/current_target
+ ///current mob firing this weapon. used for tracking for iff and etc in fire()
+ var/mob/current_firer
+
+ ///sound file to play when this weapon you know, fires
+ var/fire_sound = list('sound/weapons/guns/fire/tank_cannon1.ogg', 'sound/weapons/guns/fire/tank_cannon2.ogg')
+ ///Tracks windups
+ var/windup_checked = WEAPON_WINDUP_NOT_CHECKED
+ ///windup sound played during windup
+ var/windup_sound
+ ///windup delay for this object
+ var/windup_delay = 0
+ ///scatter of this weapon. in degrees and modified by arm this is attached to
+ var/variance = 0
+ /// since mech guns only get one firemode this is for all types of shots
+ var/projectile_delay = 5 SECONDS
+ /// time between shots in a burst
+ var/projectile_burst_delay = 2
+ ///bullets per burst if firemode is set to burst
+ var/burst_amount = 0
+ ///fire mode to use for autofire
+ var/fire_mode = GUN_FIREMODE_SEMIAUTO
+ ///how many seconds automatic reloading takes
+ var/rearm_time = 4.5 SECONDS
+ ///ammo hud icon to display when no ammo is loaded
+ var/hud_state_empty = "shell_empty"
+
+/obj/item/armored_weapon/Initialize(mapload)
+ . = ..()
+ if(ammo)
+ ammo = new ammo(src)
+ AddComponent(/datum/component/automatedfire/autofire, projectile_delay, projectile_delay, projectile_burst_delay, burst_amount, fire_mode, CALLBACK(src, PROC_REF(set_bursting)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(fire)))
+
+/obj/item/armored_weapon/Destroy()
+ if(chassis)
+ detach(get_turf(chassis))
+ QDEL_NULL(ammo)
+ QDEL_LIST(ammo_magazine)
+ return ..()
+
+///called by the chassis: begins firing, yes this is stolen from mech but I made both so bite me
+/obj/item/armored_weapon/proc/begin_fire(mob/source, atom/target, list/modifiers)
+ if(!ammo || ammo.current_rounds < 0)
+ playsound(source, 'sound/weapons/guns/fire/empty.ogg', 15, 1)
+ return
+ if(TIMER_COOLDOWN_CHECK(chassis, COOLDOWN_MECHA_EQUIPMENT(type)))
+ return
+ TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_EQUIPMENT(type), projectile_delay)
+
+ set_target(get_turf_on_clickcatcher(target, source, list2params(modifiers)))
+ if(!current_target)
+ return
+ RegisterSignal(source, COMSIG_MOB_MOUSEUP, PROC_REF(stop_fire))
+ RegisterSignal(source, COMSIG_MOB_MOUSEDRAG, PROC_REF(change_target))
+ if(windup_delay && windup_checked == WEAPON_WINDUP_NOT_CHECKED)
+ windup_checked = WEAPON_WINDUP_CHECKING
+ playsound(chassis.loc, windup_sound, 30, TRUE)
+ if(!do_after(source, windup_delay, IGNORE_TARGET_LOC_CHANGE, chassis, BUSY_ICON_DANGER, BUSY_ICON_DANGER, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), current_target)))
+ windup_checked = WEAPON_WINDUP_NOT_CHECKED
+ return
+ windup_checked = WEAPON_WINDUP_CHECKED
+ if(QDELETED(current_target))
+ windup_checked = WEAPON_WINDUP_NOT_CHECKED
+ return
+ current_firer = source
+ if(fire_mode == GUN_FIREMODE_SEMIAUTO)
+ var/fire_return // todo fix: code expecting return values from async
+ ASYNC
+ fire_return = fire()
+ if(!fire_return || windup_checked == WEAPON_WINDUP_CHECKING)
+ return
+ reset_fire()
+ return
+ SEND_SIGNAL(src, COMSIG_ARMORED_FIRE)
+ source?.client?.mouse_pointer_icon = 'icons/effects/supplypod_target.dmi'
+
+/// do after checks for the mecha equipment do afters
+/obj/item/armored_weapon/proc/do_after_checks(atom/target)
+ if(!chassis)
+ return FALSE
+ if(QDELETED(current_target))
+ return FALSE
+ if(chassis.primary_weapon == src)
+ var/dir_target_diff = get_between_angles(Get_Angle(chassis, current_target), dir2angle(chassis.turret_overlay.dir))
+ if(dir_target_diff > (ARMORED_FIRE_CONE_ALLOWED / 2))
+ if(!chassis.swivel_turret(current_target))
+ return FALSE
+ dir_target_diff = get_between_angles(Get_Angle(chassis, current_target), dir2angle(chassis.turret_overlay.dir))
+ if(dir_target_diff > (ARMORED_FIRE_CONE_ALLOWED / 2))
+ return FALSE
+ return TRUE
+
+///callback wrapper for adding/removing trait
+/obj/item/armored_weapon/proc/set_bursting(bursting)
+ if(bursting)
+ ADD_TRAIT(src, TRAIT_GUN_BURST_FIRING, VEHICLE_TRAIT)
+ return
+ REMOVE_TRAIT(src, TRAIT_GUN_BURST_FIRING, VEHICLE_TRAIT)
+
+///Changes the current target.
+/obj/item/armored_weapon/proc/change_target(datum/source, atom/src_object, atom/over_object, turf/src_location, turf/over_location, src_control, over_control, params)
+ SIGNAL_HANDLER
+ set_target(get_turf_on_clickcatcher(over_object, source, params))
+
+///Sets the current target and registers for qdel to prevent hardels
+/obj/item/armored_weapon/proc/set_target(atom/object)
+ if(object == current_target || object == chassis)
+ return
+ if(current_target)
+ UnregisterSignal(current_target, COMSIG_QDELETING)
+ current_target = object
+ if(current_target)
+ RegisterSignal(current_target, COMSIG_QDELETING, PROC_REF(clean_target))
+
+///Stops the Autofire component and resets the current cursor.
+/obj/item/armored_weapon/proc/stop_fire(mob/living/source, atom/object, location, control, params)
+ SIGNAL_HANDLER
+ var/list/modifiers = params2list(params)
+ if(!((modifiers[BUTTON] == RIGHT_CLICK) && chassis.secondary_weapon == src) && !((modifiers[BUTTON] == LEFT_CLICK) && chassis.primary_weapon == src))
+ return
+ SEND_SIGNAL(src, COMSIG_ARMORED_STOP_FIRE)
+ if(!HAS_TRAIT(src, TRAIT_GUN_BURST_FIRING))
+ reset_fire()
+ UnregisterSignal(source, list(COMSIG_MOB_MOUSEDRAG, COMSIG_MOB_MOUSEUP))
+
+///Cleans the current target in case of Hardel
+/obj/item/armored_weapon/proc/clean_target()
+ SIGNAL_HANDLER
+ current_target = get_turf(current_target)
+
+///Resets the autofire component.
+/obj/item/armored_weapon/proc/reset_fire()
+ windup_checked = WEAPON_WINDUP_NOT_CHECKED
+ current_firer?.client?.mouse_pointer_icon = chassis.mouse_pointer
+ set_target(null)
+ current_firer = null
+
+///does any effects and changes to the projectile when it is fired
+/obj/item/armored_weapon/proc/apply_weapon_modifiers(obj/projectile/projectile_to_fire, mob/firer)
+ projectile_to_fire.shot_from = src
+ if(chassis.hitbox?.tank_desants)
+ projectile_to_fire.hit_atoms += chassis.hitbox.tank_desants
+ if((projectile_to_fire.ammo.flags_ammo_behavior & AMMO_IFF) && ishuman(firer))
+ var/mob/living/carbon/human/human_firer = firer
+ var/obj/item/card/id/id = human_firer.get_idcard()
+ projectile_to_fire.iff_signal = id?.iff_signal
+
+///actually executes firing when autofire asks for it, returns TRUE to keep firing FALSE to stop
+/obj/item/armored_weapon/proc/fire()
+ if(chassis.primary_weapon == src)
+ var/dir_target_diff = get_between_angles(Get_Angle(chassis, current_target), dir2angle(chassis.turret_overlay.dir))
+ if(dir_target_diff > (ARMORED_FIRE_CONE_ALLOWED / 2))
+ chassis.swivel_turret(current_target)
+ return AUTOFIRE_CONTINUE
+ else if(chassis.turret_overlay)
+ chassis.turret_overlay.cut_overlay(chassis.turret_overlay.secondary_overlay)
+ chassis.turret_overlay.secondary_overlay.dir = get_cardinal_dir(chassis, current_target)
+ chassis.turret_overlay.add_overlay(chassis.turret_overlay.secondary_overlay)
+ else
+ chassis.cut_overlay(chassis.secondary_weapon_overlay)
+ chassis.secondary_weapon_overlay.dir = get_cardinal_dir(chassis, current_target)
+ chassis.add_overlay(chassis.secondary_weapon_overlay)
+
+
+ var/type_to_spawn = CHECK_BITFIELD(initial(ammo.default_ammo.flags_ammo_behavior), AMMO_HITSCAN) ? /obj/projectile/hitscan : /obj/projectile
+ var/obj/projectile/projectile_to_fire = new type_to_spawn(get_turf(src), initial(ammo.default_ammo.hitscan_effect_icon))
+ projectile_to_fire.generate_bullet(GLOB.ammo_list[ammo.default_ammo])
+
+ apply_weapon_modifiers(projectile_to_fire, current_firer)
+ var/firing_angle = get_angle_with_scatter(chassis, current_target, projectile_to_fire.scatter, projectile_to_fire.p_x, projectile_to_fire.p_y)
+
+ playsound(chassis, islist(fire_sound) ? pick(fire_sound):fire_sound, 20, TRUE)
+ projectile_to_fire.fire_at(current_target, chassis, null, projectile_to_fire.ammo.max_range, projectile_to_fire.projectile_speed, firing_angle, suppress_light = HAS_TRAIT(src, TRAIT_GUN_SILENCED))
+
+ chassis.log_message("Fired from [name], targeting [current_target] at [AREACOORD(current_target)].", LOG_ATTACK)
+
+ if(chassis.primary_weapon == src && !chassis.turret_overlay.flashing)
+ chassis.turret_overlay.set_flashing(TRUE)
+ addtimer(CALLBACK(chassis.turret_overlay, TYPE_PROC_REF(/atom/movable/vis_obj/turret_overlay, set_flashing), FALSE), 7, TIMER_CLIENT_TIME)
+
+ ammo.current_rounds--
+ for(var/mob/occupant AS in chassis.occupants)
+ occupant.hud_used.update_ammo_hud(src, list(ammo.default_ammo.hud_state, ammo.default_ammo.hud_state_empty), ammo.current_rounds)
+ if(ammo.current_rounds > 0)
+ return AUTOFIRE_CONTINUE|AUTOFIRE_SUCCESS
+ playsound(src, 'sound/weapons/guns/misc/empty_alarm.ogg', 25, 1)
+ eject_ammo()
+ if(LAZYACCESS(current_firer.do_actions, src) || length(ammo_magazine) < 1)
+ return AUTOFIRE_SUCCESS
+ var/obj/item/ammo_magazine/tank/new_mag = ammo_magazine[1]
+ if(istype(new_mag) && new_mag.loading_sound)
+ // .5 sec delay to let other sounds play out
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, new_mag.loading_sound, 40), 5)
+ if(!do_after(current_firer, rearm_time, IGNORE_HELD_ITEM|IGNORE_LOC_CHANGE, chassis, BUSY_ICON_GENERIC))
+ return AUTOFIRE_SUCCESS
+ reload()
+ return AUTOFIRE_CONTINUE|AUTOFIRE_SUCCESS
+
+///eject current ammo from tank
+/obj/item/armored_weapon/proc/eject_ammo()
+ ammo.forceMove(chassis.exit_location())
+ ammo.update_appearance()
+ ammo = null
+ for(var/mob/occupant AS in chassis.occupants)
+ occupant.hud_used.update_ammo_hud(src, list(hud_state_empty, hud_state_empty), 0)
+
+///load topmost ammo magazine, if there is any
+/obj/item/armored_weapon/proc/reload()
+ if(ammo)
+ eject_ammo()
+ ammo = popleft(ammo_magazine)
+ for(var/mob/occupant AS in chassis.occupants)
+ occupant.hud_used.update_ammo_hud(src, list(ammo.default_ammo.hud_state, ammo.default_ammo.hud_state_empty), ammo.current_rounds)
+
+///attach this weapon to a chassis
+/obj/item/armored_weapon/proc/attach(obj/vehicle/sealed/armored/tank, attach_primary)
+ if(attach_primary)
+ tank.primary_weapon?.detach(tank.exit_location())
+ tank.primary_weapon = src
+ tank.turret_overlay.update_gun_overlay(icon_state)
+ else
+ tank.secondary_weapon?.detach(tank.exit_location())
+ tank.secondary_weapon = src
+ if(tank.turret_overlay)
+ // do not remove the dir = SOUTH becuase otherwise byond flips an internal flag so the dir is inherited from the turret
+ tank.turret_overlay.secondary_overlay = image(tank.turret_icon, icon_state = icon_state + "_" + "[tank.turret_overlay.dir]", dir = SOUTH)
+ tank.turret_overlay.add_overlay(tank.turret_overlay.secondary_overlay)
+ else
+ tank.secondary_weapon_overlay = image(tank.turret_icon, icon_state = icon_state + "_" + "[tank.dir]")
+ tank.update_appearance(UPDATE_OVERLAYS)
+ chassis = tank
+ forceMove(tank)
+ var/icon_list
+ if(ammo?.default_ammo)
+ icon_list = list(ammo.default_ammo.hud_state, ammo.default_ammo.hud_state_empty)
+ else
+ icon_list = list(hud_state_empty, hud_state_empty)
+ for(var/mob/occupant AS in chassis.occupants)
+ occupant.hud_used.add_ammo_hud(src, icon_list, ammo ? ammo.current_rounds : 0)
+
+///detach this weapon to a chassis
+/obj/item/armored_weapon/proc/detach(atom/moveto)
+ if(chassis.primary_weapon == src)
+ chassis.primary_weapon = null
+ chassis.turret_overlay.update_gun_overlay()
+ else
+ chassis.secondary_weapon = null
+ if(chassis.turret_overlay)
+ chassis.turret_overlay.cut_overlay(chassis.turret_overlay.secondary_overlay)
+ chassis.turret_overlay.secondary_overlay = null
+ else
+ chassis.secondary_weapon_overlay = null
+ chassis.update_appearance(UPDATE_OVERLAYS)
+ for(var/mob/occupant AS in chassis.occupants)
+ occupant.hud_used.remove_ammo_hud(src)
+ chassis = null
+ forceMove(moveto)
+
+/obj/item/armored_weapon/secondary_weapon
+ name = "secondary cupola minigun"
+ desc = "A robotically controlled minigun that spws lead. Do not stand in front of it!!"
+ icon_state = "cupola"
+ fire_sound = 'sound/weapons/guns/fire/tank_minigun_loop.ogg'
+ windup_delay = 5
+ windup_sound = 'sound/weapons/guns/fire/tank_minigun_start.ogg'
+ weapon_slot = MODULE_PRIMARY|MODULE_SECONDARY
+ secondary_equipped_icon = 'icons/obj/armored/3x3/tank_secondary_gun.dmi'
+ ammo = /obj/item/ammo_magazine/tank/secondary_cupola
+ accepted_ammo = list(/obj/item/ammo_magazine/tank/secondary_cupola)
+ fire_mode = GUN_FIREMODE_AUTOMATIC
+ projectile_delay = 2
+ rearm_time = 1 SECONDS
+ maximum_magazines = 5
+ hud_state_empty = "rifle_empty"
+
+/obj/item/armored_weapon/apc_cannon
+ name = "MKV-7 utility payload launcher"
+ desc = "A double barrelled cannon which can rapidly deploy utility packages to the battlefield."
+ icon_state = "APC uninstalled dualcannon"
+ fire_sound = 'sound/weapons/guns/fire/tank_smokelauncher.ogg'
+ ammo = /obj/item/ammo_magazine/tank/tank_slauncher
+ accepted_ammo = list(
+ /obj/item/ammo_magazine/tank/tank_slauncher,
+ /obj/item/ammo_magazine/tank/tank_glauncher,
+ )
+ projectile_delay = 0.7 SECONDS
+ hud_state_empty = "grenade_empty"
diff --git a/code/modules/vehicles/armored/medium_apc.dm b/code/modules/vehicles/armored/medium_apc.dm
new file mode 100644
index 0000000000000..82910cc242041
--- /dev/null
+++ b/code/modules/vehicles/armored/medium_apc.dm
@@ -0,0 +1,13 @@
+/obj/vehicle/sealed/armored/multitile/medium/apc
+ name = "TAV - Nike"
+ desc = "A heavily armoured vehicle with light armaments designed to ferry troops around the battlefield, or assist with search and rescue (SAR) operations."
+ icon = 'icons/obj/armored/2x2/medium_vehicles.dmi'
+ turret_icon = 'icons/obj/armored/2x2/medium_vehicles.dmi'
+ turret_icon_state = "apc_turret"
+ damage_icon_path = null
+ flags_armored = ARMORED_HAS_PRIMARY_WEAPON|ARMORED_HAS_SECONDARY_WEAPON|ARMORED_HAS_UNDERLAY
+ icon_state = "apc"
+ move_delay = 0.25 SECONDS
+ max_occupants = 5
+ primary_weapon_type = /obj/item/armored_weapon/apc_cannon //Only has a utility launcher, no offense as standard.
+ secondary_weapon_type = null
diff --git a/code/modules/vehicles/armored/medium_tank.dm b/code/modules/vehicles/armored/medium_tank.dm
new file mode 100644
index 0000000000000..adddc2af3f6aa
--- /dev/null
+++ b/code/modules/vehicles/armored/medium_tank.dm
@@ -0,0 +1,19 @@
+/obj/vehicle/sealed/armored/multitile/medium //Its a smaller tank, we had sprites for it so whoo
+ name = "THV - Hades"
+ desc = "A metal behemoth which is designed to cleave through enemy lines. It comes pre installed with a main tank cannon capable of deploying heavy payloads, as well as a minigun which can tear through multiple targets in quick succession."
+ icon = 'icons/obj/armored/2x2/medium_vehicles.dmi'
+ turret_icon = 'icons/obj/armored/2x2/medium_vehicles.dmi'
+ turret_icon_state = "tank_turret"
+ hitbox = /obj/hitbox/medium
+ secondary_turret_icon = null
+ damage_icon_path = null
+ icon_state = "tank"
+ flags_armored = ARMORED_HAS_PRIMARY_WEAPON|ARMORED_HAS_UNDERLAY
+ pixel_x = -16
+ pixel_y = -32
+ obj_integrity = 1300
+ max_integrity = 1300
+ max_occupants = 3
+
+/obj/vehicle/sealed/armored/multitile/medium/enter_locations(mob/M)
+ return list(get_step(src, REVERSE_DIR(dir)))
diff --git a/code/modules/vehicles/armored/small_apc.dm b/code/modules/vehicles/armored/small_apc.dm
new file mode 100644
index 0000000000000..21d52a30879a8
--- /dev/null
+++ b/code/modules/vehicles/armored/small_apc.dm
@@ -0,0 +1,15 @@
+/obj/vehicle/sealed/armored/apc
+ name = "TAV - Nike"
+ desc = "A miniaturized replica of a popular personnel carrier. For ages 5 and up."
+ icon = 'icons/obj/armored/1x1/tinytank.dmi'
+ turret_icon = 'icons/obj/armored/1x1/tinytank_gun.dmi'
+ turret_icon_state = "apc_turret"
+ icon_state = "apc"
+ flags_armored = NONE
+ move_delay = 0.3 SECONDS
+ flags_armored = NONE
+ pixel_x = -16
+ pixel_y = -8
+ max_occupants = 3
+ primary_weapon_type = null
+ secondary_weapon_type = null
diff --git a/code/modules/vehicles/armored/tank_fabricator.dm b/code/modules/vehicles/armored/tank_fabricator.dm
new file mode 100644
index 0000000000000..d15bec0c721a7
--- /dev/null
+++ b/code/modules/vehicles/armored/tank_fabricator.dm
@@ -0,0 +1,9 @@
+/obj/machinery/tank_part_fabricator
+ name = "vehicle part fabricator"
+ desc = "A large automated 3D printer for producing new vehicle parts and maintaining old ones."
+ density = TRUE
+ anchored = TRUE
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 20
+ icon = 'icons/obj/machines/drone_fab.dmi'
+ icon_state = "drone_fab_idle"
diff --git a/code/modules/vehicles/armored/vehicle_collision.dm b/code/modules/vehicles/armored/vehicle_collision.dm
new file mode 100644
index 0000000000000..37692e63868fb
--- /dev/null
+++ b/code/modules/vehicles/armored/vehicle_collision.dm
@@ -0,0 +1,64 @@
+/**
+ *This proc is called when a atom is crashed into by a [armored vehicle][/obj/vehicle/sealed/armored]. Damage is then dealt to both the vehicle and atom
+ *
+ * * Arguments:
+ * * veh is the vehicle that is ramming
+ * * facing is the direction the vehicle is facing for when we ram it
+ * * T is the turf where the vehicle is used with-
+ * * temp to check whether a mob is squished
+ */
+/atom/proc/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ var/damage = veh.ram_damage // Each vehicle gets its own damage, you can modify it with snowplows and such ideally
+
+ if(!TIMER_COOLDOWN_CHECK(veh, COOLDOWN_VEHICLE_CRUSHSOUND))
+ visible_message(span_danger("[veh] rams [src]!"))
+ playsound(src, 'sound/effects/metal_crash.ogg', 45)
+ TIMER_COOLDOWN_START(veh, COOLDOWN_VEHICLE_CRUSHSOUND, 1 SECONDS)
+ return damage
+
+/obj/structure/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ . = ..()
+ take_damage(., BRUTE, MELEE, TRUE, facing, 0)
+
+/obj/structure/barricade/plasteel/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ . = ..()
+ toggle_open(FALSE)
+
+/obj/vehicle/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp) //MONSTER TRUCKS
+ . = ..()
+ take_damage(., BRUTE, MELEE, TRUE, facing, 0)
+
+/obj/machinery/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ . = ..()
+ take_damage(., BRUTE, MELEE, TRUE, facing, 0)
+
+/turf/closed/wall/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ . = ..()
+ take_damage(., BRUTE, MELEE, TRUE, facing, 0)
+
+/mob/living/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp, mob/pilot)
+ . = ..()
+ if(stat == DEAD)
+ return 0
+ if(lying_angle)
+ return 0
+ log_attack("[key_name(pilot)] drove into [key_name(src)] with [veh]")
+ temp = get_step(veh.loc, facing)
+ T = temp
+ T = get_step(T, facing)
+ T = get_step(T, facing)
+ T = get_step(T, facing)
+ face_atom(T)
+ throw_at(T, 3, 2, veh, 1)
+ return take_overall_damage(., BRUTE, MELEE, FALSE, FALSE, TRUE, 0, 4)
+
+
+/mob/living/carbon/xenomorph/larva/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ gib() //fuck you
+
+/obj/effect/alien/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ . = ..()
+ take_damage(., BRUTE, MELEE, TRUE, facing, 0)
+
+/obj/effect/alien/weeds/vehicle_collision(obj/vehicle/sealed/armored/veh, facing, turf/T, turf/temp)
+ return
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index a697f30646575..5328827da2f79 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -47,7 +47,7 @@
buckled_mob.bullet_act(P)
return TRUE
-/obj/vehicle/ridden/atv/obj_destruction()
+/obj/vehicle/ridden/atv/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
explosion(src, devastation_range = -1, light_impact_range = 2, flame_range = 3, flash_range = 4)
return ..()
diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm
index 42efcee22e8e2..52460f0fa2222 100644
--- a/code/modules/vehicles/cars/car.dm
+++ b/code/modules/vehicles/cars/car.dm
@@ -1,6 +1,7 @@
/obj/vehicle/sealed/car
layer = ABOVE_MOB_LAYER
move_resist = MOVE_FORCE_VERY_STRONG
+ move_delay = 1
///Bitflags for special behavior such as kidnapping
var/car_traits = NONE
///Sound file(s) to play when we drive around
@@ -9,8 +10,6 @@
var/engine_sound_length = 2 SECONDS
///Time it takes to break out of the car.
var/escape_time = 6 SECONDS
- /// How long it takes to move, cars don't use the riding component similar to mechs so we handle it ourselves
- var/vehicle_move_delay = 1
/// How long it takes to rev (vrrm vrrm!)
COOLDOWN_DECLARE(enginesound_cooldown)
@@ -72,20 +71,20 @@
kidnapped.forceMove(src)
add_occupant(kidnapped, VEHICLE_CONTROL_KIDNAPPED)
-/obj/vehicle/sealed/car/obj_destruction(damage_flag)
+/obj/vehicle/sealed/car/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
explosion(src, heavy_impact_range = 1, light_impact_range = 2, flash_range = 3, adminlog = FALSE)
log_message("[src] exploded due to destruction", LOG_ATTACK)
return ..()
/obj/vehicle/sealed/car/relaymove(mob/living/user, direction)
if(is_driver(user) && canmove && (!key_type || istype(inserted_key, key_type)))
- vehicle_move(direction)
+ vehicle_move(user, direction)
return TRUE
-/obj/vehicle/sealed/car/vehicle_move(direction)
- if(!COOLDOWN_CHECK(src, cooldown_vehicle_move))
- return FALSE
- COOLDOWN_START(src, cooldown_vehicle_move, vehicle_move_delay)
+/obj/vehicle/sealed/car/vehicle_move(mob/living/user, direction)
+ . = ..()
+ if(!.)
+ return
if(COOLDOWN_CHECK(src, enginesound_cooldown))
COOLDOWN_START(src, enginesound_cooldown, engine_sound_length)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 6cc71dc101cae..22d507f5fd07e 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -190,6 +190,8 @@
var/ui_y = 600
/// ref to screen object that displays in the middle of the UI
var/atom/movable/screen/mech_view/ui_view
+ ///Current owning faction
+ var/faction
/obj/item/radio/mech //this has to go somewhere
subspace_transmission = TRUE
@@ -266,7 +268,16 @@
mech_status_hud.remove_from_hud(src)
return ..()
-/obj/vehicle/sealed/mecha/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/vehicle/sealed/mecha/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
+ if(istype(blame_mob) && blame_mob.ckey)
+ var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[blame_mob.ckey]
+ if(faction == blame_mob.faction)
+ personal_statistics.mechs_destroyed -- //bruh
+ personal_statistics.mission_mechs_destroyed --
+ else
+ personal_statistics.mechs_destroyed ++
+ personal_statistics.mission_mechs_destroyed ++
+
spark_system?.start()
var/mob/living/silicon/ai/unlucky_ais
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index 7e9f9a41c528e..510adee62cbe4 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -151,13 +151,10 @@
holding = grey.limbs[MECH_GREY_L_ARM]
projectile_to_fire.scatter = max(variance + holding?.scatter_mod, 0)
projectile_to_fire.projectile_speed = projectile_to_fire.ammo.shell_speed
- if(projectile_to_fire.ammo.flags_ammo_behavior & AMMO_IFF)
- var/iff_signal
- if(ishuman(firer))
- var/mob/living/carbon/human/human_firer = firer
- var/obj/item/card/id/id = human_firer.get_idcard()
- iff_signal = id?.iff_signal
- projectile_to_fire.iff_signal = iff_signal
+ if((projectile_to_fire.ammo.flags_ammo_behavior & AMMO_IFF) && ishuman(firer))
+ var/mob/living/carbon/human/human_firer = firer
+ var/obj/item/card/id/id = human_firer.get_idcard()
+ projectile_to_fire.iff_signal = id?.iff_signal
///actually executes firing when autofire asks for it, returns TRUE to keep firing FALSE to stop
/obj/item/mecha_parts/mecha_equipment/weapon/proc/fire()
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 7ebc599478f13..3755c6394a05a 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -36,7 +36,7 @@
to_chat(occupants, "[icon2html(src, occupants)][span_danger("[gear] is critically damaged!")]")
playsound(src, gear.destroy_sound, 50)
-/obj/vehicle/sealed/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = TRUE, attack_dir, armour_penetration)
+/obj/vehicle/sealed/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = TRUE, attack_dir, armour_penetration, mob/living/blame_mob)
var/damage_taken = ..()
if(damage_taken <= 0 || obj_integrity < 0)
return damage_taken
@@ -222,7 +222,7 @@
if(!attacking_item.force)
return
- var/damage_taken = take_damage(attacking_item.force, attacking_item.damtype, MELEE, 1)
+ var/damage_taken = take_damage(attacking_item.force, attacking_item.damtype, MELEE, blame_mob = user)
try_damage_component(damage_taken, user.zone_selected)
var/hit_verb = length(attacking_item.attack_verb) ? "[pick(attacking_item.attack_verb)]" : "hit"
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index 513217edafad3..1daff10bd295b 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -56,6 +56,7 @@
hud_type.add_to_hud(src)
else
hud_type.remove_from_hud(src)
+ faction = newoccupant.faction //we do not unset when exiting, last occupant is the owner
if(!internal_damage)
SEND_SOUND(newoccupant, sound('sound/mecha/nominal.ogg',volume=50))
diff --git a/code/modules/vehicles/mecha/mecha_movement.dm b/code/modules/vehicles/mecha/mecha_movement.dm
index d2f2e03730cd4..928323d6ac0e6 100644
--- a/code/modules/vehicles/mecha/mecha_movement.dm
+++ b/code/modules/vehicles/mecha/mecha_movement.dm
@@ -22,12 +22,12 @@
. = TRUE
if(!canmove || !(user in return_drivers()))
return
- vehicle_move(direction)
+ vehicle_move(user, direction)
-/obj/vehicle/sealed/mecha/vehicle_move(direction, forcerotate = FALSE)
- if(!COOLDOWN_CHECK(src, cooldown_vehicle_move))
- return FALSE
- COOLDOWN_START(src, cooldown_vehicle_move, move_delay)
+/obj/vehicle/sealed/mecha/vehicle_move(mob/living/user, direction, forcerotate = FALSE)
+ . = ..()
+ if(!.)
+ return
if(completely_disabled)
return FALSE
if(!direction)
diff --git a/code/modules/vehicles/motorbike.dm b/code/modules/vehicles/motorbike.dm
index e95fbd25887a5..f321c48d221e0 100644
--- a/code/modules/vehicles/motorbike.dm
+++ b/code/modules/vehicles/motorbike.dm
@@ -176,7 +176,7 @@
smoke.set_up(0, src)
smoke.start()
-/obj/vehicle/ridden/motorbike/obj_destruction()
+/obj/vehicle/ridden/motorbike/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
explosion(src, light_impact_range = 2, flash_range = 0)
return ..()
@@ -197,9 +197,6 @@
if(user.lying_angle || user.incapacitated()) //Can't use your inventory when lying
return FALSE
- if(istype(user.loc, /obj/vehicle/multitile/root/cm_armored)) //Stops inventory actions in a mech/tank
- return FALSE
-
if(over_object == user && Adjacent(user)) //This must come before the screen objects only block
open(user)
return FALSE
diff --git a/code/modules/vehicles/multitile/cm_armored.dm b/code/modules/vehicles/multitile/cm_armored.dm
deleted file mode 100644
index bea65fa019307..0000000000000
--- a/code/modules/vehicles/multitile/cm_armored.dm
+++ /dev/null
@@ -1,810 +0,0 @@
-
-//NOT bitflags, just global constant values
-#define HDPT_PRIMARY "primary"
-#define HDPT_SECDGUN "secondary"
-#define HDPT_SUPPORT "support"
-#define HDPT_ARMOR "armor"
-#define HDPT_TREADS "treads"
-
-//Percentages of what hardpoints take what damage, e.g. armor takes 37.5% of the damage
-GLOBAL_LIST_INIT(armorvic_dmg_distributions, list(
- HDPT_PRIMARY = 0.15,
- HDPT_SECDGUN = 0.125,
- HDPT_SUPPORT = 0.075,
- HDPT_ARMOR = 0.5,
- HDPT_TREADS = 0.15))
-
-//The main object, should be an abstract class // todo delete me
-/obj/vehicle/multitile/root/cm_armored
- name = "Armored Vehicle"
- desc = "Get inside to operate the vehicle."
- hitbox_type = /obj/vehicle/multitile/hitbox/cm_armored //Used for emergencies and respawning hitboxes
-
- //What slots the vehicle can have
- var/list/hardpoints = list(HDPT_ARMOR, HDPT_TREADS, HDPT_SECDGUN, HDPT_SUPPORT, HDPT_PRIMARY)
-
- //The next world.time when the tank can move
- var/next_move = 0
-
- //Below are vars that can be affected by hardpoints, generally used as ratios or decisecond timers
-
- move_delay = 30 //default 3 seconds per tile
-
- var/active_hp
-
- var/list/dmg_distribs = list()
-
- //Changes cooldowns and accuracies
- var/list/misc_ratios = list(
- "move" = 1.0,
- "prim_acc" = 1.0,
- "secd_acc" = 1.0,
- "supp_acc" = 1.0,
- "prim_cool" = 1.0,
- "secd_cool" = 1.0,
- "supp_cool" = 1.0)
-
- //Changes how much damage the tank takes
- var/list/dmg_multipliers = list(
- "all" = 1.0, //for when you want to make it invincible
- "acid" = 1.0,
- "slash" = 1.0,
- "bullet" = 1.0,
- "explosive" = 1.0,
- "blunt" = 1.0,
- "abstract" = 1.0) //abstract for when you just want to hurt it
-
- //Decisecond cooldowns for the slots
- var/list/internal_cooldowns = list(
- "primary" = 300,
- "secondary" = 200,
- "support" = 150)
-
- //Percentage accuracies for slot
- var/list/accuracies = list(
- "primary" = 0.97,
- "secondary" = 0.67,
- "support" = 0.5)
-
- //Placeholders
- icon = 'icons/obj/vehicles.dmi'
- icon_state = "cargo_engine"
-
-
-/obj/vehicle/multitile/root/cm_armored/Initialize(mapload)
- . = ..()
- GLOB.tank_list += src
- set_light(0.01)
-
-
-/obj/vehicle/multitile/root/cm_armored/Destroy()
- for(var/i in linked_objs)
- var/obj/O = linked_objs[i]
- if(O == src)
- continue
- qdel(O, TRUE) //Delete all of the hitboxes etc
- GLOB.tank_list -= src
- return ..()
-
-//What to do if all ofthe installed modules have been broken
-/obj/vehicle/multitile/root/cm_armored/proc/handle_all_modules_broken()
- return
-
-/obj/vehicle/multitile/root/cm_armored/proc/deactivate_all_hardpoints()
- var/list/slots = get_activatable_hardpoints()
- for(var/slot in slots)
- var/obj/item/hardpoint/HP = hardpoints[slot]
- HP?.deactivate()
-
-/obj/vehicle/multitile/root/cm_armored/proc/remove_all_players()
- return
-
-//The basic vehicle code that moves the tank, with movement delay implemented
-/obj/vehicle/multitile/root/cm_armored/relaymove(mob/user, direction)
- if(world.time < next_move)
- return
- next_move = world.time + move_delay * misc_ratios["move"]
-
- return ..()
-
-//Same thing but for rotations
-/obj/vehicle/multitile/root/cm_armored/try_rotate(deg, mob/user, force = FALSE)
- if(world.time < next_move && !force)
- return
- next_move = world.time + move_delay * misc_ratios["move"] * (force ? 2 : 3) //3 for a 3 point turn, idk
- return ..()
-
-/obj/vehicle/multitile/root/cm_armored/proc/can_use_hp(mob/M)
- return TRUE
-
-//Used by the gunner to swap which module they are using
-//e.g. from the minigun to the smoke launcher
-//Only the active hardpoint module can be used
-/obj/vehicle/multitile/root/cm_armored/verb/switch_active_hp()
- set name = "Change Active Weapon"
- set category = "Vehicle"
- set src in view(0)
-
- if(!can_use_hp(usr))
- return
-
- var/list/slots = get_activatable_hardpoints()
-
- if(!length(slots))
- to_chat(usr, span_warning("All of the modules can't be activated or are broken."))
- return
-
- var/slot = tgui_input_list(usr, "Select a slot.", null, slots)
-
- var/obj/item/hardpoint/HP = hardpoints[slot]
- if(!(HP?.obj_integrity))
- to_chat(usr, span_warning("That module is either missing or broken."))
- return
-
- active_hp = slot
- to_chat(usr, span_notice("You select the [slot] slot."))
- if(isliving(usr))
- var/mob/living/M = usr
- M.set_interaction(src)
-
-/obj/vehicle/multitile/root/cm_armored/verb/reload_hp()
- set name = "Reload Active Weapon"
- set category = "Vehicle"
- set src in view(0)
-
- if(!can_use_hp(usr))
- return
-
- //TODO: make this a proc so I don't keep repeating this code
- var/list/slots = get_activatable_hardpoints()
-
- if(!length(slots))
- to_chat(usr, span_warning("All of the modules can't be reloaded or are broken."))
- return
-
- var/slot = tgui_input_list(usr, "Select a slot.", null, slots)
-
- var/obj/item/hardpoint/HP = hardpoints[slot]
- if(!length(HP?.backup_clips))
- to_chat(usr, span_warning("That module is either missing or has no remaining backup clips."))
- return
-
- var/obj/item/ammo_magazine/A = HP.backup_clips[1] //LISTS START AT 1 REEEEEEEEEEEE
- if(!A)
- to_chat(usr, span_danger("Something went wrong! PM a staff member! Code: T_RHPN"))
- return
-
- to_chat(usr, span_notice("You begin reloading the [slot] module."))
-
- addtimer(CALLBACK(src, PROC_REF(finish_reloading_hp), usr, HP, A, slot), 2 SECONDS)
-
-/obj/vehicle/multitile/root/cm_armored/proc/finish_reloading_hp(mob/living/user, obj/item/hardpoint/HP, obj/item/ammo_magazine/A, slot)
- if(!can_use_hp(usr))
- return
-
- HP.ammo.forceMove(get_turf(entrance))
- HP.ammo.update_icon()
- HP.ammo = A
- HP.backup_clips.Remove(A)
-
- to_chat(usr, span_notice("You reload the [slot] module."))
-
-
-/obj/vehicle/multitile/root/cm_armored/proc/get_activatable_hardpoints()
- var/list/slots = list()
- for(var/slot in hardpoints)
- var/obj/item/hardpoint/HP = hardpoints[slot]
- if(!(HP?.obj_integrity))
- continue
- if(!HP.is_activatable)
- continue
- slots += slot
-
- return slots
-
-
-
-//Special armored vic healthcheck that mainly updates the hardpoint states
-/obj/vehicle/multitile/root/cm_armored/proc/healthcheck()
- repair_damage(max_integrity) //The tank itself doesn't take damage
- var/i
- var/remove_person = TRUE //Whether or not to call handle_all_modules_broken()
- for(i in hardpoints)
- var/obj/item/hardpoint/H = hardpoints[i]
- if(!H)
- continue
- if(!H.obj_integrity)
- H.remove_buff()
- else
- remove_person = FALSE //if something exists but isnt broken
-
- if(remove_person)
- handle_all_modules_broken()
-
- update_icon()
-
-//Since the vics are 3x4 we need to swap between the two files with different dimensions
-//Also need to offset to center the tank about the root object
-/obj/vehicle/multitile/root/cm_armored/update_icon_state()
- . = ..()
- //Assuming 3x3 with half block overlaps in the tank's direction
- if(dir in list(NORTH, SOUTH))
- pixel_x = -32
- pixel_y = -48
- icon = 'icons/obj/vehicles/tank_NS.dmi'
-
- else if(dir in list(EAST, WEST))
- pixel_x = -48
- pixel_y = -32
- icon = 'icons/obj/vehicles/tank_EW.dmi'
-
-/obj/vehicle/multitile/root/cm_armored/update_overlays()
- . = ..()
-
- //Basic iteration that snags the overlay from the hardpoint module object
- for(var/i in hardpoints)
- var/obj/item/hardpoint/H = hardpoints[i]
-
- if((i == HDPT_TREADS && !H) || (H && !H.obj_integrity)) //Treads not installed or broken
- var/image/I = image(icon, icon_state = "damaged_hardpt_[i]")
- . += I
-
- if(H)
- var/image/I = H.get_icon_image(0, 0, dir)
- . += I
-
-//Hitboxes but with new names
-/obj/vehicle/multitile/hitbox/cm_armored
- name = "Armored Vehicle"
- desc = "Get inside to operate the vehicle."
- allow_pass_flags = PASSABLE
- var/lastsound = 0
-
-//If something want to delete this, it's probably either an admin or the shuttle
-//If it's an admin, they want to disable this
-//If it's the shuttle, it should do damage
-//If fully repaired and moves at least once, the broken hitboxes will respawn according to multitile.dm
-/obj/vehicle/multitile/hitbox/cm_armored/Destroy()
- var/obj/vehicle/multitile/root/cm_armored/C = root
- C?.take_damage_type(1000000, "abstract")
- return ..()
-
-//Tramplin' time, but other than that identical
-/obj/vehicle/multitile/hitbox/cm_armored/Bump(atom/A)
- . = ..()
- var/facing = get_dir(src, A)
- var/turf/temp = loc
- var/turf/T = loc
- A.tank_collision(src, facing, T, temp)
- if(isliving(A))
- log_attack("[get_driver()] drove over [A] with [root]")
-
-
-/obj/vehicle/multitile/hitbox/cm_armored/proc/get_driver()
- return "Someone"
-
-/atom/proc/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- return
-
-/mob/living/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- if(stat == DEAD) //We don't care about the dead
- return
- if(loc == C.loc) // treaded over.
- ParalyzeNoChain(2 SECONDS)
- var/target_dir = REVERSE_DIR(C.dir)
- temp = get_step(C.loc, target_dir)
- T = temp
- target_dir = REVERSE_DIR(C.dir)
- T = get_step(T, target_dir)
- face_atom(T)
- throw_at(T, 3, 2, C, 1)
- apply_damage(randfloat(5, 7.5), BRUTE, blocked = MELEE)
- return
- if(!lying_angle)
- temp = get_step(T, facing)
- T = temp
- T = get_step(T, pick(GLOB.cardinals))
- if(mob_size == MOB_SIZE_BIG)
- throw_at(T, 3, 2, C, 0)
- else
- throw_at(T, 3, 2, C, 1)
- ParalyzeNoChain(2 SECONDS)
- apply_damage(rand(10, 15), BRUTE, blocked = MELEE)
- visible_message(span_danger("[C] bumps into [src], throwing [p_them()] away!"), span_danger("[C] violently bumps into you!"))
- var/obj/vehicle/multitile/root/cm_armored/CA = C.root
- var/list/slots = CA.get_activatable_hardpoints()
- for(var/slot in slots)
- var/obj/item/hardpoint/H = CA.hardpoints[slot]
- H?.livingmob_interact(src)
-
-/mob/living/carbon/xenomorph/queen/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- if(lying_angle || loc == C.loc)
- return ..()
- temp = get_step(T, facing)
- T = temp
- T = get_step(T, pick(GLOB.cardinals))
- throw_at(T, 2, 2, C, 0)
- visible_message(span_danger("[C] bumps into [src], pushing [p_them()] away!"), span_danger("[C] bumps into you!"))
-
-/mob/living/carbon/xenomorph/crusher/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- if(lying_angle || loc == C.loc)
- return ..()
- temp = get_step(T, facing)
- T = temp
- T = get_step(T, pick(GLOB.cardinals))
- throw_at(T, 2, 2, C, 0)
- visible_message(span_danger("[C] bumps into [src], pushing [p_them()] away!"), span_danger("[C] bumps into you!"))
-
-/mob/living/carbon/xenomorph/larva/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- if(loc == C.loc) // treaded over.
- ParalyzeNoChain(2 SECONDS)
- apply_damage(randfloat(5, 7.5), BRUTE, blocked = MELEE)
- return
- var/obj/vehicle/multitile/root/cm_armored/CA = C.root
- var/list/slots = CA.get_activatable_hardpoints()
- for(var/slot in slots)
- var/obj/item/hardpoint/H = CA.hardpoints[slot]
- H?.livingmob_interact(src)
-
-/turf/closed/wall/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- var/obj/vehicle/multitile/root/cm_armored/tank/CA = C.root
- var/damage = 30
- var/tank_damage = 2
-
- if(facing == CA.old_dir && istype(CA.hardpoints[HDPT_ARMOR], /obj/item/hardpoint/armor/snowplow) ) //Snowplow eliminates collision damage, and doubles damage dealt if we're facing the thing we're crushing
- var/obj/item/hardpoint/armor/snowplow/SP = CA.hardpoints[HDPT_ARMOR]
- if(SP.obj_integrity)
- damage = 45
- tank_damage = 1
-
- take_damage(damage)
- CA.take_damage_type(tank_damage, "blunt", src)
- if(world.time > C.lastsound + 1 SECONDS)
- playsound(src, 'sound/effects/metal_crash.ogg', 35)
- C.lastsound = world.time
-
-/obj/machinery/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- var/obj/vehicle/multitile/root/cm_armored/tank/CA = C.root
- var/damage = 30
- var/tank_damage = 2
-
- if(facing == CA.old_dir && istype(CA.hardpoints[HDPT_ARMOR], /obj/item/hardpoint/armor/snowplow) ) //Snowplow eliminates collision damage, and doubles damage dealt if we're facing the thing we're crushing
- var/obj/item/hardpoint/armor/snowplow/SP = CA.hardpoints[HDPT_ARMOR]
- if(SP.obj_integrity)
- damage = 60
- tank_damage = 0
-
- take_damage(damage)
- CA.take_damage_type(tank_damage, "blunt", src)
- if(world.time > C.lastsound + 1 SECONDS)
- visible_message(span_danger("[CA] rams into \the [src]!"))
- playsound(src, 'sound/effects/metal_crash.ogg', 35)
- C.lastsound = world.time
-
-/obj/structure/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- var/obj/vehicle/multitile/root/cm_armored/tank/CA = C.root
- var/damage = 30
- var/tank_damage = 2
-
- if(facing == CA.old_dir && istype(CA.hardpoints[HDPT_ARMOR], /obj/item/hardpoint/armor/snowplow) ) //Snowplow eliminates collision damage, and doubles damage dealt if we're facing the thing we're crushing
- var/obj/item/hardpoint/armor/snowplow/SP = CA.hardpoints[HDPT_ARMOR]
- if(SP.obj_integrity)
- damage = 60
- tank_damage = 0
-
- take_damage(damage)
- CA.take_damage_type(tank_damage, "blunt", src)
- if(world.time > C.lastsound + 1 SECONDS)
- visible_message(span_danger("[CA] crushes \the [src]!"))
- playsound(src, 'sound/effects/metal_crash.ogg', 35)
- C.lastsound = world.time
-
-/obj/alien/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- take_damage(40)
-
-/obj/alien/weeds/tank_collision(obj/vehicle/multitile/hitbox/cm_armored/C, facing, turf/T, turf/temp)
- return
-
-/obj/vehicle/multitile/hitbox/cm_armored/Move(atom/A, direction)
-
- for(var/mob/living/M in get_turf(src))
- M.tank_collision(src)
-
- . = ..()
-
- if(.)
- for(var/mob/living/M in get_turf(A))
- M.tank_collision(src)
-
-//Can't hit yourself with your own bullet
-/obj/vehicle/multitile/hitbox/cm_armored/projectile_hit(obj/projectile/proj)
- if(proj.firer == root) //Don't hit our own hitboxes
- return FALSE
-
- return ..()
-
-/obj/vehicle/multitile/hitbox/cm_armored/ex_act(severity)
- return root.ex_act(severity)
-
-/obj/vehicle/multitile/hitbox/cm_armored/attackby(obj/item/I, mob/user, params)
- return root.attackby(I, user, params)
-
-/obj/vehicle/multitile/hitbox/cm_armored/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = X.xeno_caste.melee_ap, isrightclick = FALSE)
- return root.attack_alien(X, damage_amount)
-
-/obj/vehicle/multitile/hitbox/cm_armored/effect_smoke(obj/effect/particle_effect/smoke/S)
- . = ..()
- if(!.)
- return
- if(CHECK_BITFIELD(S.smoke_traits, SMOKE_XENO_ACID))
- var/obj/vehicle/multitile/root/cm_armored/T = root
- T.take_damage_type(30, "acid")
-
-//A bit icky, but basically if you're adjacent to the tank hitbox, you are then adjacent to the root object
-/obj/vehicle/multitile/root/cm_armored/Adjacent(atom/A)
- for(var/i in linked_objs)
- var/obj/vehicle/multitile/hitbox/cm_armored/H = linked_objs[i]
- if(!H)
- continue
- if(get_dist(H, A) <= 1)
- return TRUE //Using get_dist() to avoid hidden code that recurs infinitely here
- return ..()
-
-//Returns the ratio of damage to take, just a housekeeping thing
-/obj/vehicle/multitile/root/cm_armored/proc/get_dmg_multi(type)
- if(!dmg_multipliers.Find(type))
- return 0
- return dmg_multipliers[type] * dmg_multipliers["all"]
-
-//Generic proc for taking damage
-//ALWAYS USE THIS WHEN INFLICTING DAMAGE TO THE VEHICLES
-/obj/vehicle/multitile/root/cm_armored/proc/take_damage_type(damage, type, atom/attacker)
- for(var/i in hardpoints)
- var/obj/item/hardpoint/HP = hardpoints[i]
- if(HP)
- HP.take_damage(HP.obj_integrity - damage * dmg_distribs[i] * get_dmg_multi(type))
-
- healthcheck()
-
- if(istype(attacker, /mob))
- var/mob/M = attacker
- log_attack("[src] took [damage] [type] damage from [M] ([M.client ? M.client.ckey : "disconnected"]).")
- else
- log_attack("[src] took [damage] [type] damage from [attacker].")
-
-/obj/vehicle/multitile/root/cm_armored/projectile_hit(obj/projectile/proj)
- if(proj.firer == src) //Don't hit ourself.
- return FALSE
-
- return ..()
-
-
-//severity 1.0 explosions never really happen so we're gonna follow everyone else's example
-/obj/vehicle/multitile/root/cm_armored/ex_act(severity)
-
- switch(severity)
- if(EXPLODE_DEVASTATE)
- take_damage(rand(250, 350)) //Devastation level explosives are anti-tank and do real damage.
-
- if(EXPLODE_HEAVY)
- take_damage(rand(30, 40)) //Heavy explosions do some damage, but are largely deferred by the armour/bulk.
-
-//Honestly copies some code from the Xeno files, just handling some special cases
-/obj/vehicle/multitile/root/cm_armored/attack_alien(mob/living/carbon/xenomorph/M, damage_amount = M.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
-
- if(M.loc == entrance.loc && M.a_intent == INTENT_HELP)
- handle_player_entrance(M) //will call the get out of tank proc on its own
- return
-
- var/damage = damage_amount
-
- //Somehow we will deal no damage on this attack
- if(!damage)
- playsound(M.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1)
- M.do_attack_animation(src)
- M.visible_message(span_danger("\The [M] lunges at [src]!"), \
- span_danger("We lunge at [src]!"))
- return FALSE
-
- M.do_attack_animation(src, ATTACK_EFFECT_CLAW)
- playsound(loc, "alien_claw_metal", 25, 1)
-
- M.visible_message(span_danger("\The [M] slashes [src]!"), \
- span_danger("We slash [src]!"))
-
- take_damage_type(damage * ( (isxenoravager(M)) ? 2 : 1 ), "slash", M) //Ravs do a bitchin double damage
- return ..()
-
-//Special case for entering the vehicle without using the verb
-/obj/vehicle/multitile/root/cm_armored/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(user.loc == entrance.loc)
- handle_player_entrance(user)
- return
-
-
-/obj/vehicle/multitile/root/cm_armored/Entered(atom/movable/A)
- if(istype(A, /obj) && !istype(A, /obj/item/ammo_magazine/tank) && !istype(A, /obj/item/hardpoint))
- A.forceMove(loc)
- return
-
- return ..()
-
-
-//Redistributes damage ratios based off of what things are attached (no armor means the armor doesn't mitigate any damage)
-/obj/vehicle/multitile/root/cm_armored/proc/update_damage_distribs()
- dmg_distribs = GLOB.armorvic_dmg_distributions.Copy() //Assume full installs
- for(var/slot in hardpoints)
- var/obj/item/hardpoint/HP = hardpoints[slot]
- if(!HP)
- dmg_distribs[slot] = 0.0 //Remove empty slots' damage mitigation
- var/acc = 0
- for(var/slot in dmg_distribs)
- var/ratio = dmg_distribs[slot]
- acc += ratio //Get total current ratio applications
- if(acc == 0)
- return
- for(var/slot in dmg_distribs)
- var/ratio = dmg_distribs[slot]
- dmg_distribs[slot] = ratio/acc //Redistribute according to previous ratios for full damage taking, but ignoring empty slots
-
-//Special cases abound, handled below or in subclasses
-/obj/vehicle/multitile/root/cm_armored/attackby(obj/item/O, mob/user)
-
- if(istype(O, /obj/item/hardpoint)) //Are we trying to install stuff?
- var/obj/item/hardpoint/HP = O
- install_hardpoint(HP, user)
-
- else if(istype(O, /obj/item/ammo_magazine)) //Are we trying to reload?
- var/obj/item/ammo_magazine/AM = O
- handle_ammomag_attackby(AM, user)
-
- else if(iswelder(O) || iswrench(O)) //Are we trying to repair stuff?
- handle_hardpoint_repair(O, user)
- update_damage_distribs()
-
- else if(iscrowbar(O)) //Are we trying to remove stuff?
- uninstall_hardpoint(O, user)
-
- else
- . = ..()
- if(!(O.flags_item & NOBLUDGEON))
- take_damage_type(O.force * 0.05, "blunt", user) //Melee weapons from people do very little damage
-
-
-/obj/vehicle/multitile/root/cm_armored/proc/handle_hardpoint_repair(obj/item/O, mob/user)
-
- //Need to the what the hell you're doing
- if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER)
- user.visible_message(span_notice("[user] fumbles around figuring out what to do with [O] on the [src]."),
- span_notice("You fumble around figuring out what to do with [O] on the [src]."))
- var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER))
- if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED))
- return
-
- //Pick what to repair
- var/slot = tgui_input_list(user, "Select a slot to try and repair", null, hardpoints) //maybe tgui alert ?
- var/obj/item/I = user.get_active_held_item()
- if(!Adjacent(user) || (!iswelder(I) && !iswrench(I)))
- return
-
- var/obj/item/hardpoint/old = hardpoints[slot] //Is there something there already?
-
- if(!old)
- to_chat(user, span_warning("There is nothing installed on that slot."))
- return
-
- if(old.obj_integrity >= old.max_integrity)
- to_chat(user, span_notice("\the [old] is already in perfect conditions."))
- return
-
- //Determine how many 3 second intervals to wait and if you have the right tool
- var/num_delays = 6
- switch(slot)
- if(HDPT_PRIMARY)
- num_delays = 5
- if(!iswelder(I))
- to_chat(user, span_warning("That's the wrong tool. Use a welder."))
- return
- var/obj/item/tool/weldingtool/WT = I
- if(!WT.isOn())
- to_chat(user, span_warning("You need to light your [WT] first."))
- return
-
- if(HDPT_SECDGUN)
- num_delays = 3
- if(!iswrench(I))
- to_chat(user, span_warning("That's the wrong tool. Use a wrench."))
- return
-
- if(HDPT_SUPPORT)
- num_delays = 2
- if(!iswrench(I))
- to_chat(user, span_warning("That's the wrong tool. Use a wrench."))
- return
-
- if(HDPT_ARMOR)
- num_delays = 10
- if(!iswelder(I))
- to_chat(user, span_warning("That's the wrong tool. Use a welder."))
- return
- var/obj/item/tool/weldingtool/WT = I
- if(!WT.isOn())
- to_chat(user, span_warning("You need to light your [WT] first."))
- return
-
- if(HDPT_TREADS)
- if(!iswelder(I))
- to_chat(user, span_warning("That's the wrong tool. Use a welder."))
- return
- var/obj/item/tool/weldingtool/WT = I
- if(!WT.isOn())
- to_chat(user, span_warning("You need to light your [WT] first."))
- return
- WT.remove_fuel(num_delays, user)
-
- user.visible_message(span_notice("[user] starts repairing the [slot] slot on [src]."),
- span_notice("You start repairing the [slot] slot on the [src]."))
-
- if(!do_after(user, 30 * num_delays, NONE, src, BUSY_ICON_BUILD, extra_checks = iswelder(O) ? CALLBACK(O, TYPE_PROC_REF(/obj/item/tool/weldingtool, isOn)) : null))
- user.visible_message(span_notice("[user] stops repairing the [slot] slot on [src]."),
- span_notice("You stop repairing the [slot] slot on the [src]."))
- return
-
- if(iswelder(O))
- var/obj/item/tool/weldingtool/WT = O
- WT.remove_fuel(num_delays, user)
-
- user.visible_message(span_notice("[user] repairs the [slot] slot on the [src]."),
- span_notice("You repair the [slot] slot on [src]."))
-
- old.repair_damage(old.max_integrity) //We repaired it, good job
- old.apply_buff()
-
- update_icon()
-
-//Relaoding stuff, pretty bare-bones and basic
-/obj/vehicle/multitile/root/cm_armored/proc/handle_ammomag_attackby(obj/item/ammo_magazine/AM, mob/user)
-
- //No skill checks for reloading
- //Maybe I should delineate levels of skill for reloading, installation, and repairs?
- //That would make it easier to differentiate between the two for skills
- //Instead of using MT skills for these procs and TC skills for operation
- //Oh but wait then the MTs would be able to drive fuck that
- var/slot = tgui_input_list(user, "Select a slot to try and refill", null, hardpoints)
- if(!Adjacent(user) || user.get_active_held_item() != AM)
- return
- var/obj/item/hardpoint/HP = hardpoints[slot]
-
- if(!HP)
- to_chat(user, span_warning("There is nothing installed on that slot."))
- return
-
- HP.try_add_clip(AM, user)
-
-//Putting on hardpoints
-//Similar to repairing stuff, down to the time delay
-/obj/vehicle/multitile/root/cm_armored/proc/install_hardpoint(obj/item/hardpoint/HP, mob/user)
-
- if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER)
- user.visible_message(span_notice("[user] fumbles around figuring out what to do with [HP] on the [src]."),
- span_notice("You fumble around figuring out what to do with [HP] on the [src]."))
- var/fumbling_time = 5 SECONDS * ( SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER) )
- if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED))
- return
-
- var/obj/item/hardpoint/occupied = hardpoints[HP.slot]
-
- if(occupied)
- to_chat(user, span_warning("Remove the previous hardpoint module first."))
- return
-
- user.visible_message(span_notice("[user] begins installing [HP] on the [HP.slot] hardpoint slot on the [src]."),
- span_notice("You begin installing [HP] on the [HP.slot] hardpoint slot on the [src]."))
-
- var/num_delays = 1
-
- switch(HP.slot)
- if(HDPT_PRIMARY)
- num_delays = 5
- if(HDPT_SECDGUN)
- num_delays = 3
- if(HDPT_SUPPORT)
- num_delays = 2
- if(HDPT_ARMOR)
- num_delays = 10
- if(HDPT_TREADS)
- num_delays = 7
-
- if(!do_after(user, 30 * num_delays, NONE, src, BUSY_ICON_BUILD))
- user.visible_message(span_warning("[user] stops installing \the [HP] on [src]."), span_warning("You stop installing \the [HP] on [src]."))
- return
-
- if(occupied)
- return
-
- user.visible_message(span_notice("[user] installs \the [HP] on [src]."), span_notice("You install \the [HP] on [src]."))
-
- user.temporarilyRemoveItemFromInventory(HP, 0)
-
- add_hardpoint(HP, user)
-
-//User-orientated proc for taking of hardpoints
-//Again, similar to the above ones
-/obj/vehicle/multitile/root/cm_armored/proc/uninstall_hardpoint(obj/item/O, mob/user)
-
- if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER)
- user.visible_message(span_notice("[user] fumbles around figuring out what to do with [O] on the [src]."),
- span_notice("You fumble around figuring out what to do with [O] on the [src]."))
- var/fumbling_time = 5 SECONDS * ( SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER) )
- if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED))
- return
-
- var/slot = tgui_input_list(user, "Select a slot to try and remove", null, hardpoints)
- if(!Adjacent(user) || !iscrowbar(user.get_active_held_item()))
- return
-
- var/obj/item/hardpoint/old = hardpoints[slot]
-
- if(!old)
- to_chat(user, span_warning("There is nothing installed there."))
- return
-
- user.visible_message(span_notice("[user] begins removing [old] on the [old.slot] hardpoint slot on [src]."),
- span_notice("You begin removing [old] on the [old.slot] hardpoint slot on [src]."))
-
- var/num_delays = 1
-
- switch(old.slot)
- if(HDPT_PRIMARY)
- num_delays = 5
- if(HDPT_SECDGUN)
- num_delays = 3
- if(HDPT_SUPPORT)
- num_delays = 2
- if(HDPT_ARMOR)
- num_delays = 10
- if(HDPT_TREADS)
- num_delays = 7
-
- if(!do_after(user, 30 * num_delays, NONE, src, BUSY_ICON_BUILD))
- user.visible_message(span_warning("[user] stops removing \the [old] on [src]."), span_warning("You stop removing \the [old] on [src]."))
- return
- if(QDELETED(old) || old != hardpoints[slot])
- return
-
- user.visible_message(span_notice("[user] removes \the [old] on [src]."), span_notice("You remove \the [old] on [src]."))
-
- remove_hardpoint(old, user)
-
-//General proc for putting on hardpoints
-//ALWAYS CALL THIS WHEN ATTACHING HARDPOINTS
-/obj/vehicle/multitile/root/cm_armored/proc/add_hardpoint(obj/item/hardpoint/HP, mob/user)
- if(!istype(HP))
- return
- HP.owner = src
- if(HP.obj_integrity)
- HP.apply_buff()
- HP.forceMove(src)
-
- hardpoints[HP.slot] = HP
- update_damage_distribs()
- update_icon()
-
-//General proc for taking off hardpoints
-//ALWAYS CALL THIS WHEN REMOVING HARDPOINTS
-/obj/vehicle/multitile/root/cm_armored/proc/remove_hardpoint(obj/item/hardpoint/old, mob/user)
- old.forceMove(user ? user.loc : entrance.loc)
- old.remove_buff()
- old.owner = null
-
- hardpoints[old.slot] = null
- update_damage_distribs()
- update_icon()
-
-
-
-/obj/vehicle/multitile/root/cm_armored/contents_explosion(severity)
- return
diff --git a/code/modules/vehicles/multitile/hardpoints.dm b/code/modules/vehicles/multitile/hardpoints.dm
deleted file mode 100644
index 82df22284f39c..0000000000000
--- a/code/modules/vehicles/multitile/hardpoints.dm
+++ /dev/null
@@ -1,999 +0,0 @@
-/*
-All of the hardpoints, for the tank or other
-Currently only has the tank hardpoints
-*/
-
-/obj/item/hardpoint
-
- var/slot //What slot do we attach to?
- var/obj/vehicle/multitile/root/cm_armored/owner //Who do we work for?
-
- icon = 'icons/obj/vehicles/hardpoint_modules.dmi'
- icon_state = "tires" //Placeholder
-
- max_integrity = 100
- w_class = WEIGHT_CLASS_GIGANTIC
-
- var/obj/item/ammo_magazine/tank/ammo
- //If we use ammo, put it here
- var/obj/item/ammo_magazine/tank/starter_ammo
-
- //Strings, used to get the overlay for the armored vic
- var/disp_icon //This also differentiates tank vs apc vs other
- var/disp_icon_state
-
- var/next_use = 0
- var/is_activatable = FALSE
- var/max_angle = 180
- var/point_cost = 0
-
- var/list/backup_clips = list()
- var/max_clips = 1 //1 so they can reload their backups and actually reload once
- var/buyable = TRUE
-
-/obj/item/hardpoint/Initialize(mapload)
- . = ..()
- if(starter_ammo)
- ammo = new starter_ammo
-
-/obj/item/hardpoint/examine(mob/user)
- . = ..()
- var/status = obj_integrity <= 0.1 ? "broken" : "functional"
- var/span_class = obj_integrity <= 0.1 ? "
" : ""
- if((user.skills.getRating(SKILL_ENGINEER) >= SKILL_ENGINEER_METAL) || isobserver(user))
- switch(PERCENT(obj_integrity / max_integrity))
- if(0.1 to 33)
- status = "heavily damaged"
- span_class = ""
- if(33.1 to 66)
- status = "damaged"
- span_class = ""
- if(66.1 to 90)
- status = "slighty damaged"
- if(90.1 to 100)
- status = "intact"
- to_chat(user, "[span_class]It's [status].")
-
-/obj/item/hardpoint/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/ammo_magazine/tank))
- try_add_clip(W, user)
- return
- if(!iswelder(W) && !iswrench(W))
- return ..()
- if(obj_integrity >= max_integrity)
- to_chat(user, span_notice("[src] is already in perfect conditions."))
- return
- var/repair_delays = 6
- var/obj/item/tool/repair_tool = /obj/item/tool/weldingtool
- switch(slot)
- if(HDPT_PRIMARY)
- repair_delays = 5
- if(HDPT_SECDGUN)
- repair_tool = /obj/item/tool/wrench
- repair_delays = 3
- if(HDPT_SUPPORT)
- repair_tool = /obj/item/tool/wrench
- repair_delays = 2
- if(HDPT_ARMOR)
- repair_delays = 10
- var/obj/item/tool/weldingtool/WT = iswelder(W) ? W : null
- if(!istype(W, repair_tool))
- to_chat(user, span_warning("That's the wrong tool. Use a [WT ? "wrench" : "welder"]."))
- return
- if(WT && !WT.isOn())
- to_chat(user, span_warning("You need to light your [WT] first."))
- return
- user.visible_message(span_notice("[user] starts repairing [src]."),
- span_notice("You start repairing [src]."))
- if(!do_after(user, 3 SECONDS * repair_delays, NONE, src, BUSY_ICON_BUILD))
- user.visible_message(span_notice("[user] stops repairing [src]."),
- span_notice("You stop repairing [src]."))
- return
- if(WT)
- if(!WT.isOn())
- return
- WT.remove_fuel(repair_delays, user)
- user.visible_message(span_notice("[user] finishes repairing [src]."),
- span_notice("You finish repairing [src]."))
- repair_damage(max_integrity)
-
-//Called on attaching, for weapons sets the actual cooldowns
-/obj/item/hardpoint/proc/apply_buff()
- return
-
-//Called when removing, resets cooldown lengths, move delay, etc
-/obj/item/hardpoint/proc/remove_buff()
- return
-
-//Called when you want to activate the hardpoint, such as a gun
-//This can also be used for some type of temporary buff, up to you
-/obj/item/hardpoint/proc/active_effect(atom/A)
- return
-
-/obj/item/hardpoint/proc/deactivate()
- return
-
-/obj/item/hardpoint/proc/livingmob_interact(mob/living/M)
- return
-
-//If our cooldown has elapsed
-/obj/item/hardpoint/proc/is_ready()
- if(world.time < next_use)
- to_chat(usr, span_warning("This module is not ready to be used yet."))
- return FALSE
- if(!obj_integrity)
- to_chat(usr, span_warning("This module is too broken to be used."))
- return FALSE
- return TRUE
-
-/obj/item/hardpoint/proc/try_add_clip(obj/item/ammo_magazine/tank/A, mob/user)
-
- if(!max_clips)
- to_chat(user, span_warning("This module does not have room for additional ammo."))
- return FALSE
- else if(length(backup_clips) >= max_clips)
- to_chat(user, span_warning("The reloader is full."))
- return FALSE
- else if(!istype(A, starter_ammo))
- to_chat(user, span_warning("That is the wrong ammo type."))
- return FALSE
-
- to_chat(user, span_notice("You start loading [A] in [src]."))
-
- var/atom/target = owner ? owner : src
-
- if(!do_after(user, 10, NONE, target) || QDELETED(src))
- to_chat(user, span_warning("Something interrupted you while loading [src]."))
- return FALSE
-
- user.temporarilyRemoveItemFromInventory(A, FALSE)
- user.visible_message(span_notice("[user] loads [A] in [src]"),
- span_notice("You finish loading [A] in \the [src]."), null, 3)
- backup_clips += A
- playsound(user.loc, 'sound/weapons/guns/interact/minigun_cocked.ogg', 25)
- return TRUE
-
-//Returns the image object to overlay onto the root object
-/obj/item/hardpoint/proc/get_icon_image(x_offset, y_offset, new_dir)
-
- var/icon_suffix = "NS"
- var/icon_state_suffix = "0"
-
- if(new_dir in list(NORTH, SOUTH))
- icon_suffix = "NS"
- else if(new_dir in list(EAST, WEST))
- icon_suffix = "EW"
-
- if(!obj_integrity)
- icon_state_suffix = "1"
-
- return image(icon = "[disp_icon]_[icon_suffix]", icon_state = "[disp_icon_state]_[icon_state_suffix]", pixel_x = x_offset, pixel_y = y_offset)
-
-/obj/item/hardpoint/proc/firing_arc(atom/A)
- var/turf/T = get_turf(A)
- if(!T || !owner)
- return FALSE
- var/dx = T.x - owner.x
- var/dy = T.y - owner.y
- var/deg = 0
- switch(owner.dir)
- if(EAST) deg = 0
- if(NORTH) deg = -90
- if(WEST) deg = -180
- if(SOUTH) deg = -270
-
- var/nx = dx * cos(deg) - dy * sin(deg)
- var/ny = dx * sin(deg) + dy * cos(deg)
- if(nx == 0)
- return max_angle >= 90
- var/angle = arctan(ny/nx)
- if(nx < 0)
- angle += 180
- return abs(angle) <= max_angle
-
-//Delineating between slots
-/obj/item/hardpoint/primary
- slot = HDPT_PRIMARY
- is_activatable = TRUE
-
-/obj/item/hardpoint/secondary
- slot = HDPT_SECDGUN
- is_activatable = TRUE
-
-/obj/item/hardpoint/support
- slot = HDPT_SUPPORT
-
-/obj/item/hardpoint/armor
- slot = HDPT_ARMOR
- max_clips = 0
-
-/obj/item/hardpoint/treads
- slot = HDPT_TREADS
- max_clips = 0
- gender = PLURAL
-
-////////////////////
-// PRIMARY SLOTS // START
-////////////////////
-
-/obj/item/hardpoint/primary/cannon
- name = "LTB Cannon"
- desc = "A primary cannon for tanks that shoots explosive rounds"
-
- max_integrity = 500
- point_cost = 100
-
- icon_state = "ltb_cannon"
-
- disp_icon = "tank"
- disp_icon_state = "ltb_cannon"
-
- starter_ammo = /obj/item/ammo_magazine/tank/ltb_cannon
- max_clips = 3
- max_angle = 45
-
-/obj/item/hardpoint/primary/cannon/broken
- obj_integrity = 0
- buyable = FALSE
-
-/obj/item/hardpoint/primary/cannon/apply_buff()
- owner.internal_cooldowns["primary"] = 200
- owner.accuracies["primary"] = 0.97
-
-/obj/item/hardpoint/primary/cannon/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- next_use = world.time + owner.internal_cooldowns["primary"] * owner.misc_ratios["prim_cool"]
- var/obj/item/hardpoint/secondary/towlauncher/HP = owner.hardpoints[HDPT_SECDGUN]
- if(istype(HP))
- HP.next_use = world.time + owner.internal_cooldowns["secondary"] * owner.misc_ratios["secd_cool"]
-
- var/delay = 5
- var/turf/T = get_turf(A)
- if(!T)
- return
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- var/obj/effect/overlay/temp/tank_laser/TL
- if(C.is_zoomed)
- delay = 20
- TL = new /obj/effect/overlay/temp/tank_laser (T)
-
- to_chat(usr, span_warning("Preparing to fire... keep the tank still for [delay * 0.1] seconds."))
-
- if(!do_after(usr, delay, IGNORE_HELD_ITEM, src) || QDELETED(owner))
- to_chat(usr, span_warning("The [name]'s firing was interrupted."))
- qdel(TL)
-
- return
-
- qdel(TL)
-
- if(!prob(owner.accuracies["primary"] * 100 * owner.misc_ratios["prim_acc"]))
- T = get_step(T, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- log_bomber(usr, "fired", src)
- P.fire_at(T, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- playsound(get_turf(src), pick('sound/weapons/guns/fire/tank_cannon1.ogg', 'sound/weapons/guns/fire/tank_cannon2.ogg'), 60, 1)
- ammo.current_rounds--
-
-/obj/item/hardpoint/primary/minigun
- name = "LTAA-AP Minigun"
- desc = "A primary weapon for tanks that spews bullets"
-
- max_integrity = 350
- point_cost = 100
-
- icon_state = "ltaaap_minigun"
-
- disp_icon = "tank"
- disp_icon_state = "ltaaap_minigun"
-
- starter_ammo = /obj/item/ammo_magazine/tank/ltaaap_minigun
- max_angle = 45
-
- //Miniguns don't use a conventional cooldown
- //If you fire quickly enough, the cooldown decreases according to chain_delays
- //If you fire too slowly, you slowly slow back down
- //Also, different sounds play and it sounds sick, thanks Rahlzel
- var/chained = 0 //how many quick succession shots we've fired
- var/list/chain_delays = list(4, 4, 3, 3, 2, 2, 2, 1, 1) //the different cooldowns in deciseconds, sequentially
-
- //MAIN PROBLEM WITH THIS IMPLEMENTATION OF DELAYS:
- //If you spin all the way up and then stop firing, your chained shots will only decrease by 1
- //TODO: Implement a rolling average for seconds per shot that determines chain length without being slow or buggy
- //You'd probably have to normalize it between the length of the list and the actual ROF
- //But you don't want to map it below a certain point probably since seconds per shot would go to infinity
-
- //So, I came back to this and changed it by adding a fixed reset at 1.5 seconds or later, which seems reasonable
- //Now the cutoff is a little abrupt, but at least it exists. --MadSnailDisease
-
-/obj/item/hardpoint/primary/minigun/apply_buff()
- owner.internal_cooldowns["primary"] = 2 //will be overridden, please ignore
- owner.accuracies["primary"] = 0.33
-
-/obj/item/hardpoint/primary/minigun/active_effect(atom/A)
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
- var/S = 'sound/weapons/guns/fire/tank_minigun_start.ogg'
- if(world.time - next_use <= 5)
- chained++ //minigun spins up, minigun spins down
- S = 'sound/weapons/guns/fire/tank_minigun_loop.ogg'
- else if(world.time - next_use >= 15) //Too long of a delay, they restart the chain
- chained = 1
- else //In between 5 and 15 it slows down but doesn't stop
- chained--
- S = 'sound/weapons/guns/fire/tank_minigun_stop.ogg'
- if(chained <= 0)
- chained = 1
-
- next_use = world.time + (chained > length(chain_delays) ? 0.5 : chain_delays[chained]) * owner.misc_ratios["prim_cool"]
- if(!prob(owner.accuracies["primary"] * 100 * owner.misc_ratios["prim_acc"]))
- A = get_step(A, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- P.fire_at(A, owner, src, P.ammo.max_range, P.ammo.shell_speed)
-
- playsound(get_turf(src), S, 60)
- ammo.current_rounds--
-
-////////////////////
-// PRIMARY SLOTS // END
-////////////////////
-
-/////////////////////
-// SECONDARY SLOTS // START
-/////////////////////
-
-/obj/item/hardpoint/secondary/flamer
- name = "Secondary Flamer Unit"
- desc = "A secondary weapon for tanks that shoots flames"
-
- max_integrity = 300
- point_cost = 100
-
- icon_state = "flamer"
-
- disp_icon = "tank"
- disp_icon_state = "flamer"
-
- starter_ammo = /obj/item/ammo_magazine/tank/flamer
- max_angle = 90
-
-/obj/item/hardpoint/secondary/flamer/apply_buff()
- owner.internal_cooldowns["secondary"] = 20
- owner.accuracies["secondary"] = 0.5
-
-/obj/item/hardpoint/secondary/flamer/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- next_use = world.time + owner.internal_cooldowns["secondary"] * owner.misc_ratios["secd_cool"]
- if(!prob(owner.accuracies["secondary"] * 100 * owner.misc_ratios["secd_acc"]))
- A = get_step(A, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- P.fire_at(A, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- playsound(get_turf(src), 'sound/weapons/guns/fire/tank_flamethrower.ogg', 60, 1)
- ammo.current_rounds--
-
-/obj/item/hardpoint/secondary/towlauncher
- name = "TOW Launcher"
- desc = "A secondary weapon for tanks that shoots rockets"
-
- max_integrity = 500
- point_cost = 100
-
- icon_state = "tow_launcher"
-
- disp_icon = "tank"
- disp_icon_state = "towlauncher"
-
- starter_ammo = /obj/item/ammo_magazine/tank/towlauncher
- max_clips = 1
- max_angle = 90
-
-/obj/item/hardpoint/secondary/towlauncher/apply_buff()
- owner.internal_cooldowns["secondary"] = 150
- owner.accuracies["secondary"] = 0.8
-
-/obj/item/hardpoint/secondary/towlauncher/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- var/delay = 3
- var/turf/T = get_turf(A)
- if(!T)
- return
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- var/obj/effect/overlay/temp/tank_laser/TL
- if(C.is_zoomed)
- delay = 15
- TL = new /obj/effect/overlay/temp/tank_laser (T)
-
- to_chat(usr, span_warning("Preparing to fire... keep the tank still for [delay * 0.1] seconds."))
-
- if(!do_after(usr, delay, IGNORE_HELD_ITEM, src) || QDELETED(owner))
- to_chat(usr, span_warning("The [name]'s firing was interrupted."))
- qdel(TL)
- return
-
- qdel(TL)
-
- next_use = world.time + owner.internal_cooldowns["secondary"] * owner.misc_ratios["secd_cool"]
- var/obj/item/hardpoint/primary/cannon/HP = owner.hardpoints[HDPT_PRIMARY]
- if(istype(HP))
- HP.next_use = world.time + owner.internal_cooldowns["primary"] * owner.misc_ratios["prim_cool"]
-
- if(!prob(owner.accuracies["secondary"] * 100 * owner.misc_ratios["secd_acc"]))
- T = get_step(T, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- log_bomber(usr, "fired", src)
- P.fire_at(T, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- ammo.current_rounds--
-
-/obj/item/hardpoint/secondary/m56cupola/broken
- obj_integrity = 0
- buyable = FALSE
-
-/obj/item/hardpoint/secondary/m56cupola/apply_buff()
- owner.internal_cooldowns["secondary"] = 3
- owner.accuracies["secondary"] = 0.7
-
-/obj/item/hardpoint/secondary/m56cupola/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- next_use = world.time + owner.internal_cooldowns["secondary"] * owner.misc_ratios["secd_cool"]
- if(!prob(owner.accuracies["secondary"] * 100 * owner.misc_ratios["secd_acc"]))
- A = get_step(A, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- P.fire_at(A, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- playsound(get_turf(src), pick(list('sound/weapons/guns/fire/smartgun1.ogg', 'sound/weapons/guns/fire/smartgun2.ogg', 'sound/weapons/guns/fire/smartgun3.ogg')), 60, 1)
- ammo.current_rounds--
-
-/obj/item/hardpoint/secondary/grenade_launcher
- name = "Grenade Launcher"
- desc = "A secondary weapon for tanks that shoots grenades"
-
- max_integrity = 500
- point_cost = 25
-
- icon_state = "glauncher"
-
- disp_icon = "tank"
- disp_icon_state = "glauncher"
-
- starter_ammo = /obj/item/ammo_magazine/tank/tank_glauncher
- max_clips = 3
- max_angle = 90
-
-/obj/item/hardpoint/secondary/grenade_launcher/apply_buff()
- owner.internal_cooldowns["secondary"] = 30
- owner.accuracies["secondary"] = 0.4
-
-/obj/item/hardpoint/secondary/grenade_launcher/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- next_use = world.time + owner.internal_cooldowns["secondary"] * owner.misc_ratios["secd_cool"]
- if(!prob(owner.accuracies["secondary"] * 100 * owner.misc_ratios["secd_acc"]))
- A = get_step(A, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- log_bomber(usr, "fired", src)
- P.fire_at(A, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- playsound(get_turf(src), 'sound/weapons/guns/fire/grenadelauncher.ogg', 60, 1)
- ammo.current_rounds--
-/////////////////////
-// SECONDARY SLOTS // END
-/////////////////////
-
-///////////////////
-// SUPPORT SLOTS // START
-///////////////////
-
-/obj/item/hardpoint/support/smoke_launcher
- name = "Smoke Launcher"
- desc = "Launches smoke forward to obscure vision"
-
- max_integrity = 300
- point_cost = 10
-
- icon_state = "slauncher_0"
-
- disp_icon = "tank"
- disp_icon_state = "slauncher"
-
- starter_ammo = /obj/item/ammo_magazine/tank/tank_slauncher
- max_clips = 4
- is_activatable = TRUE
-
-/obj/item/hardpoint/support/smoke_launcher/broken
- obj_integrity = 0
- buyable = FALSE
-
-/obj/item/hardpoint/support/smoke_launcher/apply_buff()
- owner.internal_cooldowns["support"] = 30
- owner.accuracies["support"] = 0.8
-
-/obj/item/hardpoint/support/smoke_launcher/active_effect(atom/A)
-
- if(!(ammo?.current_rounds > 0))
- to_chat(usr, span_warning("This module does not have any ammo."))
- return
-
- next_use = world.time + owner.internal_cooldowns["support"] * owner.misc_ratios["supp_cool"]
- if(!prob(owner.accuracies["support"] * 100 * owner.misc_ratios["supp_acc"]))
- A = get_step(A, pick(GLOB.cardinals))
- var/obj/projectile/P = new
- P.generate_bullet(new ammo.default_ammo)
- P.fire_at(A, owner, src, P.ammo.max_range, P.ammo.shell_speed)
- playsound(get_turf(src), 'sound/weapons/guns/fire/tank_smokelauncher.ogg', 60, 1)
- ammo.current_rounds--
-
-/obj/item/hardpoint/support/smoke_launcher/get_icon_image(x_offset, y_offset, new_dir)
-
- var/icon_suffix = "NS"
- var/icon_state_suffix = "0"
-
- if(new_dir in list(NORTH, SOUTH))
- icon_suffix = "NS"
- else if(new_dir in list(EAST, WEST))
- icon_suffix = "EW"
-
- if(!obj_integrity)
- icon_state_suffix = "1"
- else if(!(ammo?.current_rounds > 0))
- icon_state_suffix = "2"
-
- return image(icon = "[disp_icon]_[icon_suffix]", icon_state = "[disp_icon_state]_[icon_state_suffix]", pixel_x = x_offset, pixel_y = y_offset)
-
-/obj/item/hardpoint/support/weapons_sensor
- name = "Integrated Weapons Sensor Array"
- desc = "Improves the accuracy and fire rate of all onboard weapons"
-
- max_integrity = 250
- point_cost = 100
- max_clips = 0
-
- icon_state = "warray"
-
- disp_icon = "tank"
- disp_icon_state = "warray"
-
-/obj/item/hardpoint/support/weapons_sensor/apply_buff()
- owner.misc_ratios["prim_cool"] = 0.67
- owner.misc_ratios["secd_cool"] = 0.67
- owner.misc_ratios["supp_cool"] = 0.67
-
- owner.misc_ratios["prim_acc"] = 1.67
- owner.misc_ratios["secd_acc"] = 1.67
- owner.misc_ratios["supp_acc"] = 1.67
-
-/obj/item/hardpoint/support/weapons_sensor/remove_buff()
- owner.misc_ratios["prim_cool"] = 1
- owner.misc_ratios["secd_cool"] = 1
- owner.misc_ratios["supp_cool"] = 1
-
- owner.misc_ratios["prim_acc"] = 1
- owner.misc_ratios["secd_acc"] = 1
- owner.misc_ratios["supp_acc"] = 1
-
-/obj/item/hardpoint/support/overdrive_enhancer
- name = "Overdrive Enhancer"
- desc = "Increases the movement speed of the vehicle it's atached to"
-
- max_integrity = 250
- point_cost = 100
- max_clips = 0
-
- icon_state = "odrive_enhancer"
- is_activatable = TRUE
-
- disp_icon = "tank"
- disp_icon_state = "odrive_enhancer"
-
- var/last_boost
-
-/obj/item/hardpoint/support/overdrive_enhancer/proc/nitros_on(mob/M)
- owner.misc_ratios["move"] = 0.2
- if(M)
- to_chat(M, span_danger("You hit the nitros! RRRRRRRMMMM!!"))
- playsound(M, 'sound/mecha/hydraulic.ogg', 60, 1, vary = 0)
- addtimer(CALLBACK(src, PROC_REF(boost_off)), TANK_OVERDRIVE_BOOST_DURATION)
- addtimer(CALLBACK(src, PROC_REF(boost_ready_notice)), TANK_OVERDRIVE_BOOST_COOLDOWN)
-
-/obj/item/hardpoint/support/overdrive_enhancer/remove_buff()
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- C.verbs -= /obj/vehicle/multitile/root/cm_armored/tank/verb/overdrive_multitile
- boost_off()
-
-/obj/item/hardpoint/support/overdrive_enhancer/apply_buff()
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- C.verbs += /obj/vehicle/multitile/root/cm_armored/tank/verb/overdrive_multitile
-
-/obj/item/hardpoint/support/overdrive_enhancer/proc/boost_off()
- owner.misc_ratios["move"] = 1
-
-/obj/item/hardpoint/support/overdrive_enhancer/proc/boost_ready_notice()
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- if(C.driver)
- to_chat(C.driver, span_danger("The overdrive nitros are ready for use."))
-
-/obj/item/hardpoint/support/overdrive_enhancer/proc/activate_overdrive()
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- if(!C.driver)
- return
- if(world.time < last_boost + TANK_OVERDRIVE_BOOST_COOLDOWN)
- to_chat(C.driver, span_warning("Your nitro overdrive isn't yet ready. It will be available again in [(last_boost + TANK_OVERDRIVE_BOOST_COOLDOWN - world.time) * 0.1] seconds."))
- return
- last_boost = world.time
- nitros_on(C.driver)
-
-//How to get out, via verb
-/obj/vehicle/multitile/root/cm_armored/tank/verb/overdrive_multitile()
- set category = "Vehicle"
- set name = "Activate Overdrive"
- set src in view(0)
-
- if(usr.incapacitated(TRUE))
- return
-
- if(usr != driver)
- to_chat(usr, span_warning("You need to be in the driver seat to use this!"))
- return
-
- var/obj/item/hardpoint/support/overdrive_enhancer/OE = hardpoints[HDPT_SUPPORT]
- if(!istype(OE, /obj/item/hardpoint/support/overdrive_enhancer) || OE.obj_integrity <= 0)
- to_chat(usr, span_warning("The overdrive engine is missing or too badly damaged!"))
- return
- OE.activate_overdrive(usr)
-
-/obj/item/hardpoint/support/artillery_module
- name = "Artillery Module"
- desc = "Allows the gunner to look far into the distance."
-
- max_integrity = 250
- point_cost = 100
- max_clips = 0
-
- is_activatable = TRUE
- var/is_active = FALSE
-
- var/view_buff = "25x25" //This way you can VV for more or less fun
- var/view_tile_offset = 5
-
- icon_state = "artillery"
-
- disp_icon = "tank"
- disp_icon_state = "artillerymod"
-
-/obj/item/hardpoint/support/artillery_module/active_effect(atom/A)
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- if(!C.gunner)
- return
- var/mob/M = C.gunner
- if(!M.client)
- return
- if(is_active)
- M.client.view_size.reset_to_default()
- M.client.pixel_x = 0
- M.client.pixel_y = 0
- is_active = FALSE
- C.is_zoomed = FALSE
- return
- M.client.view_size.reset_to_default()
- is_active = TRUE
- C.is_zoomed = TRUE
- switch(C.dir)
- if(NORTH)
- M.client.pixel_x = 0
- M.client.pixel_y = view_tile_offset * 32
- if(SOUTH)
- M.client.pixel_x = 0
- M.client.pixel_y = -1 * view_tile_offset * 32
- if(EAST)
- M.client.pixel_x = view_tile_offset * 32
- M.client.pixel_y = 0
- if(WEST)
- M.client.pixel_x = -1 * view_tile_offset * 32
- M.client.pixel_y = 0
-
-/obj/item/hardpoint/support/artillery_module/deactivate()
- var/obj/vehicle/multitile/root/cm_armored/tank/C = owner
- if(!ismob(C.gunner))
- return
- var/mob/M = C.gunner
- if(!M.client)
- return
- is_active = FALSE
- M.client.view_size.reset_to_default()
- M.client.pixel_x = 0
- M.client.pixel_y = 0
-
-/obj/item/hardpoint/support/artillery_module/remove_buff()
- deactivate()
-
-/obj/item/hardpoint/support/artillery_module/is_ready()
- if(!obj_integrity)
- to_chat(usr, span_warning("This module is too broken to be used."))
- return FALSE
- return TRUE
-
-///////////////////
-// SUPPORT SLOTS // END
-///////////////////
-
-/////////////////
-// ARMOR SLOTS // START
-/////////////////
-
-/obj/item/hardpoint/armor/ballistic
- name = "Ballistic Armor"
- desc = "Protects the vehicle from high-penetration weapons. Provides some protection against slashing and high impact attacks."
-
- max_integrity = 1000
- point_cost = 100
-
- icon_state = "ballistic_armor"
-
- disp_icon = "tank"
- disp_icon_state = "ballistic_armor"
-
-/obj/item/hardpoint/armor/ballistic/broken
- obj_integrity = 0
- buyable = FALSE
-
-/obj/item/hardpoint/armor/ballistic/apply_buff()
- owner.dmg_multipliers["bullet"] = 0.5
- owner.dmg_multipliers["slash"] = 0.75
- owner.dmg_multipliers["blunt"] = 0.75
- owner.dmg_multipliers["all"] = 0.9
-
-/obj/item/hardpoint/armor/ballistic/remove_buff()
- owner.dmg_multipliers["bullet"] = 1
- owner.dmg_multipliers["slash"] = 1
- owner.dmg_multipliers["blunt"] = 1
- owner.dmg_multipliers["all"] = 1
-
-/obj/item/hardpoint/armor/caustic
- name = "Caustic Armor"
- desc = "Protects vehicles from most types of acid. Provides some protection against slashing and high impact attacks."
-
- max_integrity = 1000
- point_cost = 100
-
- icon_state = "caustic_armor"
-
- disp_icon = "tank"
- disp_icon_state = "caustic_armor"
-
-/obj/item/hardpoint/armor/caustic/apply_buff()
- owner.dmg_multipliers["acid"] = 0.5
- owner.dmg_multipliers["slash"] = 0.75
- owner.dmg_multipliers["blunt"] = 0.75
- owner.dmg_multipliers["all"] = 0.9
-
-/obj/item/hardpoint/armor/caustic/remove_buff()
- owner.dmg_multipliers["acid"] = 1
- owner.dmg_multipliers["slash"] = 1
- owner.dmg_multipliers["blunt"] = 1
- owner.dmg_multipliers["all"] = 1
-
-/obj/item/hardpoint/armor/concussive
- name = "Concussive Armor"
- desc = "Protects the vehicle from high-impact weapons. Provides some protection against ballistic and explosive attacks."
-
- max_integrity = 1000
- point_cost = 100
-
- icon_state = "concussive_armor"
-
- disp_icon = "tank"
- disp_icon_state = "concussive_armor"
-
-/obj/item/hardpoint/armor/concussive/apply_buff()
- owner.dmg_multipliers["blunt"] = 0.5
- owner.dmg_multipliers["explosive"] = 0.75
- owner.dmg_multipliers["ballistic"] = 0.75
- owner.dmg_multipliers["all"] = 0.9
-
-/obj/item/hardpoint/armor/concussive/remove_buff()
- owner.dmg_multipliers["blunt"] = 1
- owner.dmg_multipliers["explosive"] = 1
- owner.dmg_multipliers["ballistic"] = 1
- owner.dmg_multipliers["all"] = 1
-
-/obj/item/hardpoint/armor/paladin
- name = "Paladin Armor"
- desc = "Protects the vehicle from large incoming explosive projectiles. Provides some protection against slashing and high impact attacks."
-
- max_integrity = 1000
- point_cost = 100
-
- icon_state = "paladin_armor"
-
- disp_icon = "tank"
- disp_icon_state = "paladin_armor"
-
-/obj/item/hardpoint/armor/paladin/apply_buff()
- owner.dmg_multipliers["explosive"] = 0.5
- owner.dmg_multipliers["blunt"] = 0.75
- owner.dmg_multipliers["slash"] = 0.75
- owner.dmg_multipliers["all"] = 0.9
-
-/obj/item/hardpoint/armor/paladin/remove_buff()
- owner.dmg_multipliers["explosive"] = 1
- owner.dmg_multipliers["blunt"] = 1
- owner.dmg_multipliers["slash"] = 1
- owner.dmg_multipliers["all"] = 1
-
-/obj/item/hardpoint/armor/snowplow
- name = "Snowplow"
- desc = "Clears a path in the snow for friendlies"
-
- max_integrity = 700
- is_activatable = TRUE
- point_cost = 50
-
- icon_state = "snowplow"
-
- disp_icon = "tank"
- disp_icon_state = "snowplow"
-
-/obj/item/hardpoint/armor/snowplow/livingmob_interact(mob/living/M)
- var/turf/targ = get_step(M, owner.dir)
- targ = get_step(M, owner.dir)
- targ = get_step(M, owner.dir)
- M.throw_at(targ, 4, 2, src, 1)
- M.apply_damage(7 + rand(0, 3), BRUTE, blocked = MELEE)
-
-/////////////////
-// ARMOR SLOTS // END
-/////////////////
-
-/////////////////
-// TREAD SLOTS // START
-/////////////////
-
-/obj/item/hardpoint/treads/standard
- name = "Treads"
- desc = "Integral to the movement of the vehicle"
-
- max_integrity = 500
- point_cost = 25
-
- icon_state = "treads"
-
- disp_icon = "tank"
- disp_icon_state = "treads"
-
-/obj/item/hardpoint/treads/standard/broken
- obj_integrity = 0
- buyable = FALSE
-
-/obj/item/hardpoint/treads/standard/get_icon_image(x_offset, y_offset, new_dir)
- return null //Handled in update_icon()
-
-/obj/item/hardpoint/treads/standard/apply_buff()
- owner.move_delay = 7
-
-/obj/item/hardpoint/treads/standard/remove_buff()
- owner.move_delay = 30
-
-/////////////////
-// TREAD SLOTS // END
-/////////////////
-
-
-///////////////
-// AMMO MAGS // START
-///////////////
-
-//Special ammo magazines for hardpoint modules. Some aren't here since you can use normal magazines on them
-/obj/item/ammo_magazine/tank
- flags_magazine = NONE //No refilling
- var/point_cost = 0
-
-/obj/item/ammo_magazine/tank/ltb_cannon
- name = "LTB Cannon Magazine"
- desc = "A primary armament cannon magazine"
- caliber = CALIBER_86 //Making this unique on purpose
- icon_state = "ltbcannon_4"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/rocket/ltb
- max_rounds = 4
- point_cost = 50
-
-/obj/item/ammo_magazine/tank/ltb_cannon/update_icon_state()
- . = ..()
- icon_state = "ltbcannon_[current_rounds]"
-
-
-/obj/item/ammo_magazine/tank/ltaaap_minigun
- name = "LTAA-AP Minigun Magazine"
- desc = "A primary armament minigun magazine"
- caliber = CALIBER_762X51 //Correlates to miniguns
- icon_state = "painless"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/bullet/minigun
- max_rounds = 500
- point_cost = 25
-
-
-
-/obj/item/ammo_magazine/tank/flamer
- name = "Flamer Magazine"
- desc = "A secondary armament flamethrower magazine"
- caliber = CALIBER_FUEL_THICK //correlates to flamer mags
- icon_state = "flametank_large"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/flamethrower/tank_flamer
- max_rounds = 120
- point_cost = 50
-
-
-
-/obj/item/ammo_magazine/tank/towlauncher
- name = "TOW Launcher Magazine"
- desc = "A secondary armament rocket magazine"
- caliber = CALIBER_84MM //correlates to any rocket mags
- icon_state = "quad_rocket"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/rocket/ap //Fun fact, AP rockets seem to be a straight downgrade from normal rockets. Maybe I'm missing something...
- max_rounds = 5
- point_cost = 100
-
-/obj/item/ammo_magazine/tank/tank_glauncher
- name = "Grenade Launcher Magazine"
- desc = "A secondary armament grenade magazine"
- caliber = CALIBER_40MM
- icon_state = "glauncher_2"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/grenade_container
- max_rounds = 10
- point_cost = 25
-
-
-/obj/item/ammo_magazine/tank/tank_glauncher/update_icon_state()
- . = ..()
- if(current_rounds >= max_rounds)
- icon_state = "glauncher_2"
- else if(current_rounds <= 0)
- icon_state = "glauncher_0"
- else
- icon_state = "glauncher_1"
-
-
-/obj/item/ammo_magazine/tank/tank_slauncher
- name = "Smoke Launcher Magazine"
- desc = "A support armament grenade magazine"
- caliber = CALIBER_40MM
- icon_state = "slauncher_1"
- w_class = WEIGHT_CLASS_GIGANTIC
- default_ammo = /datum/ammo/grenade_container/smoke
- max_rounds = 6
- point_cost = 5
-
-/obj/item/ammo_magazine/tank/tank_slauncher/update_icon_state()
- . = ..()
- icon_state = "slauncher_[current_rounds <= 0 ? "0" : "1"]"
-
-///////////////
-// AMMO MAGS // END
-///////////////
diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm
deleted file mode 100644
index 784a98157affb..0000000000000
--- a/code/modules/vehicles/multitile/multitile.dm
+++ /dev/null
@@ -1,246 +0,0 @@
-
-/*
-A multitile vehicle is made up of 2 types of objects, root and hitbox
-relaymove() only does something for root
-You can inherit and do special stuff for either, but only one will let you move
-Rotations treat root as x = 0, y = 0
-All of the backend for movement will be under root
-
-Vehicles are placed on the map by a spawner or admin verb
-*/
-
-//This was part of an old plan to have a dynamic number of vehicle interiors
-//Turns out that's incredibly fucking dificult, so a fixed number is gonna be the ideal choice
-/*
-/obj/effect/landmark/multitile_starter
- name = "Landmark"
- desc = "Where the interiors for multitiles start spawning"
-*/
-
-/obj/effect/multitile_spawner
-
- var/width = 2
- var/height = 3
- var/spawn_dir = SOUTH
-
-//A hidden marker for where you mount and dismount the vehicle
-//You could have multiple if you wanted
-/obj/effect/multitile_entrance
- name = "Entrance marker"
- desc = "Marker for the entrance of a multitile vehicle."
-
- var/obj/vehicle/multitile/root/master
- invisibility = INVISIBILITY_MAXIMUM
-
-/obj/effect/multitile_entrance/Destroy(force = FALSE)
- if(!force)
- return QDEL_HINT_LETMELIVE
- return ..()
-
-//Always moves where you want it to, no matter what
-/obj/effect/multitile_entrance/Move(atom/A)
- loc = get_turf(A)
- return TRUE
-
-//A basic handoff to the root object to actually deal with attempted player entrance
-/obj/effect/multitile_entrance/verb/enter_multitile()
- set category = "Vehicle"
- set name = "Enter Vehicle"
- set src in view(0)
-
- master.handle_player_entrance(usr)
-
-//Remnant of vehicle interiors
-/*
-/obj/effect/landmark/multitile_exit
- name = "Landmark"
- desc = "Marker for the exit of the interior"
-
- invisibility = INVISIBILITY_MAXIMUM
-
- var/obj/vehicle/multitile/root/master
-*/
-
-/*
-/obj/effect/landmark/multitile_exit/verb/exit_multitile(mob/M)
- set category = "Vehicle"
- set name = "Exit Vehicle"
- set src in master
-
- master.handle_player_exit(M)
-*/
-
-//Super super generic, doesn't really need to exist
-/obj/vehicle/multitile
- name = "multitile vehicle"
- desc = "You shouldn't see this"
-
-/obj/vehicle/multitile/relaymove(mob/user, direction)
- return
-
-//Hitboxes, do notthing but move with the root object and take up space
-//All interactions like bullets or whatever should be passed up to the root object
-/obj/vehicle/multitile/hitbox
- name = "hitbox"
- desc = "Generic multitile vehicle hitbox"
-
- var/obj/vehicle/multitile/root/root
- invisibility = INVISIBILITY_MAXIMUM
-
-/obj/vehicle/multitile/root
- name = "root"
- desc = "Root tile for multitile vehicles"
-
- var/old_dir
-
- var/obj/effect/multitile_entrance/entrance
- //var/obj/effect/landmark/multitile_exit/exit
-
- //Objects that move in accordance with this one
- //Objects indexed by /datum/coords
- //Does not include the root obj
- var/list/linked_objs = list()
-
- //list of turfs that the vehicle was in before
- var/list/old_locs = list()
-
- //list of idle passengers in the vehicle
- //used for any type of APC
- var/list/idle_passengers = list()
- var/max_idle_passengers = 0
-
- //Another remnant of vehicle interiors
- //var/list/interior_data = list()
-
- var/base_icon_type = "" //e.g. "tank" or "apc", used to assign icons to the hitboxes
-
- var/hitbox_type = /obj/vehicle/multitile/hitbox
-
-//How to get out, via verb
-/obj/vehicle/multitile/root/verb/exit_multitile()
- set category = "Vehicle"
- set name = "Exit Vehicle"
- set src in view(0)
-
- if(!usr.incapacitated(TRUE))
- handle_player_exit(usr)
-
-/obj/vehicle/multitile/root/proc/handle_player_exit(mob/M)
- return
-
-/obj/vehicle/multitile/root/proc/handle_player_entrance(mob/living/M)
- if(M.resting || M.buckled || M.incapacitated())
- return FALSE
- return TRUE
-
-/obj/vehicle/multitile/root/proc/handle_harm_attack(mob/living/M)
- if(M.resting || M.buckled || M.incapacitated())
- return FALSE
- return TRUE
-
-//Vebrs for rotations, set up a macro and get turnin
-/obj/vehicle/multitile/root/verb/clockwise_rotate_multitile()
- set category = "Vehicle"
- set name = "Rotate Vehicle Clockwise"
- set src in view(0)
-
- var/mob/M = usr
- try_rotate(-90, M)
-
-/obj/vehicle/multitile/root/verb/counterclockwise_rotate_multitile()
- set category = "Vehicle"
- set name = "Rotate Vehicle Counterclockwise"
- set src in view(0)
-
- var/mob/M = usr
- try_rotate(90, M)
-
-//A wrapper for try_move() that rotates
-/obj/vehicle/multitile/root/proc/try_rotate(deg, mob/user, force = FALSE)
- save_locs()
- rotate_coords(deg)
- if(!try_move(linked_objs, null, TRUE))
- rotate_coords(-1*deg)
- revert_locs()
- return FALSE
-
- update_icon()
- return TRUE
-
-//Called when players try to move from inside the vehicle
-//Another wrapper for try_move()
-/obj/vehicle/multitile/root/relaymove(mob/user, direction)
- if(dir in list(EAST, WEST))
- if(direction == SOUTH)
- return try_rotate( (dir == WEST ? 90 : -90), user, 1)
- else if(direction == NORTH)
- return try_rotate( (dir == EAST ? 90 : -90), user, 1)
-
- else if(dir in list(SOUTH, NORTH))
- if(direction == EAST)
- return try_rotate( (dir == SOUTH ? 90 : -90), user, 1)
- else if(direction == WEST)
- return try_rotate( (dir == NORTH ? 90 : -90), user, 1)
-
- old_dir = dir
- save_locs()
- if(!try_move(linked_objs, direction))
- revert_locs()
- setDir(old_dir)
- return FALSE //Failed movement
-
- setDir(old_dir) //Preserve the direction you're facing when moving backwards
- return TRUE
-
-
-/obj/vehicle/multitile/root/proc/load_hitboxes()
- return
-
-/obj/vehicle/multitile/root/proc/load_entrance_marker()
- return
-
-//Saves where everything is so we can revert
-/obj/vehicle/multitile/root/proc/save_locs()
-
-
-
-//We were unable to move, so revert everything we may have done so far
-/obj/vehicle/multitile/root/proc/revert_locs()
-
-
-//Forces the root object to move so everything can update relative to it
-/obj/vehicle/multitile/root/proc/move_root(direction)
-
- var/turf/T = get_step(loc, direction)
- loc = T
-
-//The REAL guts of multitile movement
-//Here's how this shit works:
-
-//Step 1: Iterate over every associated object and move what can be moved in the right dir
-//Step 2: Save everything that couldn't move in a list
-//Step 3: Recursively try to move those after everything else that can move has done so
-// This is so if one hitbox is blocking another, eventually they will both move
-//Step 4: If on this level of recursion, we couldn't move any more things, we've failed
-//Step 5: Continue steps 1 through 4 until we fail or succeed
-/obj/vehicle/multitile/root/proc/try_move(list/objs, direction, is_rotation = FALSE)
-
- var/list/blocked = list() //What couldn't move this time
-
-
- if(length(blocked) == length(objs))
- return FALSE //No more things can move, return false
-
- else if(length(blocked))
- return try_move(blocked, direction, is_rotation) //Some things moved, retry the others
-
- else if(!length(blocked))
- return TRUE //Everything finished moving, return true
-
- else
- return FALSE //Shouldn't even be possible, so say we failed anyways
-
-//Applies the 2D transformation matrix to the saved coords
-/obj/vehicle/multitile/root/proc/rotate_coords(deg)
-
-
diff --git a/code/modules/vehicles/multitile/tank.dm b/code/modules/vehicles/multitile/tank.dm
deleted file mode 100644
index d7ca9e8d39af2..0000000000000
--- a/code/modules/vehicles/multitile/tank.dm
+++ /dev/null
@@ -1,308 +0,0 @@
-
-//TANKS, HURRAY
-//Read the documentation in cm_armored.dm and multitile.dm before trying to decipher this stuff
-
-
-/obj/vehicle/multitile/root/cm_armored/tank
- name = "\improper M34A2 Longstreet Light Tank"
- desc = "A giant piece of armor with a big gun, you know what to do. Entrance in the back."
-
- icon = 'icons/obj/vehicles/tank_NS.dmi'
- icon_state = "tank_base"
- pixel_x = -32
- pixel_y = -32
-
- var/mob/gunner
- var/mob/driver
-
- var/mob/occupant_exiting
- var/next_sound_play = 0
-
- var/is_zoomed = FALSE
-
- req_access = list()
-
-/obj/effect/multitile_spawner/cm_armored/tank
-
- width = 3
- height = 3
- spawn_dir = EAST
- var/list/spawn_hardpoints = list()
-
-/obj/effect/multitile_spawner/cm_armored/tank/Initialize(mapload)
- . = ..()
- return INITIALIZE_HINT_QDEL
-
-//Spawns a tank that has a bunch of broken hardpoints
-/obj/effect/multitile_spawner/cm_armored/tank/decrepit
- spawn_hardpoints = list(HDPT_PRIMARY = /obj/item/hardpoint/primary/cannon/broken,
- HDPT_SECDGUN = /obj/item/hardpoint/secondary/m56cupola/broken,
- HDPT_SUPPORT = /obj/item/hardpoint/support/smoke_launcher/broken,
- HDPT_ARMOR = /obj/item/hardpoint/armor/ballistic/broken,
- HDPT_TREADS = /obj/item/hardpoint/treads/standard/broken)
-
-/obj/effect/multitile_spawner/cm_armored/tank/fixed
- spawn_hardpoints = list(HDPT_PRIMARY = /obj/item/hardpoint/primary/cannon,
- HDPT_SECDGUN = /obj/item/hardpoint/secondary/m56cupola,
- HDPT_SUPPORT = /obj/item/hardpoint/support/smoke_launcher,
- HDPT_ARMOR = /obj/item/hardpoint/armor/ballistic,
- HDPT_TREADS = /obj/item/hardpoint/treads/standard)
-
-//For the tank, start forcing people out if everything is broken
-/obj/vehicle/multitile/root/cm_armored/tank/handle_all_modules_broken()
- deactivate_all_hardpoints()
-
- if(driver)
- to_chat(driver, span_danger("You dismount to as the smoke and flames start to choke you!"))
- driver.Move(entrance.loc)
- driver.unset_interaction()
- driver = null
- else if(gunner)
- to_chat(gunner, span_danger("You dismount to as the smoke and flames start to choke you!"))
- gunner.Move(entrance.loc)
- gunner.unset_interaction()
- gunner = null
-
-/obj/vehicle/multitile/root/cm_armored/tank/remove_all_players()
- deactivate_all_hardpoints()
- for(var/mob/living/L in (contents + loc.contents))
- if(!entrance) //Something broke, uh oh
- forceMove(get_turf(src))
- else
- forceMove(get_turf(entrance))
- gunner = null
- driver = null
-
-//Let's you switch into the other seat, doesn't work if it's occupied
-/obj/vehicle/multitile/root/cm_armored/tank/verb/switch_seats()
- set name = "Swap Seats"
- set category = "Vehicle"
- set src in view(0)
-
- if(usr.incapacitated())
- return
-
- var/wannabe_trucker = (usr == gunner) ? TRUE : FALSE
- var/neighbour = wannabe_trucker ? driver : gunner
- if(neighbour)
- to_chat(usr, span_notice("There's already someone in the other seat."))
- return
-
- to_chat(usr, span_notice("You start getting into the other seat."))
- addtimer(CALLBACK(src, PROC_REF(seat_switched), wannabe_trucker, usr), 3 SECONDS)
-
-/obj/vehicle/multitile/root/cm_armored/tank/proc/seat_switched(wannabe_trucker, mob/living/user)
-
- var/player = wannabe_trucker ? gunner : driver
- var/challenger = wannabe_trucker ? driver : gunner
- if(QDELETED(user) || user.incapacitated() || player != user)
- return
-
- if(challenger)
- to_chat(usr, span_notice("Someone beat you to the other seat!"))
- return
-
- to_chat(usr, span_notice("You man up the [wannabe_trucker ? "driver" : "gunner"]'s seat."))
-
- if(wannabe_trucker)
- deactivate_all_hardpoints()
- driver = wannabe_trucker ? user : null
- gunner = wannabe_trucker ? null : user
-
-/obj/vehicle/multitile/root/cm_armored/tank/can_use_hp(mob/M)
- if(!M || M != gunner)
- return FALSE
- if(!M.dextrous)
- to_chat(M, span_warning("You don't have the dexterity to do this!"))
- return FALSE
- return !M.incapacitated()
-
-/obj/vehicle/multitile/root/cm_armored/tank/handle_harm_attack(mob/M, mob/occupant)
- . = ..()
- if(!.)
- return
- if(!occupant)
- to_chat(M, span_warning("There is no one on that seat."))
- return
- M.visible_message(span_warning("[M] starts pulling [occupant] out of \the [src]."),
- span_warning("You start pulling [occupant] out of \the [src]. (this will take a while...)"), null, 6)
- var/fumbling_time = 20 SECONDS - 2 SECONDS * M.skills.getRating(SKILL_POLICE) - 2 SECONDS * M.skills.getRating(SKILL_LARGE_VEHICLE)
- if(!do_after(M, fumbling_time, NONE, src, BUSY_ICON_HOSTILE))
- return
- exit_tank(occupant, TRUE, TRUE)
- M.visible_message(span_warning("[M] forcibly pulls [occupant] out of [src]."),
- span_notice("you forcibly pull [occupant] out of [src]."), null, 6)
- if(!isliving(occupant))
- return
- var/mob/living/L = occupant
- L.Paralyze(8 SECONDS)
-
-//Two seats, gunner and driver
-//Must have the skills to do so
-/obj/vehicle/multitile/root/cm_armored/tank/handle_player_entrance(mob/living/carbon/M)
- . = ..()
- if(!. || !istype(M) || M.do_actions)
- return
-
- var/slot = tgui_alert(M, "Select a seat", null, list("Driver", "Gunner"))
- if(!Adjacent(M))
- return
-
- var/occupant = (slot == "Driver") ? driver : gunner
- if((M.a_intent == INTENT_HARM || isxeno(M)) && occupant)
- handle_harm_attack(M, occupant)
- return
-
- if(!M.dextrous)
- to_chat(M, span_warning("You don't have the dexterity to drive [src]!"))
- return
- if(!allowed(M))
- to_chat(M, span_warning("Access denied."))
- return
- if(occupant)
- to_chat(M, span_warning("That seat is already taken."))
- return
- var/obj/item/offhand = M.get_inactive_held_item()
- if(offhand && !(HAS_TRAIT(offhand, TRAIT_NODROP) || (offhand.flags_item & (DELONDROP|ITEM_ABSTRACT))))
- to_chat(M, span_warning("You need your hands free to climb on [src]."))
- return
-
- if(M.skills.getRating(SKILL_LARGE_VEHICLE) < SKILL_LARGE_VEHICLE_TRAINED)
- M.visible_message(span_notice("[M] fumbles around figuring out how to get into the [src]."),
- span_notice("You fumble around figuring out how to get into [src]."))
- var/fumbling_time = 10 SECONDS - 2 SECONDS * M.skills.getRating(SKILL_LARGE_VEHICLE)
- if(!do_after(M, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED) || \
- (offhand && !(HAS_TRAIT(offhand, TRAIT_NODROP) || (offhand.flags_item & DELONDROP))))
- return
-
- to_chat(M, span_notice("You start climbing into [src]."))
- if(!do_after(M, 10 SECONDS, NONE, src, BUSY_ICON_GENERIC) || \
- (offhand && !(HAS_TRAIT(offhand, TRAIT_NODROP) || (offhand.flags_item & DELONDROP))))
- return
- if(occupant)
- to_chat(M, span_warning("Someone got into the [lowertext(slot)]'s seat before you could."))
- return
-
- if(slot == "Driver")
- driver = M
- else
- gunner = M
- M.forceMove(src)
- to_chat(M, span_notice("You enter into the [lowertext(slot)]'s seat."))
- M.set_interaction(src)
-
-//Deposits you onto the exit marker
-/obj/vehicle/multitile/root/cm_armored/tank/handle_player_exit(mob/M)
-
- if(!(M in list(gunner, driver))) //someone whom isn't supposed to be here to begin with.
- exit_tank(M, TRUE)
- return
-
- if(!M.do_actions)
- if(occupant_exiting)
- to_chat(M, span_notice("Someone is already getting out of [src]."))
- return
- occupant_exiting = M
-
- to_chat(M, span_notice("You start climbing out of [src]."))
-
- addtimer(CALLBACK(src, PROC_REF(exit_tank), M), 5 SECONDS)
-
-/obj/vehicle/multitile/root/cm_armored/tank/proc/exit_tank(mob/M, forced = FALSE, silent = FALSE)
- if(!forced)
- occupant_exiting = null
-
- if(!M || get_turf(M) != get_turf(src) || (M.incapacitated() && !forced))
- return
-
- var/turf/T = get_turf(entrance)
- if(!forced)
- if(!T.CanPass(M, T))
- if(!silent)
- to_chat(M, span_notice("Something is blocking you from exiting."))
- return
- for(var/atom/A in T)
- if(A.CanPass(M, T))
- continue
- if(!silent)
- to_chat(M, span_notice("Something is blocking you from exiting."))
- return
- M.forceMove(T)
-
- if(M == gunner)
- deactivate_all_hardpoints()
- gunner = null
- else if(M == driver)
- driver = null
- M.unset_interaction()
- if(!silent)
- to_chat(M, span_notice("You climb out of [src]."))
-
-//No one but the driver can drive
-/obj/vehicle/multitile/root/cm_armored/tank/relaymove(mob/user, direction)
- if(user != driver || user.incapacitated())
- return
-
- . = ..(user, direction)
-
-
-
- if(next_sound_play < world.time)
- playsound(src, 'sound/ambience/tank_driving.ogg', vol = 20, sound_range = 30)
- next_sound_play = world.time + 21
-
-//No one but the driver can turn
-/obj/vehicle/multitile/root/cm_armored/tank/try_rotate(deg, mob/user, force = FALSE)
-
- if(user != driver || user.incapacitated())
- return
-
- . = ..(deg, user, force)
-
- if(. && istype(hardpoints[HDPT_SUPPORT], /obj/item/hardpoint/support/artillery_module) && gunner?.client)
- var/client/C = gunner.client
- var/old_x = C.pixel_x
- var/old_y = C.pixel_y
- C.pixel_x = old_x*cos(deg) - old_y*sin(deg)
- C.pixel_y = old_x*sin(deg) + old_y*cos(deg)
-
-/obj/vehicle/multitile/hitbox/cm_armored/tank/get_driver()
- var/obj/vehicle/multitile/root/cm_armored/tank/T = root
- return T?.driver
-
-
-/obj/vehicle/multitile/root/cm_armored/tank/take_damage_type(damage, type, atom/attacker)
- . = ..()
-
- if(istype(attacker, /mob))
- var/mob/M = attacker
- log_combat(M, src, "damaged [src] with [damage] [type] damage.")
-
- if(gunner)
- log_combat(gunner, null, "[src] took [damage] [type] damage [ismob(attacker) ? "from [key_name(attacker)]" : ""].")
- if(driver)
- log_combat(driver, null, "[src] took [damage] [type] damage [ismob(attacker) ? "from [key_name(attacker)]" : ""].")
-
-
-/obj/vehicle/multitile/root/cm_armored/proc/click_action(A, mob/user, params)
- if(istype(A, /atom/movable/screen) || A == src)
- return FALSE
-
- if(!can_use_hp(user))
- return TRUE
-
- if(!hardpoints.Find(active_hp))
- to_chat(user, span_warning("Please select an active hardpoint first."))
- return TRUE
-
- var/obj/item/hardpoint/HP = hardpoints[active_hp]
-
- if(!HP?.is_ready())
- return TRUE
-
- if(!HP.firing_arc(A))
- to_chat(user, span_warning("The target is not within your firing arc."))
- return TRUE
-
- HP.active_effect(A)
- return TRUE
diff --git a/code/modules/vehicles/multitile/tankvendor.dm b/code/modules/vehicles/multitile/tankvendor.dm
deleted file mode 100644
index 4b86e08154c1a..0000000000000
--- a/code/modules/vehicles/multitile/tankvendor.dm
+++ /dev/null
@@ -1,291 +0,0 @@
-#define TANKFAB_MAIN_MENU 0
-#define TANKFAB_MOD_MAINT 1
-#define TANKFAB_PRINTER 2
-#define TANKFAB_BUSY 3
-
-
-/obj/machinery/tank_part_fabricator
- name = "tank part fabricator"
- desc = "A large automated 3D printer for producing new tank parts and maintaining old ones."
- density = TRUE
- anchored = TRUE
- use_power = IDLE_POWER_USE
- idle_power_usage = 20
- icon = 'icons/obj/machines/drone_fab.dmi'
- icon_state = "drone_fab_idle"
- var/obj/item/loaded_mod
- var/tank_points = 625
- var/busy = FALSE
- var/screen = TANKFAB_MAIN_MENU
-
-/obj/machinery/tank_part_fabricator/proc/set_busy(business = TRUE, timer)
- busy = business
- if(timer)
- addtimer(CALLBACK(src, PROC_REF(set_busy), !business), timer)
- update_icon()
- updateUsrDialog()
-
-/obj/machinery/tank_part_fabricator/update_icon_state()
- . = ..()
- if(machine_stat & NOPOWER)
- icon_state = "drone_fab_nopower"
- return
- if(busy)
- icon_state = "drone_fab_active"
- return
- else
- icon_state = "drone_fab_idle"
-
-/obj/machinery/tank_part_fabricator/interact(mob/user)
- . = ..()
- if(.)
- return
- var/dat
- if(screen == TANKFAB_BUSY)
- dat += "[src] is busy. Please wait for completion of the current operation..."
- else
- dat += "Points Available: [tank_points]
"
- var/slot = loaded_mod ? "[icon2html(loaded_mod, usr)] [loaded_mod]" : "None"
- dat += "Loaded Hardpoint/Ammo Clip: [slot]
"
-
- var/screen_menu = screen != TANKFAB_MAIN_MENU ? "Main Menu" : "Main Menu"
- var/screen_maint = screen != TANKFAB_MOD_MAINT ? "Hardpoint Maintenance" : "Hardpoint Maintenance"
- var/screen_fab = screen != TANKFAB_PRINTER ? "Hardpoint Printer" : "Hardpoint Printer"
- dat += "| [screen_fab] | | [screen_menu] | | [screen_maint] | |
"
-
-
- switch(screen)
-
- if(TANKFAB_MOD_MAINT)
- if(!loaded_mod)
- dat += "No hardpoint or clip loaded. Please stand-by..."
- else
- var/price = calculate_mod_value(loaded_mod)
- var/restore = istype(loaded_mod, /obj/item/hardpoint) ? "Repair" : "Refill"
- var/cost = calculate_repair_price(loaded_mod)
- dat += "| [restore] ([cost]) | | Refund ([price]) | |
"
- dat += "Hardpoint/Ammo Clip infos:
"
- dat += "Brief description: [loaded_mod.desc]
"
- if(istype(loaded_mod, /obj/item/hardpoint))
- var/obj/item/hardpoint/H = loaded_mod
- dat += "Hardpoint integrity: [PERCENT(H.obj_integrity/H.max_integrity)]%
"
- if(H.starter_ammo)
- var/ammo_count = H.ammo ? "[H.ammo] ([H.ammo.current_rounds]/[H.ammo.max_rounds])" : "No clip loaded"
- dat += "Current clip: [ammo_count]
"
- if(H.max_clips)
- dat += "Backup clips:
"
- for(var/I in H.backup_clips)
- var/obj/item/ammo_magazine/tank/A = I
- dat += "[A] ([A.current_rounds]/[A.max_rounds])
"
- else if(istype(loaded_mod, /obj/item/ammo_magazine))
- var/obj/item/ammo_magazine/A = loaded_mod
- dat += "Current rounds: [A] [A.current_rounds]/[A.max_rounds]
"
- dat += "Caliber: [A.caliber]
"
- //var/obj/item/hardpoint/H = A.gun_type //Ima break this.
- //dat += "Supported Hardpoint: [initial(H.name)]
"
-
- if(TANKFAB_PRINTER)
- dat += "Armor:
"
- for(var/build_type in subtypesof(/obj/item/hardpoint/armor))
- var/obj/item/hardpoint/armor/AR = build_type
- if(!initial(AR.buyable))
- continue
- var/build_name = initial(AR.name)
- var/build_cost = initial(AR.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- dat += "Primary Weapon:
"
- for(var/build_type in subtypesof(/obj/item/hardpoint/primary))
- var/obj/item/hardpoint/primary/PR = build_type
- if(!initial(PR.buyable))
- continue
- var/build_name = initial(PR.name)
- var/build_cost = initial(PR.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- dat += "Secondary Weapon:
"
- for(var/build_type in subtypesof(/obj/item/hardpoint/secondary))
- var/obj/item/hardpoint/secondary/SE = build_type
- if(!initial(SE.buyable))
- continue
- var/build_name = initial(SE.name)
- var/build_cost = initial(SE.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- dat += "Support Module:
"
- for(var/build_type in subtypesof(/obj/item/hardpoint/support))
- var/obj/item/hardpoint/support/SP = build_type
- if(!initial(SP.buyable))
- continue
- var/build_name = initial(SP.name)
- var/build_cost = initial(SP.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- dat += "Treads:
"
- for(var/build_type in subtypesof(/obj/item/hardpoint/treads))
- var/obj/item/hardpoint/treads/TR = build_type
- if(!initial(TR.buyable))
- continue
- var/build_name = initial(TR.name)
- var/build_cost = initial(TR.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- dat += "Weapon Ammo:
"
- for(var/build_type in subtypesof(/obj/item/ammo_magazine/tank))
- var/obj/item/ammo_magazine/tank/AM = build_type
- var/build_name = initial(AM.name)
- var/build_cost = initial(AM.point_cost)
- dat += "[build_name] ([build_cost])
"
-
- var/datum/browser/popup = new(user, "dropship_part_fab", "Tank Part Fabricator
")
- popup.set_content(dat)
- popup.open(TRUE)
-
-
-/obj/machinery/tank_part_fabricator/attackby(obj/item/W, mob/user)
- if((istype(W, /obj/item/hardpoint) || istype(W, /obj/item/ammo_magazine/tank)) && user.a_intent != INTENT_HARM)
- if(machine_stat & (NOPOWER|BROKEN))
- return
- if(busy)
- to_chat(usr, span_warning("[src] is busy. Please wait for completion of previous operation."))
- else if(user.transferItemToLoc(W, src))
- user.visible_message(span_notice("[user] loads [W] into [src]'s maintenance slot."), span_notice("You load [W] into [src]'s maintenance slot."), null, 4)
- loaded_mod = W
- else
- to_chat(user, span_warning("[W] appears to be stuck to your hands."))
- else if(iscrowbar(W) && machine_stat & (NOPOWER|BROKEN) && !QDELETED(loaded_mod))
- user.visible_message(span_warning("[user] starts to pry [src]'s maintenance slot open."), span_notice("You start to pry [loaded_mod] out of [src]'s maintenance slot..."))
- if(!do_after(user, 4 SECONDS, NONE, src, BUSY_ICON_GENERIC) || QDELETED(loaded_mod))
- return
- user.visible_message("[user] pries [loaded_mod] out of [src].", span_notice("You retrieve [loaded_mod] from [src]."))
- eject_tank_part()
- else
- return ..()
-
-/obj/machinery/tank_part_fabricator/proc/build_tank_part(part_type, cost, mob/user)
- if(machine_stat & (NOPOWER|BROKEN) || busy)
- return
- if(tank_points < cost)
- to_chat(user, span_warning("You don't have enough points to build that."))
- return
- visible_message(span_notice("[src] starts printing something."))
- tank_points -= cost
- set_busy()
- addtimer(CALLBACK(src, PROC_REF(dispense_tank_part), part_type), 10 SECONDS)
-
-/obj/machinery/tank_part_fabricator/proc/dispense_tank_part(part_type)
- set_busy(FALSE)
- var/turf/T = get_step(src, SOUTHEAST)
- playsound(src, 'sound/machines/hydraulics_1.ogg', 40, 1)
- new part_type(T)
-
-/obj/machinery/tank_part_fabricator/proc/calculate_mod_value()
- if(istype(loaded_mod, /obj/item/hardpoint))
- var/obj/item/hardpoint/mod = loaded_mod
- . = (mod.point_cost - mod.point_cost * (1 - (mod.obj_integrity/mod.max_integrity)) * 0.5) * 0.5
- if(mod.starter_ammo)
- if(mod.ammo)
- . += (mod.ammo.point_cost - mod.ammo.point_cost * (1 - (mod.ammo.current_rounds/mod.ammo.max_rounds)) * 0.5) * 0.5
- else
- . -= initial(mod.starter_ammo.point_cost) * 0.5
- for(var/O in mod.backup_clips)
- var/obj/item/ammo_magazine/tank/A = O
- . = (A.point_cost - A.point_cost * (1 - (A.current_rounds/A.max_rounds)) * 0.5) * 0.5
- else if(istype(loaded_mod, /obj/item/ammo_magazine/tank))
- var/obj/item/ammo_magazine/tank/A = loaded_mod
- . = (A.point_cost - A.point_cost * (1 - (A.current_rounds/A.max_rounds)) * 0.5) * 0.5
- . = max(round(.), 0)
-
-/obj/machinery/tank_part_fabricator/proc/calculate_repair_price()
- if(istype(loaded_mod, /obj/item/hardpoint))
- var/obj/item/hardpoint/mod = loaded_mod
- . = ((mod.point_cost - mod.point_cost * (mod.obj_integrity/mod.max_integrity)) * 0.1)
- if(mod.starter_ammo)
- if(mod.ammo)
- . += ((mod.ammo.point_cost - mod.ammo.point_cost * (mod.ammo.current_rounds/mod.ammo.max_rounds)) * 0.9)
- else
- . += initial(mod.starter_ammo.point_cost) * 0.9
- else if(istype(loaded_mod, /obj/item/ammo_magazine/tank))
- var/obj/item/ammo_magazine/tank/A = loaded_mod
- . = ((A.point_cost - A.point_cost * (A.current_rounds/A.max_rounds)) * 0.9)
-
- . = max(round(.), 0)
-
-/obj/machinery/tank_part_fabricator/proc/eject_tank_part(mob/user)
- if(busy || QDELETED(loaded_mod))
- return
- var/turf/T = get_step(src, SOUTHEAST)
- if(user)
- to_chat(user, span_notice("You retrieve [loaded_mod] from [src]."))
- loaded_mod.forceMove(T)
- loaded_mod = null
-
-/obj/machinery/tank_part_fabricator/proc/refund_tank_part()
- if(machine_stat & (NOPOWER|BROKEN) || busy || QDELETED(loaded_mod))
- return
- tank_points += calculate_mod_value()
- visible_message(span_notice("[src] starts disassembling [loaded_mod]."))
- QDEL_NULL(loaded_mod)
- set_busy(TRUE, 10 SECONDS)
-
-/obj/machinery/tank_part_fabricator/proc/restore_tank_part(mob/user)
- if(machine_stat & (NOPOWER|BROKEN) || busy || QDELETED(loaded_mod))
- return
- var/cost = calculate_repair_price()
- if(tank_points < cost)
- to_chat(user, span_warning("You don't have enough points to repair that."))
- tank_points -= cost
- if(istype(loaded_mod, /obj/item/hardpoint))
- var/obj/item/hardpoint/H = loaded_mod
- H.repair_damage(H.max_integrity)
- if(H.ammo)
- H.ammo.current_rounds = H.ammo.max_rounds
- H.ammo.update_icon()
- else if(H.starter_ammo)
- H.ammo = new H.starter_ammo
- else if(istype(loaded_mod, /obj/item/ammo_magazine/tank))
- var/obj/item/ammo_magazine/tank/A = loaded_mod
- A.current_rounds = A.max_rounds
- set_busy(TRUE, 6 SECONDS)
-
-/obj/machinery/tank_part_fabricator/Topic(href, href_list)
- . =..()
- if(.)
- return
-
- if(busy)
- to_chat(usr, span_warning("[src] is busy. Please wait for completion of previous operation."))
- return
-
- if(href_list["produce"])
- var/produce = text2path(href_list["produce"])
- var/cost
- if(ispath(produce, /obj/item/hardpoint))
- var/obj/item/hardpoint/H = produce
- cost = initial(H.point_cost)
- else if(ispath(produce, /obj/item/ammo_magazine/tank))
- var/obj/item/ammo_magazine/tank/A = produce
- cost = initial(A.point_cost)
- if(isnull(cost))
- updateUsrDialog()
- return
- build_tank_part(produce, cost, usr)
-
- if(href_list["eject"])
- eject_tank_part(usr)
-
- if(href_list["refund"])
- refund_tank_part()
-
- if(href_list["restore"])
- restore_tank_part(usr)
-
- if(href_list["screen"])
- screen = text2num(href_list["screen"])
-
- updateUsrDialog()
-
-#undef TANKFAB_MAIN_MENU
-#undef TANKFAB_MOD_MAINT
-#undef TANKFAB_PRINTER
-#undef TANKFAB_BUSY
diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm
index 3413ae5ea1d60..1efc2384d5320 100644
--- a/code/modules/vehicles/sealed.dm
+++ b/code/modules/vehicles/sealed.dm
@@ -88,7 +88,7 @@
M.visible_message(span_notice("[M] drops out of \the [src]!"))
return TRUE
-/obj/vehicle/sealed/proc/exit_location(M)
+/obj/vehicle/sealed/proc/exit_location(mob/M)
return drop_location()
/obj/vehicle/sealed/attackby(obj/item/I, mob/user, params)
@@ -141,10 +141,14 @@
return FALSE
/obj/vehicle/sealed/relaymove(mob/living/user, direction)
- if(canmove)
- vehicle_move(direction)
+ if(is_driver(user) && canmove)
+ vehicle_move(user, direction)
return TRUE
/// Sinced sealed vehicles (cars and mechs) don't have riding components, the actual movement is handled here from [/obj/vehicle/sealed/proc/relaymove]
-/obj/vehicle/sealed/proc/vehicle_move(direction)
- return FALSE
+/obj/vehicle/sealed/proc/vehicle_move(mob/living/user, direction)
+ SHOULD_CALL_PARENT(TRUE)
+ if(!COOLDOWN_CHECK(src, cooldown_vehicle_move))
+ return FALSE
+ COOLDOWN_START(src, cooldown_vehicle_move, move_delay)
+ return !(SEND_SIGNAL(src, COMSIG_VEHICLE_MOVE, user, direction) & COMPONENT_DRIVER_BLOCK_MOVE)
diff --git a/code/modules/vehicles/unmanned/unmanned_vehicle.dm b/code/modules/vehicles/unmanned/unmanned_vehicle.dm
index 1777677a5db28..a109237c9313f 100644
--- a/code/modules/vehicles/unmanned/unmanned_vehicle.dm
+++ b/code/modules/vehicles/unmanned/unmanned_vehicle.dm
@@ -79,11 +79,11 @@
QDEL_NULL(in_chamber)
return ..()
-/obj/vehicle/unmanned/obj_destruction()
+/obj/vehicle/unmanned/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
robogibs(src)
return ..()
-/obj/vehicle/unmanned/take_damage(damage_amount, damage_type, damage_flag, effects, attack_dir, armour_penetration)
+/obj/vehicle/unmanned/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob)
. = ..()
hud_set_machine_health()
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index 0104c18930440..b9e3653eed098 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -20,7 +20,7 @@
wheels_overlay = image(icon, overlay_icon, FLY_LAYER)
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null)
-/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag)
+/obj/vehicle/ridden/wheelchair/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
new /obj/item/stack/rods(drop_location(), 1)
return ..()
diff --git a/code/modules/xenomorph/acidwell.dm b/code/modules/xenomorph/acidwell.dm
index 656b62d7ff51d..0e04cc9427a80 100644
--- a/code/modules/xenomorph/acidwell.dm
+++ b/code/modules/xenomorph/acidwell.dm
@@ -44,7 +44,7 @@
qdel(src)
-/obj/structure/xeno/acidwell/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/structure/xeno/acidwell/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
if(!QDELETED(creator) && creator.stat == CONSCIOUS && creator.z == z)
var/area/A = get_area(src)
if(A)
diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm
index f24f516952f51..15e4270421866 100644
--- a/code/modules/xenomorph/silo.dm
+++ b/code/modules/xenomorph/silo.dm
@@ -56,7 +56,7 @@
newt.tunnel_desc = "[AREACOORD_NO_Z(newt)]"
newt.name += " [name]"
-/obj/structure/xeno/silo/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/structure/xeno/silo/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
if(GLOB.hive_datums[hivenumber])
UnregisterSignal(GLOB.hive_datums[hivenumber], list(COMSIG_HIVE_XENO_MOTHER_PRE_CHECK, COMSIG_HIVE_XENO_MOTHER_CHECK))
GLOB.hive_datums[hivenumber].xeno_message("A resin silo has been destroyed at [AREACOORD_NO_Z(src)]!", "xenoannounce", 5, FALSE,src.loc, 'sound/voice/alien_help2.ogg',FALSE , null, /atom/movable/screen/arrow/silo_damaged_arrow)
@@ -91,7 +91,7 @@
. += span_info("It appears in good shape, pulsating healthily.")
-/obj/structure/xeno/silo/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration)
+/obj/structure/xeno/silo/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob)
. = ..()
//We took damage, so it's time to start regenerating if we're not already processing
diff --git a/code/modules/xenomorph/spawner.dm b/code/modules/xenomorph/spawner.dm
index c12dc12f2d7bb..01a0ce1f6894b 100644
--- a/code/modules/xenomorph/spawner.dm
+++ b/code/modules/xenomorph/spawner.dm
@@ -41,7 +41,7 @@
. += span_info("It appears in good shape, pulsating healthily.")
-/obj/structure/xeno/spawner/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration)
+/obj/structure/xeno/spawner/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob)
. = ..()
spawner_damage_alert()
diff --git a/code/modules/xenomorph/trap.dm b/code/modules/xenomorph/trap.dm
index 51f60d3ea160e..fda71d477cf8a 100644
--- a/code/modules/xenomorph/trap.dm
+++ b/code/modules/xenomorph/trap.dm
@@ -55,7 +55,7 @@
else
icon_state = "trap"
-/obj/structure/xeno/trap/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/structure/xeno/trap/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
if((damage_amount || damage_flag) && hugger && loc)
trigger_trap()
return ..()
diff --git a/code/modules/xenomorph/xeno_turret.dm b/code/modules/xenomorph/xeno_turret.dm
index 4eb332b10e842..715a837f0ef87 100644
--- a/code/modules/xenomorph/xeno_turret.dm
+++ b/code/modules/xenomorph/xeno_turret.dm
@@ -56,7 +56,7 @@
SIGNAL_HANDLER
qdel(src)
-/obj/structure/xeno/xeno_turret/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/structure/xeno/xeno_turret/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob)
if(damage_amount) //Spawn the gas only if we actually get destroyed by damage
var/datum/effect_system/smoke_spread/xeno/smoke = new /datum/effect_system/smoke_spread/xeno/acid(src)
smoke.set_up(1, get_turf(src))
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index bc690f7632e40..b3b7ef4fd41fb 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -335,3 +335,134 @@
blackdav123:
- balance: Reinforced the external walls of two buildings on Magmoor.
- balance: Preweeded Gelida IV and added a tunnel.
+2024-02-20:
+ blackdav123:
+ - rscadd: A set of vendors near the Alamo on Sulaco.
+2024-02-21:
+ TiviPlus:
+ - bugfix: Fixes custom squad tablets not working
+ - bugfix: Fix Main console not being able to overwatch custom squads
+ - bugfix: fixed headsets being invisible if you spawned them while in a custom squad
+ - bugfix: 'Custom squads will now automatically pick the first most unused letter
+ in the name: (e.g cool squad will be .o because .c is taken by charlie by default)
+ the key can be found by examining your headset. people in the squad still have
+ to use ; because im lazy and didnt fix it'
+ XElectricX:
+ - bugfix: Fix interactive emotes
+ ivanmixo:
+ - bugfix: Nulls in the global client list shouldnt be as common anymore
+2024-02-22:
+ Lumipharon:
+ - bugfix: fixed heightened stamina skill not properly lowering the stam regen delay
+ - bugfix: 'Campaign: Fixed an issue with some perks unlocking items incorrectly'
+ - balance: 'Campaign: Advanced firearm training perk reduced to 400 credits'
+ - balance: 'Campaign: Advanced construction and medical training reduced to 300
+ credits and increase skill by 2'
+ Naaanii:
+ - balance: Increases hunter speed to -1.5
+ - balance: Essence link (Drone), Create Jelly (Drone and Hivelord), Place Jelly
+ Pod (Hivelord), Place Resin trap (Carrier), Create Spiderling (Widow), Acid
+ well placement (several castes) can be used while resting.
+ blackdav123:
+ - balance: ' Removed 7 phoron miners from Ice Colony, Added 1.'
+2024-02-23:
+ Barnet2:
+ - balance: Resin walls take 1.75x from melee, but have highly increased bullet and
+ laser armor
+ Lewdcifer:
+ - rscadd: Various Warrior changes, as part of a minor rework and rebalancing!
+ - rscadd: 'Added a new Primordial Warrior ability: Flurry!'
+ - rscadd: 'FLURRY: 10 plasma, 7 CD, three charges.'
+ - rscadd: 'FLURRY: Each attack deals 25% of the Warrior''s melee damage, and counts
+ towards the Empower combo count.'
+ - rscadd: 'FLURRY: Empowered version is the same as Jab''s. Inflicts 3 stacks of
+ blind, 6 of blur, and confuses for 3s.'
+ - rscdel: Primordial Warrior's Jab ability removed.
+ - balance: Melee damage reduced from 23 to 20.
+ - balance: Maximum plasma reduced from 120 to 100.
+ - balance: Plasma gain reduced from 12 to 10.
+ - balance: 'AGILITY: Cooldown reduced from 0.5s to 0.4s.'
+ - balance: 'LUNGE: Plasma cost increased from 18 to 20.'
+ - balance: 'GRAPPLE TOSS: Plasma cost increased from 18 to 20.'
+ - balance: 'FLING + GRAPPLE TOSS: Distance penalty on big mobs changed. Instead
+ of halving it, it now reduces it by one.'
+ - balance: 'FLING + GRAPPLE TOSS: Throwing impact effect added.'
+ - balance: 'PUNCH: Plasma cost increased from 12 to 15.'
+ - balance: 'PUNCH: Will no longer push targets if they''re against a wall.'
+ - qol: 'ALL ABILITIES: Abilities will now inform the player via a balloon message
+ when their cooldown is finished.'
+ - qol: 'AGILITY: No longer disallows using abilities while active. However, using
+ any ability will automatically disable Agility.'
+ - imageadd: Visual effects for throwing impacts, and punching.
+ - refactor: Refactored most of Warrior's coding, with the intention of better quality
+ and containment.
+ Pariah919:
+ - balance: Reinforced Walls have 75 laser/bullet armor and 5000 HP.
+2024-02-24:
+ 74delta:
+ - rscadd: hefa grenades to req for 550 a box and 10 in roundstart vendors
+ Lumipharon:
+ - qol: Xeno plasma levels will update on the hud as soon as plasma levels change,
+ instead of waiting for life ticks
+ - bugfix: fixed pheros not using plasma if you were on full plasma, even off weeds
+ - code_imp: Improved some xeno plasma hud code
+ - balance: 'Campaign: Added individual stats to track shrapnel removed, mines placed
+ and mechs destroyed'
+ - balance: 'Campaign: Boosted the cash rewards for performing non combat actions'
+ - bugfix: fixed some wrong/misleading wield time stats
+ - bugfix: 'Campaign: Fixed an incorrect objective desc for ASAT Capture'
+ - code_imp: Cleaned up some conveyor code
+ - bugfix: 'Campaign: Fixed not being properly despawned at the end of a mission
+ in some cases'
+ MiniMeatwad:
+ - admin: Added message for recipient when a ticket is (un)marked, closed, or tiered.
+ XElectricX:
+ - code_imp: Interactive emotes can be bound to a key instead of using right clicking.
+ Xander3359:
+ - bugfix: Fix robotic cradle sprite
+ ivanmixo:
+ - rscadd: Added directional attacks, you can enable them in the preference menu
+ for all living mobs.
+2024-02-25:
+ RipGrayson:
+ - rscadd: Added some barricade mapping helpers for mapper use.
+ TiviPlus:
+ - rscadd: added some admin-only vehicles
+ - code_imp: added multitile, multicrew vehicle support
+ Wisemonster:
+ - balance: ERT ships will now have plasteel cades protecting their doors.
+ - code_imp: Added a plasteel child that spawns in closed
+2024-02-26:
+ Barnet2:
+ - balance: Daedalus Prison has weaker tables and pre-broken fences for a better
+ prep experience
+ - bugfix: Snows shows up as a proper texture in SDMM
+2024-02-27:
+ Barnet2:
+ - balance: Boiler no longer has to root to fire
+ - spellcheck: New groundside marine ranks
+ - balance: Antigas nade req price reduced to 600, 20 nades in vendor instead of
+ 10
+ - balance: Widow and Puppeteer minions have a 5% chance to hit their selected limb
+ (chest) instead of a 70% chance.
+ - rscadd: Xeno manifest on lobby screen
+ - balance: Queen has a sunder multiplier of 0.8 (takes 80% sunder), Crusher has
+ a sunder multiplier of 0.5 (takes 50% sunder)
+ DeltaFire15:
+ - bugfix: The new larva queue check should no longer be broken.
+ Helg2:
+ - code_imp: Weather danger messages now can be filtered by chat settings.
+ Lumipharon:
+ - balance: 'Campaign: Improved HP, shield and stamina perks'
+ - bugfix: fixed a larva queue issue
+ - bugfix: fixed xeno plasma hud getting stuck on death
+ - balance: Meleeing humans can no longer embed the item
+ - balance: 'Campaign: Slightly increased some credit reward values, and loss bonus
+ now applies to mission credit rewards'
+ Pariah919:
+ - balance: AC has significantly more wall damage to keep up with wall resistance
+ buffs.
+ Wisemonster:
+ - qol: The tadpole surgery dispenser now layers over objects
+ exdal:
+ - rscadd: AI VOX announcements are now visible on chat
diff --git a/icons/Xeno/actions.dmi b/icons/Xeno/actions.dmi
index b6d8564f6d0e2..483953daefc2f 100644
Binary files a/icons/Xeno/actions.dmi and b/icons/Xeno/actions.dmi differ
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index 97972aa2dca2b..70d83f6e308dd 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 4ca785e3cfc23..6deca04d367fb 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 675ac6b129ad1..cce2a0a4c3e6c 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index e553d521f130e..9d1d541a3d0f1 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/mob/ammoHUD.dmi b/icons/mob/ammoHUD.dmi
index 8f4811fe64dd4..26fb5e0ef8e87 100644
Binary files a/icons/mob/ammoHUD.dmi and b/icons/mob/ammoHUD.dmi differ
diff --git a/icons/mob/inhands/weapons/grenades_left.dmi b/icons/mob/inhands/weapons/grenades_left.dmi
index b260c09ec2f59..9829b2acfdf3f 100644
Binary files a/icons/mob/inhands/weapons/grenades_left.dmi and b/icons/mob/inhands/weapons/grenades_left.dmi differ
diff --git a/icons/mob/inhands/weapons/grenades_right.dmi b/icons/mob/inhands/weapons/grenades_right.dmi
index d5f61eff768d4..73c5aac4ca89d 100644
Binary files a/icons/mob/inhands/weapons/grenades_right.dmi and b/icons/mob/inhands/weapons/grenades_right.dmi differ
diff --git a/icons/obj/armored/1x1/tinytank.dmi b/icons/obj/armored/1x1/tinytank.dmi
new file mode 100644
index 0000000000000..8f45e78adefee
Binary files /dev/null and b/icons/obj/armored/1x1/tinytank.dmi differ
diff --git a/icons/obj/armored/1x1/tinytank_gun.dmi b/icons/obj/armored/1x1/tinytank_gun.dmi
new file mode 100644
index 0000000000000..83176645615a9
Binary files /dev/null and b/icons/obj/armored/1x1/tinytank_gun.dmi differ
diff --git a/icons/obj/armored/2x2/medium_vehicles.dmi b/icons/obj/armored/2x2/medium_vehicles.dmi
new file mode 100644
index 0000000000000..f8234bb6c9c23
Binary files /dev/null and b/icons/obj/armored/2x2/medium_vehicles.dmi differ
diff --git a/icons/obj/armored/3x3/apc.dmi b/icons/obj/armored/3x3/apc.dmi
new file mode 100644
index 0000000000000..536eb9c856a6c
Binary files /dev/null and b/icons/obj/armored/3x3/apc.dmi differ
diff --git a/icons/obj/armored/3x3/apc_damage_overlay.dmi b/icons/obj/armored/3x3/apc_damage_overlay.dmi
new file mode 100644
index 0000000000000..e3da1e1f15f7d
Binary files /dev/null and b/icons/obj/armored/3x3/apc_damage_overlay.dmi differ
diff --git a/icons/obj/armored/3x3/tank.dmi b/icons/obj/armored/3x3/tank.dmi
new file mode 100644
index 0000000000000..07453c2693a3c
Binary files /dev/null and b/icons/obj/armored/3x3/tank.dmi differ
diff --git a/icons/obj/armored/3x3/tank_damage.dmi b/icons/obj/armored/3x3/tank_damage.dmi
new file mode 100644
index 0000000000000..b3e72ab3651dd
Binary files /dev/null and b/icons/obj/armored/3x3/tank_damage.dmi differ
diff --git a/icons/obj/armored/3x3/tank_gun.dmi b/icons/obj/armored/3x3/tank_gun.dmi
new file mode 100644
index 0000000000000..853daccd3cb08
Binary files /dev/null and b/icons/obj/armored/3x3/tank_gun.dmi differ
diff --git a/icons/obj/armored/3x3/tank_secondary_gun.dmi b/icons/obj/armored/3x3/tank_secondary_gun.dmi
new file mode 100644
index 0000000000000..b4f739db1d735
Binary files /dev/null and b/icons/obj/armored/3x3/tank_secondary_gun.dmi differ
diff --git a/icons/obj/armored/hardpoint_modules.dmi b/icons/obj/armored/hardpoint_modules.dmi
new file mode 100644
index 0000000000000..5c7bbb4b0641a
Binary files /dev/null and b/icons/obj/armored/hardpoint_modules.dmi differ
diff --git a/icons/obj/items/grenade.dmi b/icons/obj/items/grenade.dmi
index ed63d51f0252d..af815f9f2c302 100644
Binary files a/icons/obj/items/grenade.dmi and b/icons/obj/items/grenade.dmi differ
diff --git a/icons/obj/items/items_mini.dmi b/icons/obj/items/items_mini.dmi
index 97c528c26eece..25f6d064f22f5 100644
Binary files a/icons/obj/items/items_mini.dmi and b/icons/obj/items/items_mini.dmi differ
diff --git a/icons/obj/items/radio.dmi b/icons/obj/items/radio.dmi
index 2d2e20cf62c6e..2755744fc2e92 100644
Binary files a/icons/obj/items/radio.dmi and b/icons/obj/items/radio.dmi differ
diff --git a/icons/obj/items/storage/storage_boxes.dmi b/icons/obj/items/storage/storage_boxes.dmi
index 159b210d92ceb..e04eb5239031a 100644
Binary files a/icons/obj/items/storage/storage_boxes.dmi and b/icons/obj/items/storage/storage_boxes.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index 57260af0f7db5..1635c50612fef 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ
diff --git a/icons/obj/vehicles/hardpoint_modules.dmi b/icons/obj/vehicles/hardpoint_modules.dmi
deleted file mode 100644
index 0c720a9237c04..0000000000000
Binary files a/icons/obj/vehicles/hardpoint_modules.dmi and /dev/null differ
diff --git a/icons/obj/vehicles/tank_EW.dmi b/icons/obj/vehicles/tank_EW.dmi
deleted file mode 100644
index ff984a6abb1e7..0000000000000
Binary files a/icons/obj/vehicles/tank_EW.dmi and /dev/null differ
diff --git a/icons/obj/vehicles/tank_NS.dmi b/icons/obj/vehicles/tank_NS.dmi
deleted file mode 100644
index a709c718c331d..0000000000000
Binary files a/icons/obj/vehicles/tank_NS.dmi and /dev/null differ
diff --git a/sound/effects/tankswivel.ogg b/sound/effects/tankswivel.ogg
new file mode 100644
index 0000000000000..775a13c07ccf8
Binary files /dev/null and b/sound/effects/tankswivel.ogg differ
diff --git a/sound/vehicles/weapons/ltb_reload.ogg b/sound/vehicles/weapons/ltb_reload.ogg
new file mode 100644
index 0000000000000..19bf8ae3015ee
Binary files /dev/null and b/sound/vehicles/weapons/ltb_reload.ogg differ
diff --git a/tgmc.dme b/tgmc.dme
index defbb042e9d2d..fc6b14e80dfec 100644
--- a/tgmc.dme
+++ b/tgmc.dme
@@ -442,6 +442,7 @@
#include "code\datums\elements\attachment.dm"
#include "code\datums\elements\connect_loc.dm"
#include "code\datums\elements\debris.dm"
+#include "code\datums\elements\directional_attack.dm"
#include "code\datums\elements\egrill_element.dm"
#include "code\datums\elements\footstep.dm"
#include "code\datums\elements\gestures.dm"
@@ -2011,7 +2012,8 @@
#include "code\modules\tgui_panel\tgui_panel.dm"
#include "code\modules\tooltip\tooltip.dm"
#include "code\modules\unit_tests\_unit_tests.dm"
-#include "code\modules\vehicles\_vehicle.dm"
+#include "code\modules\vehicles\__vehicle.dm"
+#include "code\modules\vehicles\_hitbox.dm"
#include "code\modules\vehicles\atv.dm"
#include "code\modules\vehicles\bicycle.dm"
#include "code\modules\vehicles\cargo_train.dm"
@@ -2023,6 +2025,18 @@
#include "code\modules\vehicles\vehicle_actions.dm"
#include "code\modules\vehicles\vehicle_key.dm"
#include "code\modules\vehicles\wheelchair.dm"
+#include "code\modules\vehicles\armored\__armored.dm"
+#include "code\modules\vehicles\armored\_multitile.dm"
+#include "code\modules\vehicles\armored\ammo_magazine.dm"
+#include "code\modules\vehicles\armored\apc.dm"
+#include "code\modules\vehicles\armored\armored_actions.dm"
+#include "code\modules\vehicles\armored\armored_modules.dm"
+#include "code\modules\vehicles\armored\armored_weapons.dm"
+#include "code\modules\vehicles\armored\medium_apc.dm"
+#include "code\modules\vehicles\armored\medium_tank.dm"
+#include "code\modules\vehicles\armored\small_apc.dm"
+#include "code\modules\vehicles\armored\tank_fabricator.dm"
+#include "code\modules\vehicles\armored\vehicle_collision.dm"
#include "code\modules\vehicles\cars\car.dm"
#include "code\modules\vehicles\mecha\_mecha.dm"
#include "code\modules\vehicles\mecha\mech_bay.dm"
@@ -2055,11 +2069,6 @@
#include "code\modules\vehicles\mecha\equipment\weapons\weapons.dm"
#include "code\modules\vehicles\mecha\working\ripley.dm"
#include "code\modules\vehicles\mecha\working\working.dm"
-#include "code\modules\vehicles\multitile\cm_armored.dm"
-#include "code\modules\vehicles\multitile\hardpoints.dm"
-#include "code\modules\vehicles\multitile\multitile.dm"
-#include "code\modules\vehicles\multitile\tank.dm"
-#include "code\modules\vehicles\multitile\tankvendor.dm"
#include "code\modules\vehicles\unmanned\deployable_vehicles.dm"
#include "code\modules\vehicles\unmanned\unmanned_droid.dm"
#include "code\modules\vehicles\unmanned\unmanned_turrets.dm"
diff --git a/tgui/packages/tgui/interfaces/PlayerPreferences/GameSettings.tsx b/tgui/packages/tgui/interfaces/PlayerPreferences/GameSettings.tsx
index ba09c0f0b1615..e164f50f48144 100644
--- a/tgui/packages/tgui/interfaces/PlayerPreferences/GameSettings.tsx
+++ b/tgui/packages/tgui/interfaces/PlayerPreferences/GameSettings.tsx
@@ -143,6 +143,13 @@ export const GameSettings = (props) => {
leftLabel={'Enabled'}
rightLabel={'Disabled'}
/>
+
|