Skip to content

Commit

Permalink
Paradise's soul removal part 7.25: firesuits, radsuits, workboots and…
Browse files Browse the repository at this point in the history
… all magboots (#26671)

* Firefighter suit, atmos firesuit and radiation suit resprite

* Atmospherics firefighter helmet and radiation hood resprite

* Magboots resprite

* Workboots resprite

* Removes old firesuit, hardhat, radsuit and radhood sprites

* Deconflict

* Deconflict 2

* Very slight syndicate magboots adjustment

* Inhands, suggestions and icon renames

* Unused heavy firesuit removal

* Sprites for new kidan
  • Loading branch information
ElorgRHG authored Sep 23, 2024
1 parent 9d968e6 commit 55a8675
Show file tree
Hide file tree
Showing 32 changed files with 51 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/holosign_creator/atmos(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/suit/fire/firefighter/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/rpd(src)
Expand Down
15 changes: 11 additions & 4 deletions code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@
/obj/item/clothing/head/hardhat/atmos
name = "atmospheric technician's firefighting helmet"
desc = "A firefighter's helmet, able to keep the user cool in any situation."
icon = 'icons/obj/clothing/head/utility.dmi'
icon_override = 'icons/mob/clothing/head/utility.dmi'
icon_state = "hardhat0_atmos"
item_state = "hardhat0_atmos"
item_color = "atmos"
item_state = 'icons/mob/clothing/head/utility.dmi'
flags = STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
heat_protection = HEAD
Expand All @@ -101,6 +103,11 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = null
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
"Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/head/utility.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/utility.dmi'
)
68 changes: 39 additions & 29 deletions code/modules/clothing/suits/utility.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,27 @@
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/fire/firefighter
icon_state = "firesuit"
icon = 'icons/obj/clothing/suits/utility.dmi'
icon_override = 'icons/mob/clothing/suits/utility.dmi'
icon_state = "firefighter"
item_state = "firefighter"

sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)

/obj/item/clothing/suit/fire/heavy
name = "firesuit"
desc = "A suit that protects against extreme fire and heat."
//icon_state = "thermal"
item_state = "ro_suit"
w_class = WEIGHT_CLASS_BULKY
slowdown = 1.5

/obj/item/clothing/suit/fire/atmos
"Tajaran" = 'icons/mob/clothing/species/tajaran/suits/utility.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suits/utility.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suits/utility.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi'
)

/obj/item/clothing/suit/fire/firefighter/atmos
name = "firesuit"
desc = "An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame."
icon_state = "atmos_firesuit"
item_state = "firesuit_atmos"
icon_state = "firefighter_atmos"
item_state = "firefighter_atmos"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT

sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)

/*
* Bomb protection
*/
Expand Down Expand Up @@ -124,7 +119,10 @@
*/
/obj/item/clothing/head/radiation
name = "radiation hood"
icon_state = "rad"
icon = 'icons/obj/clothing/head/utility.dmi'
icon_state = "radhood"
item_state = 'icons/mob/clothing/head/utility.dmi'
icon_override = 'icons/mob/clothing/head/utility.dmi'
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
flags = BLOCKHAIR|THICKMATERIAL
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
Expand All @@ -134,16 +132,22 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
"Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/head/utility.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/utility.dmi'
)

/obj/item/clothing/suit/radiation
name = "radiation suit"
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
icon_state = "rad"
item_state = "rad_suit"
icon = 'icons/obj/clothing/suits/utility.dmi'
icon_override = 'icons/mob/clothing/suits/utility.dmi'
icon_state = "radsuit"
item_state = "radsuit"
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
Expand All @@ -158,5 +162,11 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
"Tajaran" = 'icons/mob/clothing/species/tajaran/suits/utility.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suits/utility.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suits/utility.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi'
)
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file added icons/mob/clothing/head/utility.dmi
Binary file not shown.
Binary file added icons/mob/clothing/species/drask/head/utility.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/shoes.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/suits/utility.dmi
Binary file not shown.
Binary file added icons/mob/clothing/species/grey/head/utility.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/suits/utility.dmi
Binary file not shown.
Binary file added icons/mob/clothing/species/kidan/head/utility.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/kidan/suits/utility.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added icons/mob/clothing/species/vox/head/utility.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/shoes.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/suits/utility.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/utility.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file added icons/obj/clothing/head/utility.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/utility.dmi
Binary file not shown.

0 comments on commit 55a8675

Please sign in to comment.