Skip to content

Commit

Permalink
Mimir great again V2 (#670)
Browse files Browse the repository at this point in the history
* Mimir buff

* Price change

* Price change 2

* Gas protection and acid well damage redacted

* Price buff

* Lidl fix

* Lidl price fix 2
  • Loading branch information
CheBokJam authored Nov 29, 2024
1 parent 5b010de commit 0fa494f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
24 changes: 13 additions & 11 deletions code/modules/clothing/modular_armor/attachments/modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@
*/
/obj/item/armor_module/module/mimir_environment_protection
name = "\improper Mark 2 Mimir Environmental Resistance System"
desc = "Designed for mounting on modular armor. This newer model provides great resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to xeno gas clouds. Will impact mobility."
desc = "Designed for mounting on modular armor. This newer model provides great resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to any gas clouds. Will impact mobility."
icon = 'icons/mob/modular/modular_armor_modules.dmi'
icon_state = "mod_biohazard"
item_state = "mod_biohazard_a"
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10)
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 25)
slowdown = 0.2
slot = ATTACHMENT_SLOT_MODULE
///siemens coefficient mod for gas protection.
///siemens (electro resist) coefficient mod for gas protection.
var/siemens_coefficient_mod = -0.9
///permeability coefficient mod for gas protection.
var/permeability_coefficient_mod = -1
Expand All @@ -205,11 +205,13 @@

/obj/item/armor_module/module/mimir_environment_protection/mark1
name = "\improper Mark 1 Mimir Environmental Resistance System"
desc = "Designed for mounting on modular armor. This older model provides minor resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to xeno gas clouds. Will impact mobility."
desc = "Designed for mounting on modular armor. This older model provides minor resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user almost impervious to any gas clouds. Will impact mobility."
icon_state = "mod_biohazard"
item_state = "mod_biohazard_a"
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5)
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 10)
slowdown = 0.3
permeability_coefficient_mod = -0.5
gas_transfer_coefficient_mod = -0.5

//SOM version
/obj/item/armor_module/module/mimir_environment_protection/som
Expand All @@ -220,20 +222,20 @@
//soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 25, FIRE = 0, ACID = 20)

/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet
name = "Mimir Environmental Helmet System"
desc = "Designed for mounting on a modular helmet. Provides good resistance to xeno gas clouds"
name = "Mark 2 Mimir Environmental Helmet System"
desc = "Designed for mounting on a modular helmet. Provides good resistance to xeno gas clouds."
icon = 'icons/mob/modular/modular_armor_modules.dmi'
icon_state = "mimir_head"
item_state = "mimir_head_a"
variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "mimir_head_xn")
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10)
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 25)
slowdown = 0
slot = ATTACHMENT_SLOT_HEAD_MODULE

/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1 //gas protection
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1
name = "Mark 1 Mimir Environmental Helmet System"
desc = "Designed for mounting on a modular helmet. This older model provides minor resistance to acid and biological attacks. Pairing this with a Mimir suit module and mask will make the user impervious to xeno gas clouds."
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5)
desc = "Designed for mounting on a modular helmet. This older model provides minor resistance to acid and biological attacks."
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 10)

//Explosive defense armor
/obj/item/armor_module/module/hlin_explosive_armor
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reqs/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/mimir_environment_protection,
)
cost = 120
cost = 160

/datum/supply_packs/armor/modular/attachments/artemis_mark_two
name = "Freyr Mark 2 helmet module"
Expand Down
5 changes: 3 additions & 2 deletions code/modules/xenomorph/acidwell.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,10 @@
charges_used ++

if(!isxeno(stepper))
var/mob/living/carbon/human/H = stepper
stepper.next_move_slowdown += charges * 2 //Acid spray has slow down so this should too; scales with charges, Min 2 slowdown, Max 10
stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_L_FOOT, ACID, penetration = 33)
stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_R_FOOT, ACID, penetration = 33)
stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_L_FOOT, ACID, penetration = 33 - 20 * H.get_permeability_protection()) //Wearing mimir MK1/2 will soften damage from wells by reducing AP
stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_R_FOOT, ACID, penetration = 33 - 20 * H.get_permeability_protection()) //without providing full protection against them
stepper.visible_message(span_danger("[stepper] is immersed in [src]'s acid!") , \
span_danger("We are immersed in [src]'s acid!") , null, 5)
playsound(stepper, "sound/bullets/acid_impact1.ogg", 10 * charges)
Expand Down

0 comments on commit 0fa494f

Please sign in to comment.