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.

Sign up for GitHub

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

Jump to bottom

Adds a new jacket for the Commanding Officer #3963

Merged
merged 7 commits into from
Jul 27, 2023
Merged

Adds a new jacket for the Commanding Officer #3963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4caddf
Automatic changelog for PR #3470 [ci skip]
BeagleGaming1 Jun 20, 2023
19060a1
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 20, 2023
8d5e539
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 29, 2023
2f04a5f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 8, 2023
1332f94
jacket
BeagleGaming1 Jul 21, 2023
116dcad
Update uscm_ship.dm
BeagleGaming1 Jul 27, 2023
8ecc9c7
Update code/modules/gear_presets/uscm_ship.dm
BeagleGaming1 Jul 27, 2023
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
5 changes: 5 additions & 0 deletions code/modules/clothing/suits/marine_coat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@
desc = "A Navy regulation dress blues coat for high-ranking officers. For those who wish for style and authority."
icon_state = "co_suit"

/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon
name = "commanding officer falcon jacket"
desc = "A refurbished jacket liner tailor made for a senior officer. This liner has become more of a proper piece of attire, with a new layer of fabric, wrist cuffs, front pockets, and a custom embroidered falcon on the back. This jacket will keep its wearer warm no matter the circumstance, from a cool Sunday drive to chilly autumn's eve."
icon_state = "co_falcon"

/obj/item/clothing/suit/storage/jacket/marine/dress/general
name = "general's jacket"
desc = "A black trench coat with gold metallic trim. Flashy, highly protective, and over-the-top. Fit for a king - or, in this case, a General. Has quite a few pockets."
Expand Down
7 changes: 7 additions & 0 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,13 @@
role_comm_title = "CO"
minimum_age = 35

dress_over = list(
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white,
/obj/item/clothing/suit/storage/jacket/marine/dress/officer/black,
/obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit,
/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon,
)

/datum/equipment_preset/uscm_ship/commander/council/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD)
Expand Down
Binary file modified icons/mob/humans/onmob/suit_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
View file
Open in desktop
Binary file not shown.