Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Great Armor Rebalance #288

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

The Great Armor Rebalance #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9c265fa
Update bigiron_suits.dm
SirSwagmeyer Dec 3, 2024
1410a6a
Update bigiron_suits_factions.dm
SirSwagmeyer Dec 3, 2024
5dfc932
Update f13head.dm
SirSwagmeyer Dec 3, 2024
92e81b2
Update helmet.dm
SirSwagmeyer Dec 3, 2024
104adf4
Update bigiron_suits_factions.dm
SirSwagmeyer Dec 3, 2024
09a6b57
Update f13factionhead.dm
SirSwagmeyer Dec 3, 2024
b4c62ec
Update bigiron_suits.dm
SirSwagmeyer Dec 3, 2024
2d688e2
Update bigiron_suits_factions.dm
SirSwagmeyer Dec 3, 2024
5a13221
Update bigiron_suits.dm
SirSwagmeyer Dec 3, 2024
d04d274
Update armor.dm
SirSwagmeyer Dec 3, 2024
b87b029
Update bigiron_suits.dm
SirSwagmeyer Dec 3, 2024
314ae9e
PA usage drain
SirSwagmeyer Dec 3, 2024
1b63bb1
Update bigiron_suits_factions.dm
SirSwagmeyer Dec 3, 2024
9d8f06f
Update bigiron_suits_factions.dm
SirSwagmeyer Dec 3, 2024
b9f5dc9
Update armor.dm
SirSwagmeyer Dec 3, 2024
3e51381
Update f13factionhead.dm
SirSwagmeyer Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/__DEFINES/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"fire" = 10, \
"acid" = 10, \
"wound" = 10, \
"damage_threshold" = 1)
"damage_threshold" = 0)

