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

Return of the tur, change in the status of modules and armor, new type of armor #14

Merged
merged 13 commits into from
Jul 18, 2024
Merged

Return of the tur, change in the status of modules and armor, new type of armor #14

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5c84875
Update fusion_engine.dm
Tatarla Jul 14, 2024
d8834dc
балансим статы брони и модулей, возвращаем тюр, изменяем статы броник…
Tatarla Jul 14, 2024
01b919b
Merge branch 'PMC-Unga-Marines:master' into fucion_engine
Tatarla Jul 14, 2024
b2e2e09
Merge branch 'PMC-Unga-Marines:master' into fucion_engine
Tatarla Jul 14, 2024
d8b3268
корректировка статов
Tatarla Jul 15, 2024
6763067
Merge branch 'PMC-Unga-Marines:master' into fucion_engine
Tatarla Jul 15, 2024
a110e1a
Добавил тюр2, перераскидал статы
Tatarla Jul 16, 2024
4262ddd
Merge branch 'PMC-Unga-Marines:master' into fucion_engine
Tatarla Jul 16, 2024
8b731d8
исправления по статам
Tatarla Jul 16, 2024
73cc264
добавление TODO
Tatarla Jul 17, 2024
279418b
Merge branch 'PMC-Unga-Marines:master' into fucion_engine
Tatarla Jul 17, 2024
5f8dd6e
fix
Tatarla Jul 17, 2024
2cb4868
Фикс ошибок
Tatarla Jul 18, 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
10 changes: 1 addition & 9 deletions code/__DEFINES/loadout.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,7 @@ GLOBAL_LIST_INIT(marine_clothes_listed_products, list(
/obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0,"black"),
/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0,"black"),
/obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"),
/* RU TGMC EDIT
/obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"),
RU TGMC EDIT */
/obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"),
/obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"),
/obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"),
Expand Down Expand Up @@ -551,9 +549,7 @@ GLOBAL_LIST_INIT(engineer_clothes_listed_products, list(
/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"),
/obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"),
/obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"),
/* RU TGMC EDIT
/obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"),
RU TGMC EDIT */
/obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"),
/obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"),
/obj/item/armor_module/module/eshield = list(CAT_ARMMOD, "Svalinn Energy Shield System", 0 , "black"),
Expand Down Expand Up @@ -607,9 +603,7 @@ GLOBAL_LIST_INIT(medic_clothes_listed_products, list(
/obj/item/storage/pouch/medkit/medic = list(CAT_POU, "Medkit pouch", 0, "orange"),
/obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"),
/obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"),
/* RU TGMC EDIT
/obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"),
RU TGMC EDIT */
/obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"),
/obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"),
/obj/item/armor_module/module/eshield = list(CAT_ARMMOD, "Svalinn Energy Shield System", 0 , "black"),
Expand Down Expand Up @@ -668,9 +662,7 @@ GLOBAL_LIST_INIT(smartgunner_clothes_listed_products, list(
/obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0, "black"),
/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"),
/obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"),
/* RU TGMC EDIT
/obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"),
RU TGMC EDIT */
/obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"),
/obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"),
/obj/item/clothing/mask/gas = list(CAT_MAS, "Transparent gas mask", 0,"black"),
Expand Down Expand Up @@ -734,8 +726,8 @@ GLOBAL_LIST_INIT(leader_clothes_listed_products, list(
/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"),
/obj/item/storage/pouch/explosive = list(CAT_POU, "Explosive pouch", 0, "black"),
/obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"),
/* RUTGMC EDIT
/obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"),
/* RUTGMC EDIT
Helg2 marked this conversation as resolved.
Show resolved Hide resolved
/obj/effect/vendor_bundle/tyr/two = list(CAT_ARMMOD, "Mark 2 Tyr extra armor set", 0,"black"),
/obj/effect/vendor_bundle/mimir/two = list(CAT_ARMMOD, "Mark 2 Mimir Resistance set", 0,"black"),
RU TGMC EDIT */
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/defibrillator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,4 +373,3 @@

/obj/item/defibrillator/gloves/update_icon_state()
return

6 changes: 2 additions & 4 deletions code/game/objects/machinery/vending/new_marine_vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@
gear_to_spawn = list(
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1,
/obj/item/clothing/mask/gas/tactical,
// /obj/item/armor_module/module/mimir_environment_protection/mark1, RU TGMC EDIT
/obj/item/armor_module/module/mimir_environment_protection/mark1,
)

/obj/effect/vendor_bundle/vali
Expand All @@ -867,14 +867,12 @@
/obj/item/storage/holster/blade/machete/full_harvester,
/obj/item/paper/chemsystem,
)
/* RU TGMC EDIT
/obj/effect/vendor_bundle/tyr
desc = "A set of specialized gear for improved close-quarters combat longevitiy."
gear_to_spawn = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/tyr_extra_armor/mark1,
)
RU TGMC EDIT */
/obj/effect/vendor_bundle/robot/essentials
gear_to_spawn = list(
/obj/item/clothing/under/marine/robotic,
Expand Down Expand Up @@ -911,7 +909,7 @@ RU TGMC EDIT */
/obj/effect/vendor_bundle/tyr/two
desc = "A set of advanced gear for improved close-quarters combat longevitiy."
gear_to_spawn = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/tyr_head/mark2
/obj/item/armor_module/module/tyr_extra_armor,
)

Expand Down
34 changes: 20 additions & 14 deletions code/modules/clothing/modular_armor/attachments/modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,17 @@
icon_state = "mod_armor"
item_state = "mod_armor_a"
attachment_layer = COLLAR_LAYER
soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 5, BIO = 10, FIRE = 15, ACID = 10)
slowdown = 0
soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5)
slowdown = 0.2
slot = ATTACHMENT_SLOT_MODULE

/obj/item/armor_module/module/tyr_extra_armor/mark1
name = "\improper Mark 1 Tyr Armor Reinforcement"
desc = "Designed for mounting on modular armor. A substantial amount of additional armor plating designed to grant the user extra protection against threats, ranging from xeno slashes to friendly fire incidents. This older version has worse protection. Will greatly impact mobility."
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "mod_armor_lower"
item_state = "mod_armor_lower_a"
soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10)
slowdown = 0.4
soft_armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5)
slowdown = 0.3

/obj/item/armor_module/module/tyr_extra_armor/som
name = "\improper Lorica Armor Reinforcement"
Expand All @@ -148,17 +148,23 @@
variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "tyr_head_xn")
icon_state = "tyr_head"
item_state = "tyr_head_a"
soft_armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10)
soft_armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5)
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
slot = ATTACHMENT_SLOT_HEAD_MODULE

