diff --git a/aurorastation.dme b/aurorastation.dme index e8db1b878a8..b4ff8f37cd3 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1406,6 +1406,7 @@ #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" #include "code\modules\clothing\sets\acting_captain.dm" +#include "code\modules\clothing\sets\captain.dm" #include "code\modules\clothing\shoes\colour.dm" #include "code\modules\clothing\shoes\jobs.dm" #include "code\modules\clothing\shoes\leg_guard.dm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 57489fa2c3d..df5f5834a62 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -9,30 +9,24 @@ icon_off = "capsecureoff" /obj/structure/closet/secure_closet/captains/fill() - //Appearance + // Backpack if(prob(50)) new /obj/item/storage/backpack/captain(src) else new /obj/item/storage/backpack/satchel_cap(src) - new /obj/item/clothing/suit/captunic(src) - new /obj/item/clothing/suit/captunic/capjacket(src) - new /obj/item/clothing/head/caphat/cap(src) - new /obj/item/clothing/head/bandana/captain(src) - new /obj/item/clothing/under/rank/captain(src) - new /obj/item/clothing/suit/storage/vest(src) - new /obj/item/clothing/gloves/captain(src) + // Armor new /obj/item/clothing/head/helmet(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/under/dress/dress_cap(src) - new /obj/item/clothing/head/caphat/formal(src) - new /obj/item/clothing/under/captainformal(src) + new /obj/item/clothing/suit/storage/vest(src) //Tools new /obj/item/device/radio/headset/heads/captain(src) new /obj/item/device/radio/headset/heads/captain/alt(src) new /obj/item/gun/energy/disruptorpistol(src) new /obj/item/device/flash(src) new /obj/item/melee/telebaton(src) - // acting captain briefcase + // uniform briefcases + new /obj/item/storage/briefcase/nt/captain(src) + new /obj/item/storage/briefcase/nt/captain_white(src) + new /obj/item/storage/briefcase/nt/captain_formal(src) new /obj/item/storage/briefcase/nt/acap(src) /obj/structure/closet/secure_closet/captains2 diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 411c9d33efa..600f9fb677a 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -1,9 +1,3 @@ -/obj/item/clothing/gloves/captain - desc = "Regal blue gloves, with a nice gold trim. Swanky." - name = "captain's gloves" - icon_state = "captain" - item_state = "captain" - /obj/item/clothing/gloves/cyborg desc = "beep boop borp" name = "cyborg gloves" diff --git a/code/modules/clothing/head/bandanas.dm b/code/modules/clothing/head/bandanas.dm index 5a2c81518c3..ae62a802af0 100644 --- a/code/modules/clothing/head/bandanas.dm +++ b/code/modules/clothing/head/bandanas.dm @@ -29,13 +29,6 @@ item_state = "bandana_red" // Departmental bandanas. By Wowzewow (Wezzy). - -/obj/item/clothing/head/bandana/captain - name = "captain's bandana" - desc = "It's the captain's bandana with some fine nanotech lining. All hands on deck!" - icon_state = "bandana_captain" - item_state = "bandana_captain" - /obj/item/clothing/head/bandana/security name = "security bandana" desc = "It's a security bandana with some fine nanotech lining. Great for holding back your thick mullet while chasing perps." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 377e8293835..0c3547e3d0b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -5,26 +5,6 @@ icon_state = "chefhat" item_state = "chefhat" -//Captain -/obj/item/clothing/head/caphat - name = "captain's hat" - icon_state = "captain" - desc = "It's good being the king." - item_state_slots = list( - slot_l_hand_str = "caphat", - slot_r_hand_str = "caphat" - ) - -/obj/item/clothing/head/caphat/cap - name = "captain's cap" - desc = "You fear to wear it for the negligence it brings." - icon_state = "capcap" - -/obj/item/clothing/head/caphat/formal - name = "parade hat" - desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." - icon_state = "officercap" - //HOP /obj/item/clothing/head/caphat/hop name = "crew resource's hat" diff --git a/code/modules/clothing/sets/captain.dm b/code/modules/clothing/sets/captain.dm new file mode 100644 index 00000000000..9c3a806ba42 --- /dev/null +++ b/code/modules/clothing/sets/captain.dm @@ -0,0 +1,207 @@ +// Standard +/obj/item/clothing/head/caphat + name = "captain's hat" + desc = "It's good being the king." + icon_state = "captain" + item_state_slots = list( + slot_l_hand_str = "caphat", + slot_r_hand_str = "caphat" + ) + +/obj/item/clothing/head/caphat/cap + name = "captain's cap" + desc = "You fear to wear it for the negligence it brings." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "cap" + item_state = "cap" + item_state_slots = null + contained_sprite = TRUE + +/obj/item/clothing/head/bandana/captain + name = "captain's bandana" + desc = "It's the captain's bandana with some fine nanotech lining. All hands on deck!" + icon_state = "bandana_captain" + item_state = "bandana_captain" + +/obj/item/clothing/under/rank/captain + name = "captain's jumpsuit" + desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "uniform" + item_state = "uniform" + worn_state = "uniform" + contained_sprite = TRUE + var/is_open = FALSE + +/obj/item/clothing/under/rank/captain/verb/fold_open() + set name = "Fold Collar" + set category = "Object" + set src in usr + + if(use_check_and_message(usr)) + return + + if(is_open == -1) + to_chat(usr, SPAN_WARNING("The collar on \the [src] cannot be folded.")) + return + + is_open = !is_open + if(!is_open) + to_chat(usr, SPAN_NOTICE("You fold the collar of \the [src] closed.")) + icon_state = initial(icon_state) + item_state = initial(item_state) + else + to_chat(usr, SPAN_NOTICE("You fold the collar of \the [src] open.")) + icon_state = "[initial(icon_state)]_open" + item_state = "[initial(item_state)]_open" + update_clothing_icon() + +/obj/item/clothing/under/dress/dress_cap + name = "captain's dress uniform" + desc = "Feminine fashion for the style concious captain." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "uniform_fem" + item_state = "uniform_fem" + worn_state = "uniform_fem" + contained_sprite = TRUE + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + var/is_open = FALSE + +/obj/item/clothing/under/dress/dress_cap/verb/fold_open() + set name = "Fold Collar" + set category = "Object" + set src in usr + + if(use_check_and_message(usr)) + return + + if(is_open == -1) + to_chat(usr, SPAN_WARNING("The collar on \the [src] cannot be folded.")) + return + + is_open = !is_open + if(!is_open) + to_chat(usr, SPAN_NOTICE("You fold the collar of \the [src] closed.")) + icon_state = initial(icon_state) + item_state = initial(item_state) + else + to_chat(usr, SPAN_NOTICE("You fold the collar of \the [src] open.")) + icon_state = "[initial(icon_state)]_open" + item_state = "[initial(item_state)]_open" + update_clothing_icon() + +/obj/item/clothing/suit/captunic/capjacket + name = "captain's uniform jacket" + desc = "A less formal jacket for everyday captain use." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "jacket" + item_state = "jacket" + contained_sprite = TRUE + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + flags_inv = 0 + +/obj/item/clothing/gloves/captain + name = "captain's gloves" + desc = "Regal blue gloves, with a nice gold trim. Swanky." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "gloves" + item_state = "gloves" + contained_sprite = TRUE + +/obj/item/clothing/shoes/captain + name = "captain's shoes" + desc = "Super comfortable blue shoes, capable of keeping you on your feet during any station-wide disaster." + icon = 'icons/clothing/kit/captain.dmi' + icon_state = "shoes" + item_state = "shoes" + contained_sprite = TRUE + +/obj/item/storage/briefcase/nt/captain + name = "captain uniform briefcase" + desc = "An NT-branded briefcase containing various pieces of the captain's uniform, for use by stylish captains." + starts_with = list( + /obj/item/clothing/head/caphat = 1, + /obj/item/clothing/head/caphat/cap = 1, + /obj/item/clothing/head/bandana/captain = 1, + /obj/item/clothing/under/rank/captain = 1, + /obj/item/clothing/under/dress/dress_cap = 1, + /obj/item/clothing/suit/captunic/capjacket = 1, + /obj/item/clothing/gloves/captain = 1, + /obj/item/clothing/shoes/captain = 1 + ) + +// White +/obj/item/clothing/head/caphat/cap/beret + name = "captain's white beret" + desc = "A beret, worn to passively instill authority at the audacity of wearing a puffy hat." + icon = 'icons/clothing/kit/captain_white.dmi' + icon_state = "beret" + item_state = "beret" + +/obj/item/clothing/head/caphat/cap/white + name = "captain's white cap" + desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." + icon = 'icons/clothing/kit/captain_white.dmi' + +/obj/item/clothing/under/rank/captain/white + name = "captain's white jumpsuit" + desc = "It's a white jumpsuit with some gold markings denoting the rank of \"Captain\"." + icon = 'icons/clothing/kit/captain_white.dmi' + is_open = -1 + +/obj/item/clothing/gloves/captain/white + name = "captain's white gloves" + desc = "Shiny white gloves, with a nice gold trim. Swanky." + icon = 'icons/clothing/kit/captain_white.dmi' + +/obj/item/clothing/shoes/captain/white + name = "captain's white shoes" + desc = "Super comfortable white shoes, capable of keeping you on your feet during any station-wide disaster." + icon = 'icons/clothing/kit/captain_white.dmi' + +/obj/item/storage/briefcase/nt/captain_white + name = "captain white uniform briefcase" + desc = "An NT-branded briefcase containing various pieces of the captain's white uniform, for use when wine spillage is unlikely." + starts_with = list( + /obj/item/clothing/head/caphat/cap/beret = 1, + /obj/item/clothing/head/caphat/cap/white = 1, + /obj/item/clothing/under/rank/captain/white = 1, + /obj/item/clothing/gloves/captain/white = 1, + /obj/item/clothing/shoes/captain/white = 1 + ) + +// Formal +/obj/item/clothing/under/captainformal + name = "captain's formal uniform" + desc = "A captain's formal-wear, for special occasions." + icon = 'icons/clothing/kit/captain_formal.dmi' + icon_state = "uniform" + item_state = "uniform" + worn_state = "uniform" + contained_sprite = TRUE + +/obj/item/clothing/suit/captunic + name = "captain's parade jacket" + desc = "Worn by a Captain to show their class." + icon = 'icons/clothing/kit/captain_formal.dmi' + icon_state = "jacket" + item_state = "jacket" + contained_sprite = TRUE + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/shoes/captain/formal + name = "captain's formal boots" + desc = "Polished boots made of strong synthleather, capable of kicking through a wall without a scratch." + icon = 'icons/clothing/kit/captain_formal.dmi' + icon_state = "boots" + item_state = "boots" + contained_sprite = TRUE + +/obj/item/storage/briefcase/nt/captain_formal + name = "captain formal uniform briefcase" + desc = "An NT-branded briefcase containing various pieces of the captain's formal uniform, for use to style on the peasantry." + starts_with = list( + /obj/item/clothing/under/captainformal = 1, + /obj/item/clothing/suit/captunic = 1, + /obj/item/clothing/shoes/captain/formal = 1 + ) \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 7305e3b1b8f..a6cc8fad029 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -41,23 +41,6 @@ obj/item/clothing/suit/apron/overalls/blue allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood) -//Captain -/obj/item/clothing/suit/captunic - name = "captain's parade tunic" - desc = "Worn by a Captain to show their class." - icon_state = "captunic" - item_state = "captunic" - body_parts_covered = UPPER_TORSO|ARMS - flags_inv = HIDEJUMPSUIT - -/obj/item/clothing/suit/captunic/capjacket - name = "captain's uniform jacket" - desc = "A less formal jacket for everyday captain use." - icon_state = "capjacket" - item_state = "capjacket" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = 0 - //Chaplain /obj/item/clothing/suit/chaplain_hoodie name = "chaplain hoodie" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 3e9e663abcb..9b7bdb617a4 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -7,13 +7,6 @@ item_state = "ba_suit" worn_state = "ba_suit" -/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. - desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." - name = "captain's jumpsuit" - icon_state = "captain" - item_state = "b_suit" - worn_state = "captain" - /obj/item/clothing/under/rank/quartermaster name = "quartermaster's jumpsuit" desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 186c18ec640..2b7a596ab91 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -260,14 +260,6 @@ item_state = "y_suit" worn_state = "dress_yellow" -/obj/item/clothing/under/dress/dress_cap - name = "captain's dress uniform" - desc = "Feminine fashion for the style concious captain." - icon_state = "dress_cap" - item_state = "b_suit" - worn_state = "dress_cap" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - /obj/item/clothing/under/dress/dress_hop name = "head of personnel dress uniform" desc = "Feminine fashion for the style concious HoP." @@ -327,13 +319,6 @@ icon_state = "crdress" worn_state = "crdress" -/obj/item/clothing/under/captainformal - name = "captain's formal uniform" - desc = "A captain's formal-wear, for special occasions." - icon_state = "captain_formal" - item_state = "b_suit" - worn_state = "captain_formal" - /obj/item/clothing/under/hosformalmale name = "head of security's formal uniform" desc = "A male head of security's formal-wear, for special occasions." diff --git a/html/changelogs/geeves-captain_clothes.yml b/html/changelogs/geeves-captain_clothes.yml new file mode 100644 index 00000000000..08aab39a10f --- /dev/null +++ b/html/changelogs/geeves-captain_clothes.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - imageadd: "Gave the Captain's uniform new sprites." \ No newline at end of file diff --git a/icons/clothing/kit/captain.dmi b/icons/clothing/kit/captain.dmi new file mode 100644 index 00000000000..2d16ca3d94f Binary files /dev/null and b/icons/clothing/kit/captain.dmi differ diff --git a/icons/clothing/kit/captain_formal.dmi b/icons/clothing/kit/captain_formal.dmi new file mode 100644 index 00000000000..9af87f24a57 Binary files /dev/null and b/icons/clothing/kit/captain_formal.dmi differ diff --git a/icons/clothing/kit/captain_white.dmi b/icons/clothing/kit/captain_white.dmi new file mode 100644 index 00000000000..72b83c1b1fd Binary files /dev/null and b/icons/clothing/kit/captain_white.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ec12d8fd795..ccf3a3e6418 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