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.

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

MAA Hardsuit Sprite Update #2667

Merged
merged 7 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions nsv13/code/modules/clothing/custom_clothes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,11 @@
/obj/item/clothing/head/helmet/space/hardsuit/master_at_arms
name = "Master-At-Arm's Bombsuit Helmet"
desc = "Use in case of bomb."
icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets
icon = 'nsv13/icons/obj/clothing/hats.dmi'
worn_icon = 'nsv13/icons/mob/head.dmi'
icon_state = "hardsuit0_maa_bombsuit"
item_state = "maa_bombsuit"
worn_icon_state = "maa_bombsuit"
armor = list("melee" = 25, "bullet" = 15, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 85, "acid" = 50)
icon_state = "hardsuit0-maa"
hardsuit_type = "maa"
armor = list("melee" = 20, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 65, "stamina" = 10)
min_cold_protection_temperature = EMERGENCY_HELM_MIN_TEMP_PROTECT

/obj/item/clothing/suit/space/hardsuit/master_at_arms
Expand All @@ -537,10 +536,9 @@
icon = 'nsv13/icons/obj/clothing/suits.dmi'
worn_icon = 'nsv13/icons/mob/suit.dmi'
icon_state = "maa_bombsuit"
item_state = "maa_bombsuit"
armor = list("melee" = 25, "bullet" = 15, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 85, "acid" = 50)
armor = list("melee" = 20, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 100, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 65, "stamina" = 10)
min_cold_protection_temperature = EMERGENCY_SUIT_MIN_TEMP_PROTECT
slowdown = 2
slowdown = 1.5
permeability_coefficient = 0.01
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/master_at_arms

Expand Down
Binary file modified nsv13/icons/mob/head.dmi
Binary file not shown.
Binary file modified nsv13/icons/mob/suit.dmi
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/suits.dmi
Binary file not shown.
Loading