Skip to content

Commit

Permalink
Update wintercoats, sort files (#2550)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Ports tgstation/tgstation#72983

![216873566-aa3eb7e8-4bba-40a1-90c6-494c0638919c](https://github.com/shiptest-ss13/Shiptest/assets/81882910/9201fc4c-15e0-458d-a9d6-df348d4087a1)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl: Halcyon
add: Winter coats have a new coat of paint.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Dec 8, 2023
1 parent 89b2647 commit 35afc6d
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 26 deletions.
58 changes: 32 additions & 26 deletions code/modules/clothing/suits/wintercoats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,28 @@
/obj/item/clothing/suit/hooded/wintercoat
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
icon = 'icons/obj/clothing/suits/wintercoat.dmi'
mob_overlay_icon = 'icons/mob/clothing/suits/wintercoat.dmi'
icon_state = "coatwinter"
item_state = "coatwinter"
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
allowed = list( /obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/toy,
/obj/item/storage/fancy/cigarettes,
/obj/item/lighter,
)

/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
icon_state = "winterhood"
icon = 'icons/obj/clothing/head/winterhood.dmi'
mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
icon_state = "hood_winter"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
Expand All @@ -33,7 +43,7 @@
allowed = GLOB.security_wintercoat_allowed

/obj/item/clothing/head/hooded/winterhood/captain
icon_state = "winterhood_captain"
icon_state = "hood_captain"
armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)

/obj/item/clothing/suit/hooded/wintercoat/security
Expand All @@ -48,7 +58,7 @@
allowed = GLOB.security_wintercoat_allowed

/obj/item/clothing/head/hooded/winterhood/security
icon_state = "winterhood_security"
icon_state = "hood_security"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)

/obj/item/clothing/suit/hooded/wintercoat/medical
Expand All @@ -60,7 +70,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical

/obj/item/clothing/head/hooded/winterhood/medical
icon_state = "winterhood_medical"
icon_state = "hood_medical"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)

/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
Expand All @@ -70,7 +80,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical/paramedic

/obj/item/clothing/head/hooded/winterhood/medical/paramedic
icon_state = "winterhood_paramedic"
icon_state = "hood_paramedic"

/obj/item/clothing/suit/hooded/wintercoat/science
name = "science winter coat"
Expand All @@ -81,7 +91,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/science

/obj/item/clothing/head/hooded/winterhood/science
icon_state = "winterhood_science"
icon_state = "hood_science"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)

/obj/item/clothing/suit/hooded/wintercoat/engineering
Expand All @@ -93,7 +103,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering

/obj/item/clothing/head/hooded/winterhood/engineering
icon_state = "winterhood_engineer"
icon_state = "hood_engineer"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)

/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
Expand All @@ -103,7 +113,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos

/obj/item/clothing/head/hooded/winterhood/engineering/atmos
icon_state = "winterhood_atmos"
icon_state = "hood_atmos"

/obj/item/clothing/suit/hooded/wintercoat/hydro
name = "hydroponics winter coat"
Expand All @@ -113,7 +123,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro

/obj/item/clothing/head/hooded/winterhood/hydro
icon_state = "winterhood_hydro"
icon_state = "hood_hydro"

/obj/item/clothing/suit/hooded/wintercoat/cargo
name = "cargo winter coat"
Expand All @@ -122,7 +132,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo

/obj/item/clothing/head/hooded/winterhood/cargo
icon_state = "winterhood_cargo"
icon_state = "hood_cargo"

/obj/item/clothing/suit/hooded/wintercoat/miner
name = "mining winter coat"
Expand All @@ -133,7 +143,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/miner

/obj/item/clothing/head/hooded/winterhood/miner
icon_state = "winterhood_miner"
icon_state = "hood_miner"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)

// Inteq
Expand All @@ -147,28 +157,24 @@
supports_variations = KEPORI_VARIATION

/obj/item/clothing/head/hooded/winterhood/security/inteq
icon_state = "winterhood_inteq"
icon_state = "hood_inteq"
supports_variations = KEPORI_VARIATION

/obj/item/clothing/suit/hooded/coat/inteq
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
name = "inteq hooded coat"
desc = "A hooded coat with a fur trim around the hood, comfy! It has a small 'IRMG' embroidered onto the shoulder."
icon_state = "hoodieinteq"
item_state = "hoodieinteq"
icon_state = "coatinteq_alt"
item_state = "coatinteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
hoodtype = /obj/item/clothing/head/hooded/coat/inteq
hoodtype = /obj/item/clothing/head/hooded/winterhood/security/inteq/alt

/obj/item/clothing/head/hooded/coat/inteq
/obj/item/clothing/head/hooded/winterhood/security/inteq/alt
name = "inteq hood"
desc = "A comfortable looking brown hood."
icon_state = "hoodinteq"
item_state = "hoodinteq"
icon_state = "hood_inteq_alt"
item_state = "hood_inteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)

/obj/item/clothing/suit/hooded/coat/inteq/Initialize()
. = ..()
allowed = GLOB.security_wintercoat_allowed

// CentCom
/obj/item/clothing/suit/hooded/wintercoat/centcom
name = "centcom winter coat"
Expand All @@ -183,7 +189,7 @@
allowed += GLOB.security_wintercoat_allowed

/obj/item/clothing/head/hooded/winterhood/centcom
icon_state = "winterhood_centcom"
icon_state = "hood_centcom"
armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)

// SolGov
Expand All @@ -197,5 +203,5 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/solgov

/obj/item/clothing/head/hooded/winterhood/solgov
icon_state = "winterhood_solgov"
icon_state = "hood_solgov"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file added icons/mob/clothing/head/winterhood.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/hooded.dmi
Binary file not shown.
Binary file added icons/mob/clothing/suits/wintercoat.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file added icons/obj/clothing/head/winterhood.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/hooded.dmi
Binary file not shown.
Binary file added icons/obj/clothing/suits/wintercoat.dmi
Binary file not shown.

0 comments on commit 35afc6d

Please sign in to comment.