Skip to content

Commit

Permalink
Surt helmet module (#12940)
Browse files Browse the repository at this point in the history
* surt hat

* sanity to the attachment dmi

* SOM hat

* separate typepath, plus spell check
  • Loading branch information
Lumipharon authored May 11, 2023
1 parent 56b2d7a commit e35d6c1
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 4 deletions.
2 changes: 2 additions & 0 deletions code/datums/quick_load_outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@

wear_suit = /obj/item/clothing/suit/modular/xenonauten/heavy/surt
mask = /obj/item/clothing/mask/gas/tactical
head = /obj/item/clothing/head/modular/m10x/surt
belt = /obj/item/storage/holster/m25
back = /obj/item/ammo_magazine/flamer_tank/backtank
suit_store = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide
Expand Down Expand Up @@ -1238,6 +1239,7 @@
name = "V-62 Flamethrower Operator"
desc = "Smells like victory. Equipped with an V-62 incinerator and wide nozzle, V-11 equipped for rapid burst fire, heavy armor upgraded with a 'Hades' fireproof module, and a backtank of fuel. Has better than average range and can quickly burn down large areas. It suffers from significant slowdown, lacks an integrated extinguisher, and undisciplined use can result in rapidly consuming all available fuel."

head = /obj/item/clothing/head/modular/som/hades
wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro
belt = /obj/item/storage/holster/belt/pistol/m4a3/som
back = /obj/item/ammo_magazine/flamer_tank/backtank
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@
/obj/item/storage/belt/grenade/b17 = -1,
/obj/item/armor_module/module/valkyrie_autodoc = -1,
/obj/item/armor_module/module/fire_proof = -1,
/obj/item/armor_module/module/fire_proof_helmet = -1,
/obj/item/armor_module/module/tyr_extra_armor = -1,
/obj/item/armor_module/module/tyr_head = -1,
/obj/item/attachable/shoulder_mount = -1,
Expand Down
13 changes: 12 additions & 1 deletion code/modules/clothing/modular_armor/attachments/modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/obj/item/armor_module/module/fire_proof
name = "\improper Surt Pyrotechnical Insulation System"
icon = 'icons/mob/modular/modular_armor_modules.dmi'
desc = "Designed for mounting on modular armor. Providing a near immunity to being bathed in flames, and amazing flame retardant qualities, this is every pyromaniacs' first stop to survival. Will impact mobility."
desc = "Designed for mounting on modular armor. Providing a near immunity to being bathed in flames, and amazing flame retardant qualities, this is every pyromaniac's first stop to survival. Will impact mobility."
icon_state = "mod_fire"
item_state = "mod_fire_a"
soft_armor = list(FIRE = 35)
Expand All @@ -99,6 +99,17 @@
icon_state = "mod_fire_som"
item_state = "mod_fire_som_a"

/obj/item/armor_module/module/fire_proof_helmet

name = "\improper Surt Pyrotechnical Insulation Helmet System"
desc = "Designed for mounting on a modular helmet. Providing a near immunity to being bathed in flames, and amazing flame retardant qualities, this is every pyromaniac's first stop to survival."
icon = 'icons/mob/modular/modular_armor_modules.dmi'
icon_state = "mod_fire_head"
item_state = "mod_fire_head_a"
soft_armor = list(FIRE = 35)
slot = ATTACHMENT_SLOT_HEAD_MODULE
variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "mod_fire_head_xn")

/**
* Extra armor module
*/
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/modular_armor/combat_robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@

attachments_allowed = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/fire_proof_helmet,
/obj/item/armor_module/module/hod_head,
/obj/item/armor_module/module/binoculars,
/obj/item/armor_module/module/binoculars/artemis_mark_two,
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/modular_armor/jaeger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@

attachments_allowed = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/fire_proof_helmet,
/obj/item/armor_module/module/hod_head,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1,
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/modular_armor/modular.dm
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
)
attachments_allowed = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/fire_proof_helmet,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1,
/obj/item/armor_module/module/welding,
Expand Down
15 changes: 13 additions & 2 deletions code/modules/clothing/modular_armor/som.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,25 @@
/obj/item/armor_module/greyscale/badge,
)

