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

Combat & Reinforced Combat Armor buffs/fix #373

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Combat & Reinforced Combat Armor buffs/fix #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be615ba
Combat & Reinforced Combat Armor buffs/fix
Aurrain Feb 9, 2024
0c73353
Combat Helmets Buff/fix
Aurrain Feb 9, 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
4 changes: 2 additions & 2 deletions code/modules/clothing/head/f13head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
desc = "An old military grade pre-war combat helmet."
icon_state = "combat_helmet"
item_state = "combat_helmet"
armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 50)
armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 55)
strip_delay = 50
flags_inv = HIDEEARS|HIDEHAIR
resistance_flags = LAVA_PROOF | FIRE_PROOF
Expand All @@ -79,7 +79,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 = list("melee" = 50, "bullet" = 40, "laser" = 30, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55)
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 35, "bomb" = 65, "bio" = 65, "rad" = 15, "fire" = 65, "acid" = 35, "wound" = 60)
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR
flags_cover = HEADCOVERSEYES
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 5)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/suits/f13armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@
desc = "An old military grade pre war combat armor."
icon_state = "combat_armor"
item_state = "combat_armor"
armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 50)
armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 55)
slowdown = 0.12
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 5)

/obj/item/clothing/suit/armor/f13/combat/laserproof
name = "ablative combat armor"
desc = "An old military grade pre war combat armor. This one switches out its ballistic fibers for an ablative coating that disrupts energy weapons."
armor = list("melee" = 25, "bullet" = 25, "laser" = 40, "energy" = 40, "bomb" = 50, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 50)
armor = list("melee" = 25, "bullet" = 25, "laser" = 60, "energy" = 50, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30, "wound" = 55)

/obj/item/clothing/suit/armor/f13/combat/dark
name = "combat armor"
Expand Down Expand Up @@ -195,7 +195,7 @@
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "combat_armor_mk2"
item_state = "combat_armor_mk2"
armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 25, "bomb" = 55, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 55)
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 35, "bomb" = 65, "bio" = 65, "rad" = 15, "fire" = 65, "acid" = 35, "wound" = 60)
slowdown = 0.15
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 8)

Expand Down
Loading