Skip to content

Commit

Permalink
Nerf Marine Armor (#3791)
Browse files Browse the repository at this point in the history
## About The Pull Request
Too much buff. we move back now. nerf. yes yes. nerf. 
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I am the strongest balance warrior 
## Changelog

:cl:
balance: marine armor is now less protective, marginally, and slows you
down |more|
del: Marine Helmets
/:cl:
  • Loading branch information
Erikafox authored Nov 27, 2024
1 parent c83c5c1 commit f25579d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 43 deletions.
3 changes: 0 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12703,9 +12703,6 @@
/obj/item/clothing/suit/armor/vest/marine/heavy,
/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/clothing/head/helmet/marine/security,
/obj/item/clothing/head/helmet/marine,
/obj/item/clothing/head/helmet/marine,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/plate,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/spacesuit_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
desc = "One set of well-rounded tactical armor. While it does not protect the limbs, the vest is fairly durable. The set includes a helmet and vest."
cost = 1500
contains = list(/obj/item/clothing/suit/armor/vest/marine,
/obj/item/clothing/head/helmet/marine)
/obj/item/clothing/head/helmet/bulletproof/x11)
crate_name = "armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma

Expand All @@ -150,6 +150,6 @@
desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece."
cost = 3000
contains = list(/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/clothing/head/helmet/marine)
/obj/item/clothing/head/helmet/bulletproof/x11)
crate_name = "armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma
8 changes: 7 additions & 1 deletion code/modules/clothing/factions/frontiersmen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,18 @@
resistance_flags = FIRE_PROOF
armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)

/obj/item/clothing/head/helmet/marine/frontier
/obj/item/clothing/head/helmet/frontier
name = "frontiersmen reinforced helmet"
desc = "A reinforced Frontiersmen X-11. The front plate has a small window to let the user see."
icon_state = "marine_frontier"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.1
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES

////////////
//Glasses//
Expand Down
32 changes: 0 additions & 32 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -229,38 +229,6 @@
)
content_overlays = TRUE

/obj/item/clothing/head/helmet/marine
name = "tactical combat helmet"
desc = "A tactical black helmet, sealed from outside hazards with a reinforced visor."
icon_state = "marine_command"
item_state = "helmetalt"
armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.1
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
can_flashlight = TRUE
dog_fashion = null

/obj/item/clothing/head/helmet/marine/Initialize(mapload)
set_attached_light(new /obj/item/flashlight/seclite)
update_helmlight()
update_appearance()
. = ..()

/obj/item/clothing/head/helmet/marine/security
name = "marine heavy helmet"
icon_state = "marine_security"

/obj/item/clothing/head/helmet/marine/engineer
name = "marine utility helmet"
icon_state = "marine_engineer"

/obj/item/clothing/head/helmet/marine/medic
name = "marine medic helmet"
icon_state = "marine_medic"

/obj/item/clothing/head/helmet/old
name = "degrading helmet"
desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/ert/frontiersmen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
/datum/outfit/job/frontiersmen/ert/sentry
name = "ERT - Frontiersman Sentry (SKM-24v LMG)"

head = /obj/item/clothing/head/helmet/marine/frontier
head = /obj/item/clothing/head/helmet/frontier
mask = /obj/item/clothing/mask/balaclava
suit = /obj/item/clothing/suit/armor/vest/marine/frontier
suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.1
armor = list("melee" = 35, "bullet" = 50, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.4

/obj/item/clothing/suit/armor/vest/marine/heavy
name = "heavy tactical armor vest"
icon_state = "marine_heavy"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
armor = list("melee" = 60, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.5
armor = list("melee" = 60, "bullet" = 60, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50)
slowdown = 0.8

/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
Expand Down

0 comments on commit f25579d

Please sign in to comment.