/obj/item/clothing/head/modular/som/hades
name = "\improper Hades Helmet System"
desc = "A helmet paired with the 'Hades' armor module, designed for significantly improved protection from fire, without compromising normal durability."
icon_state = "som_helmet_light"
item_state = "som_helmet_light"
soft_armor = list(MELEE = 45, BULLET = 70, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 90, ACID = 50)
attachments_allowed = list(
/obj/item/armor_module/storage/helmet,
/obj/item/armor_module/greyscale/badge,
)

/obj/item/clothing/head/modular/som/veteran
name = "\improper SOM veteran helmet"
desc = "The standard combat helmet worn by SOM combat specialists. State of the art materials provides more protection for more valuable brains."
soft_armor = list(MELEE = 50, BULLET = 75, LASER = 65, ENERGY = 65, BOMB = 55, BIO = 55, FIRE = 60, ACID = 55)

/obj/item/clothing/head/modular/som/lorica
name = "Lorica Helmet System"
desc = "An bulky helmet paired with the 'Lorica' armor module, designed for outstanding protection at the cost of significant weight and reduced flexibility. Substantial additional armor improves protection against all damage."
name = "\improper Lorica Helmet System"
desc = "A bulky helmet paired with the 'Lorica' armor module, designed for outstanding protection at the cost of significant weight and reduced flexibility. Substantial additional armor improves protection against all damage."
icon_state = "som_helmet_lorica"
item_state = "som_helmet_lorica"
soft_armor = list(MELEE = 60, BULLET = 85, LASER = 80, ENERGY = 80, BOMB = 65, BIO = 55, FIRE = 70, ACID = 60)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/modular_armor/xenonauten.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
soft_armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 55, BIO = 55, FIRE = 55, ACID = 60)
attachments_allowed = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/fire_proof_helmet,
/obj/item/armor_module/module/hod_head,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1,
Expand Down Expand Up @@ -211,6 +212,9 @@
/obj/item/clothing/head/modular/m10x/tyr
starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/tyr_head)

/obj/item/clothing/head/modular/m10x/surt
starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/fire_proof_helmet)

/obj/item/clothing/head/modular/m10x/heavy
name = "\improper M10XE pattern marine helmet"
desc = "A standard M10XE Pattern Helmet. This is a modified version of the M10X helmet, offering an enclosed visor apparatus."
Expand Down
5 changes: 4 additions & 1 deletion code/modules/factory/parts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,10 @@ GLOBAL_LIST_INIT(module, list(
/obj/item/factory_part/module_surt
name = "\improper Surt pyrotechnical insulation system"
desc = "An unfinished Surt pyrotechnical insulation system module."
result = /obj/item/armor_module/module/fire_proof
result = list(
/obj/item/armor_module/module/fire_proof,
/obj/item/armor_module/module/fire_proof_helmet,
)

/obj/item/factory_part/module_surt/Initialize(mapload)
. = ..()
Expand Down
3 changes: 3 additions & 0 deletions code/modules/reqs/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,10 @@ ARMOR
contains = list(
/obj/item/armor_module/module/valkyrie_autodoc,
/obj/item/armor_module/module/fire_proof,
/obj/item/armor_module/module/fire_proof_helmet,
/obj/item/armor_module/module/tyr_extra_armor,
/obj/item/armor_module/module/mimir_environment_protection,
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/better_shoulder_lamp,
/obj/item/armor_module/module/hlin_explosive_armor,
/obj/item/armor_module/module/binoculars/artemis_mark_two,
Expand All @@ -940,6 +942,7 @@ ARMOR
name = "Jaeger Surt fireproof module"
contains = list(
/obj/item/armor_module/module/fire_proof,
/obj/item/armor_module/module/fire_proof_helmet,
)
cost = 120

Expand Down
Binary file modified icons/mob/modular/modular_armor_modules.dmi
Binary file not shown.

0 comments on commit e35d6c1

Please sign in to comment.