From 04290cac9948c55b6cf1c594074e949f0dc0536d Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 17:52:18 +0100 Subject: [PATCH 1/2] strips out an unused system --- code/modules/halo/clothing/armor_repair/clothing.dm | 3 --- code/modules/halo/covenant/species/kigyar/clothing.dm | 1 - code/modules/halo/covenant/species/sangheili/clothing.dm | 1 - .../halo/covenant/species/tvoan/skirmisher_armour.dm | 1 - code/modules/halo/covenant/species/unggoy/armour.dm | 1 - code/modules/mob/living/carbon/human/human_defense.dm | 6 ++---- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/halo/clothing/armor_repair/clothing.dm b/code/modules/halo/clothing/armor_repair/clothing.dm index 3b62f0eed03d1..7e81bbb88a043 100644 --- a/code/modules/halo/clothing/armor_repair/clothing.dm +++ b/code/modules/halo/clothing/armor_repair/clothing.dm @@ -6,7 +6,6 @@ /obj/item/clothing var/armor_thickness = 20 //The thickness of the armor, in mm. Keep null to opt-out usage of system for item. This value, set at compile time is the maximum value of thickness for this item. Armor can only lose 10% of this value per-hit. var/armor_thickness_max = 20 - var/list/armor_thickness_modifiers = list()//A list containing the weaknesses of the armor, used when performing armor-thickness depletion. Format: damage_type - multiplier var/dam_desc = "" var/next_warning_time = 0 var/armor_break_sound = 'code/modules/halo/sounds/effects/armor_break.ogg' @@ -16,8 +15,6 @@ /obj/item/clothing/proc/degrade_armor_thickness(var/damage,var/damage_type) damage /= 10 var/thickness_dam_cap = ARMOUR_THICKNESS_DAMAGE_CAP - if(damage_type in armor_thickness_modifiers) - thickness_dam_cap /= armor_thickness_modifiers[damage_type] var/new_thickness = round(armor_thickness - min(damage,thickness_dam_cap)) new_thickness = max(0, new_thickness) diff --git a/code/modules/halo/covenant/species/kigyar/clothing.dm b/code/modules/halo/covenant/species/kigyar/clothing.dm index a360a04026af6..81366d32c0b4d 100644 --- a/code/modules/halo/covenant/species/kigyar/clothing.dm +++ b/code/modules/halo/covenant/species/kigyar/clothing.dm @@ -60,7 +60,6 @@ "Tvaoan Kig-Yar" = 'code/modules/halo/covenant/species/tvoan/skirm_clothing.dmi') species_restricted = list("Kig-Yar","Tvaoan Kig-Yar") armor = list(melee = 55, bullet = 50, laser = 55, energy = 50, bomb = 40, bio = 25, rad = 25) - armor_thickness_modifiers = list() body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS matter = list("nanolaminate" = 1) diff --git a/code/modules/halo/covenant/species/sangheili/clothing.dm b/code/modules/halo/covenant/species/sangheili/clothing.dm index 10a2d2aa5b4fb..c11d1efd6ad97 100644 --- a/code/modules/halo/covenant/species/sangheili/clothing.dm +++ b/code/modules/halo/covenant/species/sangheili/clothing.dm @@ -47,7 +47,6 @@ /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/melee/energy/elite_sword) specials = list(/datum/armourspecials/shields/elite,/datum/armourspecials/shieldmonitor/sangheili) armor = list(melee = 55, bullet = 50, laser = 55, energy = 45, bomb = 40, bio = 25, rad = 25) - armor_thickness_modifiers = list() unacidable = 1 max_suitstore_w_class = ITEM_SIZE_HUGE matter = list("nanolaminate" = 2) diff --git a/code/modules/halo/covenant/species/tvoan/skirmisher_armour.dm b/code/modules/halo/covenant/species/tvoan/skirmisher_armour.dm index c85604b1274d2..f7c7f76a787e5 100644 --- a/code/modules/halo/covenant/species/tvoan/skirmisher_armour.dm +++ b/code/modules/halo/covenant/species/tvoan/skirmisher_armour.dm @@ -8,7 +8,6 @@ sprite_sheets = list("Tvaoan Kig-Yar" = 'code/modules/halo/covenant/species/tvoan/skirm_clothing.dmi') species_restricted = list("Tvaoan Kig-Yar") armor = list(melee = 55, bullet = 50, laser = 55, energy = 45, bomb = 40, bio = 25, rad = 25) - armor_thickness_modifiers = list() body_parts_covered = ARMS|UPPER_TORSO|LOWER_TORSO matter = list("nanolaminate" = 1) diff --git a/code/modules/halo/covenant/species/unggoy/armour.dm b/code/modules/halo/covenant/species/unggoy/armour.dm index 03b028148f9e6..bbfead37079aa 100644 --- a/code/modules/halo/covenant/species/unggoy/armour.dm +++ b/code/modules/halo/covenant/species/unggoy/armour.dm @@ -10,7 +10,6 @@ icon_state = "combatharness_minor" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS //Essentially, the entire body besides the head,feet,hands flags_inv = HIDESUITSTORAGE|HIDEBACK - armor_thickness_modifiers = list() unacidable = 1 allowed = list(\ /obj/item/weapon/grenade/plasma,\ diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 5a5cdeb4325ad..92e5aceabec11 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -107,11 +107,9 @@ cloak disrupt override if(gear) var/obj/item/clothing/C = gear if(istype(C) && C.body_parts_covered & def_zone.body_part) - var/effective_armor_thickness = 0 + var/effective_armor_thickness = 1 if(!isnull(C.armor_thickness_max)) - effective_armor_thickness = (C.armor_thickness/10) + 1 - if(type in C.armor_thickness_modifiers) - effective_armor_thickness *= C.armor_thickness_modifiers[type] + effective_armor_thickness += (C.armor_thickness/10) protection = add_armor(protection, (C.armor[type] * effective_armor_thickness * (lore_accuracy ? 0.4 : 1) )) return protection From 53879a52484b379e3c1c16e20943185d6cdc13a9 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 18:21:04 +0100 Subject: [PATCH 2/2] armor thickness now degrades --- code/modules/halo/clothing/armor_repair/clothing.dm | 4 +++- code/modules/mob/living/carbon/human/life.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/halo/clothing/armor_repair/clothing.dm b/code/modules/halo/clothing/armor_repair/clothing.dm index 7e81bbb88a043..6a5a2aea00150 100644 --- a/code/modules/halo/clothing/armor_repair/clothing.dm +++ b/code/modules/halo/clothing/armor_repair/clothing.dm @@ -16,7 +16,7 @@ damage /= 10 var/thickness_dam_cap = ARMOUR_THICKNESS_DAMAGE_CAP - var/new_thickness = round(armor_thickness - min(damage,thickness_dam_cap)) + var/new_thickness = armor_thickness - min(damage,thickness_dam_cap) new_thickness = max(0, new_thickness) var/mob/user = src.loc @@ -29,6 +29,8 @@ else if(istype(user)) to_chat(user, "Your [name]'s armor plating is [damage_type == BURN ? "scorched" : "damaged"]! ") next_warning_time = world.time + WARNING_DELAY + armor_thickness = new_thickness + update_damage_description() /obj/item/clothing/proc/update_damage_description(var/damage_type = BRUTE) var/desc_addition_to_apply = "Its armor plating is nominal." diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e6dc4ffc2ab28..e5bf777c65225 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1219,4 +1219,4 @@ var/obj/item/clothing/c = i if(istype(c)) if(c.armor_thickness < c.armor_thickness_max) - c.armor_thickness = min(c.armor_thickness + 0.1,c.armor_thickness_max) \ No newline at end of file + c.armor_thickness = min(c.armor_thickness + 0.05,c.armor_thickness_max) \ No newline at end of file