/obj/item/armor_module/module/tyr_head/mark2
name = "Tyr 2 Helmet System"
desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most damaging hazards, ranging from xeno slashes to friendly fire incidents."
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5)

/obj/item/armor_module/module/hod_head
name = "\improper Hod Helmet System"
desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most gunshot wounds by providing high internal padding within the helmet's structure."
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/mob/modular/modular_armor_modules.dmi'
icon_state = "mod_ff_head"
item_state = "mod_ff_head_a"
soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15)
slot = ATTACHMENT_SLOT_HEAD_MODULE
slowdown = 1.0

/**
* Environment protection module
Expand All @@ -169,7 +175,7 @@
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 = 40, FIRE = 0, ACID = 30)
soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10)
slowdown = 0.2
slot = ATTACHMENT_SLOT_MODULE
///siemens coefficient mod for gas protection.
Expand All @@ -196,8 +202,8 @@
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."
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "mod_biohazard"
item_state = "mod_biohazard_a"
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, FIRE = 0, ACID = 15)
slowdown = 0.2
soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5)
slowdown = 0.3

//SOM version
/obj/item/armor_module/module/mimir_environment_protection/som
Expand All @@ -214,14 +220,14 @@
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 = 15, FIRE = 0, ACID = 0)
soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10)
slowdown = 0
slot = ATTACHMENT_SLOT_HEAD_MODULE

/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1 //gas protection
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 = 15, FIRE = 0, ACID = 15)
soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5)

//Explosive defense armor
/obj/item/armor_module/module/hlin_explosive_armor
Expand All @@ -243,8 +249,8 @@
icon = 'icons/mob/modular/modular_armor_modules.dmi'
icon_state = "mod_ff"
item_state = "mod_ff_a"
soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
slowdown = 0.2
soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15)
slowdown = 1.0
slot = ATTACHMENT_SLOT_MODULE

/obj/item/armor_module/module/chemsystem
Expand Down Expand Up @@ -288,7 +294,7 @@
icon_state = "mod_eshield"
item_state = "mod_eshield_a"
slot = ATTACHMENT_SLOT_MODULE
soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
soft_armor = list(MELEE = -5, BULLET = -5, LASER = -5, ENERGY = -5, BOMB = -5, BIO = -5, FIRE = -5, ACID = -5)

///Current shield Health
var/shield_health = 0
Expand Down
37 changes: 7 additions & 30 deletions code/modules/clothing/modular_armor/xenonauten.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/obj/item/clothing/suit/modular/xenonauten
name = "\improper Xenonauten-M pattern armored vest"
desc = "A XN-M vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a medium variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50)
soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
icon_state = "chest"
item_state = "chest"
icon = null
Expand Down Expand Up @@ -71,7 +71,7 @@
/obj/item/clothing/suit/modular/xenonauten/light
name = "\improper Xenonauten-L pattern armored vest"
desc = "A XN-L vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a light variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
soft_armor = list(MELEE = 35, BULLET = 55, LASER = 55, ENERGY = 50, BOMB = 40, BIO = 45, FIRE = 45, ACID = 45)
soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35)
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
greyscale_config = /datum/greyscale_config/xenonaut/light

Expand All @@ -84,7 +84,7 @@
/obj/item/clothing/suit/modular/xenonauten/heavy
name = "\improper Xenonauten-H pattern armored vest"
desc = "A XN-H vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a heavy variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60)
soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)
slowdown = SLOWDOWN_ARMOR_VERY_HEAVY
greyscale_config = /datum/greyscale_config/xenonaut/heavy

Expand Down Expand Up @@ -122,9 +122,8 @@
name = "\improper TerraGov standard flak jacket"
desc = "A flak jacket used by dropship pilots to protect themselves while flying in the cockpit. Excels in protecting the wearer against high-velocity solid projectiles."
flags_item = NONE
soft_armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 25, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30)
slowdown = 0.25

soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)
slowdown = SLOWDOWN_ARMOR_MEDIUM
greyscale_config = /datum/greyscale_config/xenonaut/pilot

allowed = list(
Expand All @@ -146,35 +145,13 @@
/obj/item/weapon/energy/sword,
)

attachments_allowed = list(
/obj/item/armor_module/module/better_shoulder_lamp,
/obj/item/armor_module/module/valkyrie_autodoc,
/obj/item/armor_module/module/fire_proof,
/obj/item/armor_module/module/tyr_extra_armor,
/obj/item/armor_module/module/tyr_extra_armor/mark1,
/obj/item/armor_module/module/mimir_environment_protection,
/obj/item/armor_module/module/mimir_environment_protection/mark1,
/obj/item/armor_module/module/hlin_explosive_armor,
/obj/item/armor_module/module/ballistic_armor,
/obj/item/armor_module/module/chemsystem,
/obj/item/armor_module/module/eshield,

/obj/item/armor_module/storage/general,
/obj/item/armor_module/storage/ammo_mag,
/obj/item/armor_module/storage/engineering,
/obj/item/armor_module/storage/medical,
/obj/item/armor_module/storage/injector,
/obj/item/armor_module/storage/integrated,
/obj/item/armor_module/armor/badge,
)

Tatarla marked this conversation as resolved.
Show resolved Hide resolved
//Xenonauten helmets
/obj/item/clothing/head/modular/m10x
name = "\improper M10X pattern marine helmet"
desc = "A standard M10 Pattern Helmet with attach points. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'."

item_state_worn = TRUE
soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50)
soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
attachments_allowed = list(
/obj/item/armor_module/module/tyr_head,
/obj/item/armor_module/module/fire_proof_helmet,
Expand Down Expand Up @@ -243,7 +220,7 @@
/obj/item/clothing/head/modular/m10x/leader
name = "\improper M11X pattern leader helmet"
desc = "A slightly fancier helmet for marine leaders. This one has cushioning to project your fragile brain."
soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 55)
soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)

/obj/item/clothing/suit/modular/xenonauten/light/mk1
name = "\improper Xenonauten-L-MK1 pattern armored vest"
Expand Down
Loading