/* Medium armor values
* Decent mobility
Expand All @@ -91,7 +91,7 @@
"fire" = 25, \
"acid" = 25, \
"wound" = 20, \
"damage_threshold" = 3)
"damage_threshold" = 2)

/* Heavy armor values
* Low mobility
Expand Down Expand Up @@ -134,7 +134,7 @@
"fire" = 80, \
"acid" = 80, \
"wound" = 40, \
"damage_threshold" = 8)
"damage_threshold" = 6)

/* Power armor values
* High mobility
Expand Down
29 changes: 18 additions & 11 deletions code/modules/clothing/head/f13factionhead.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
icon_state = "supafly"
item_state = "supafly"
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1)
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1)
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
slowdown = 0

Expand Down Expand Up @@ -178,7 +178,7 @@
desc = "A combat helmet modified with metal plating"
icon_state = "raider_combat_helmet"
item_state = "raider_combat_helmet"
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2)
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T1, ARMOR_MODIFIER_UP_DT_T1)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
slowdown = 0.025

Expand Down Expand Up @@ -507,7 +507,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
unique_reskin = list("M1" = "ncr_old")
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 1)
armor = ARMOR_VALUE_LIGHT
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1) // The NCR is more tanky, but slower
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1) // The NCR is more tanky, but slower

/obj/item/clothing/head/f13/ncr/Initialize()
. = ..()
Expand Down Expand Up @@ -551,6 +551,8 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
/obj/item/clothing/head/f13/ncr/steelpot_goggles/trenchraider
name = "NCR trench storm helmet"
desc = "A standard issue NCR steel helmet, issued with extra steel for close quarters fighting."
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1) // The NCR is more tanky, but slower


/obj/item/clothing/head/f13/ncr/steelpot_med
name = "NCR medic helmet"
Expand Down Expand Up @@ -594,7 +596,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
flags_inv = HIDEEARS
dog_fashion = null
armor = ARMOR_VALUE_MEDIUM
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1)
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BOMB_T2)

/obj/item/clothing/head/helmet/f13/ncr/heavygunner
name = "NCR Trench Raider Helmet"
Expand All @@ -604,7 +606,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
icon_state = "ncrarmyhelmetheavy"
item_state = "ncrarmyhelmetheavy"
flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3)
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_DT_T3)
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8)

/obj/item/clothing/head/f13/ncr/standard/conscript
Expand All @@ -617,7 +619,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
visor_flags_cover = HEADCOVERSEYES
dog_fashion = null
unique_reskin = list("M1" = "ncr_old")
armor_tokens = list()
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1)

/obj/item/clothing/head/f13/ncr/ncr_flapcap
name = "NCR field cap"
Expand Down Expand Up @@ -701,7 +703,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
item_state = "scoutberet"
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2)
armor = ARMOR_VALUE_LIGHT
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1)
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1)

/obj/item/clothing/head/f13/trailranger
name = "NCR trail ranger hat"
Expand All @@ -710,7 +712,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
item_state = "cowboyrang"
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2)
armor = ARMOR_VALUE_LIGHT
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1)
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_BULLET_T1)

/obj/item/clothing/head/f13/ranger
name = "NCR ranger campaign hat"
Expand All @@ -728,7 +730,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 2)
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_BULLET_T1)
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2)

/obj/item/clothing/head/helmet/f13/ncr/rangercombat
name = "ranger combat helmet"
Expand All @@ -746,7 +748,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
darkness_view = 24
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 3, /obj/item/clothing/glasses/night/polarizing = 1)
armor = ARMOR_VALUE_HEAVY
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2)
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_LASER_T2)

/* /obj/item/clothing/head/helmet/f13/ncr/rangercombat/Initialize()
. = ..()
Expand Down Expand Up @@ -795,7 +797,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
desc = "An improved combat helmet, bearing the symbol of the Knights."
icon_state = "brotherhood_helmet_knight"
item_state = "brotherhood_helmet_knight"

armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1)

/obj/item/clothing/head/helmet/f13/combat/brotherhood/senior
name = "brotherhood senior knight helmet"
Expand All @@ -808,12 +810,14 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
desc = "An improved combat helmet, bearing the symbol of a Sargeant."
icon_state = "brotherhood_helmet_senior"
item_state = "brotherhood_helmet_senior"
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/head/helmet/f13/combat/brotherhood/captain
name = "brotherhood head knight helmet"
desc = "An improved combat helmet, bearing the symbol of the Head Knight."
icon_state = "brotherhood_helmet_captain"
item_state = "brotherhood_helmet_captain"
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2)

/obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate
name = "initiate helmet"
Expand All @@ -826,6 +830,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
desc = "An advanced pre-war titanium plated, ceramic coated, kevlar, padded helmet designed to withstand extreme punishment of all forms, repainted to the colour scheme of the Brotherhood of Steel."
icon_state = "brotherhood_helmet"
item_state = "brotherhood_helmet"
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/head/helmet/f13/combat/brotherhood/outcast
name = "brotherhood helmet"
Expand Down Expand Up @@ -1303,12 +1308,14 @@ obj/item/clothing/head/f13/army/beret
desc = "A standard issue NCR helmet, with the letters \"MP\" scrawled on the front."
icon_state = "ncr_MP"
item_state = "ncr_MP"
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/head/f13/ncr/goggles
name = "NCR storm helmet"
desc = "A standard issue NCR Infantry helmet, with a pair of goggles attached to it."
icon_state = "ncr_goggles_helmet"
item_state = "ncr_goggles_helmet"
armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_DT_T1)
toggle_message = "You pull the goggles down under "
alt_toggle_message = "You push the goggles up onto the "
can_toggle = 1
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/head/f13head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
desc = "An advanced pre-war titanium plated, ceramic coated, kevlar, padded helmet designed to withstand extreme punishment of all forms."
icon_state = "combat_helmet_mk2"
item_state = "combat_helmet_mk2"
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2)
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3)
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR
flags_cover = HEADCOVERSEYES
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 5)
Expand Down Expand Up @@ -170,7 +170,7 @@
desc = "A sulphite raider helmet, affixed with thick anti-ballistic glass over the eyes."
icon_state = "sulphite_helm"
item_state = "sulphite_helm"
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_FIRE_T3)
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_BOMB_T3, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_FIRE_T3)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

Expand Down Expand Up @@ -211,7 +211,7 @@
toggle_message = "You lower"
alt_toggle_message = "You raise"
can_toggle = 1
armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_MELEE_T2)
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1)
flags_inv = HIDEMASK|HIDEEYES|HIDEFACE
strip_delay = 80
actions_types = list(/datum/action/item_action/toggle)
Expand All @@ -234,7 +234,7 @@
desc = "A reinforced metal hockey mask."
icon_state = "metal_mask2"
item_state = "metal_mask2"
armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_MELEE_T3)
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_ENV_T2, ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/head/helmet/f13/tesla
name = "tesla helmet"
Expand Down
5 changes: 3 additions & 2 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
icon_state = "helmetalt"
item_state = "helmetalt"
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2)
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_BOMB_T2, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T2)
can_flashlight = 1
dog_fashion = null

Expand All @@ -127,7 +127,7 @@
toggle_message = "You pull the visor down on"
alt_toggle_message = "You push the visor up on"
can_toggle = 1
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2)
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_DOWN_FIRE_T3, ARMOR_MODIFIER_UP_DT_T2)
flags_inv = HIDEEARS|HIDEFACE
strip_delay = 80
actions_types = list(/datum/action/item_action/toggle)
Expand Down Expand Up @@ -182,6 +182,7 @@
desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
icon_state = "swatsyndie"
item_state = "swatsyndie"
armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T1, ARMOR_MODIFIER_UP_DT_T3)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
Expand Down
Loading
Loading