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

[MIRROR] Chief Engineer turtlenecks and garment changes. #2589

Merged
merged 1 commit into from
Mar 28, 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
4 changes: 4 additions & 0 deletions code/game/objects/items/storage/garment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt(src)
new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src)
new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
new /obj/item/clothing/gloves/latex/nitrile(src)
Expand All @@ -134,6 +136,8 @@
/obj/item/storage/bag/garment/engineering_chief/PopulateContents()
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/clothing/gloves/chief_engineer(src)
Expand Down
8 changes: 8 additions & 0 deletions code/modules/cargo/packs/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,14 @@
contains = list(/obj/item/circuitboard/computer/sat_control)
crate_name= "shield control board crate"

/datum/supply_pack/engineering/ceturtlenecks
name = "Chief Engineer Turtlenecks"
desc = "Contains the CE's turtleneck and turtleneck skirt."
cost = CARGO_CRATE_VALUE * 2
access = ACCESS_CE
contains = list(/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck,
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt,
)

/// Engine Construction

Expand Down
19 changes: 19 additions & 0 deletions code/modules/clothing/under/jobs/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,25 @@
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck
name = "chief engineer's turtleneck"
desc = "A yellow turtleneck and white khakis, for a chief engineer with a superior sense of style."
icon_state = "ceturtle"
inhand_icon_state = "y_suit"
can_adjust = TRUE
alt_covers_chest = TRUE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY

/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt
name = "chief engineer's turtleneck skirt"
desc = "A yellow turtleneck and white khaki skirt, for a chief engineer with a superior sense of style."
icon_state = "ceturtle_skirt"
inhand_icon_state = "y_suit"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/engineering/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians. Made from fire resistant materials."
name = "atmospheric technician's jumpsuit"
Expand Down
Binary file modified icons/mob/clothing/under/engineering.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/engineering.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/clothing/under/engineering.dmi
Binary file not shown.
Binary file not shown.
Loading