Skip to content

Commit

Permalink
Paradise's soul removal part 7: engineering jumpsuits and accessories (
Browse files Browse the repository at this point in the history
…#26641)

* Engineering jumpsuit resprite/refresh

* Engineering berets resprite/refresh

* CE mantle resprite

* Grey CE pants consistency fix
  • Loading branch information
ElorgRHG authored Sep 14, 2024
1 parent e571255 commit e2a7c80
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions code/datums/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,11 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "security_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if("Chief Engineer")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_s")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_engineer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Station Engineer")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engine_s")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engineer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Life Support Specialist")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/client/preference/character.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CHIEF)
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_s")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_engineer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
Expand All @@ -1447,7 +1447,7 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_ENGINEER)
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engine_s")
clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "engineer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
Expand Down
41 changes: 21 additions & 20 deletions code/modules/clothing/under/jobs/engineering_jumpsuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,33 @@
"Human" = 'icons/mob/clothing/under/engineering.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/engineering.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/engineering.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/engineering.dmi'
"Grey" = 'icons/mob/clothing/species/grey/under/engineering.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/engineering.dmi'
)

/obj/item/clothing/under/rank/engineering/chief_engineer
desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
name = "chief engineer's jumpsuit"
icon_state = "chiefengineer"
item_state = "chief"
item_color = "chief"
desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
icon_state = "chief_engineer"
item_state = "chief_engineer"
item_color = "chief_engineer"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 200, ACID = 35)
resistance_flags = NONE

/obj/item/clothing/under/rank/engineering/chief_engineer/skirt
desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
name = "chief engineer's jumpskirt"
icon_state = "chieff"
item_color = "chieff"
desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
icon_state = "chief_engineer_skirt"
item_color = "chief_engineer_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
dyeable = TRUE
dyeing_key = DYE_REGISTRY_JUMPSKIRT

/obj/item/clothing/under/rank/engineering/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
name = "atmospheric technician's jumpsuit"
desc = "It's a jumpsuit worn by atmospheric technicians."
icon_state = "atmos"
item_state = "atmos_suit"
item_state = "atmos"
item_color = "atmos"
resistance_flags = NONE

Expand Down Expand Up @@ -63,18 +64,18 @@
return 1

/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt
desc = "It's a jumpskirt worn by atmospheric technicians."
name = "atmospheric technician's jumpskirt"
icon_state = "atmosf"
item_color = "atmosf"
desc = "It's a jumpskirt worn by atmospheric technicians."
icon_state = "atmos_skirt"
item_color = "atmos_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

/obj/item/clothing/under/rank/engineering/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
name = "engineer's jumpsuit"
icon_state = "engine"
item_state = "engi_suit"
item_color = "engine"
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
icon_state = "engineer"
item_state = "engineer"
item_color = "engineer"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 75, ACID = 10)
resistance_flags = NONE

Expand All @@ -83,8 +84,8 @@
random_sensor = FALSE

/obj/item/clothing/under/rank/engineering/engineer/skirt
desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
name = "engineer's jumpskirt"
icon_state = "enginef"
item_color = "enginef"
desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
icon_state = "engineer_skirt"
item_color = "engineer_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
Binary file modified icons/mob/clothing/head/beret.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/head/beret.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/under/engineering.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/under/engineering.dmi
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/head/beret.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/under/engineering.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/engineering.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/head/beret.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/engineering.dmi
Binary file not shown.

0 comments on commit e2a7c80

Please sign in to comment.