diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm index b9baafaa6b..6aafe31f4a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm @@ -21,12 +21,13 @@ /obj/item/weapon/melee/baton/loaded, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses/medhud, - /obj/item/clothing/head/beret/centcom/officer, + /obj/item/clothing/head/beret/blueshield, /obj/item/clothing/head/helmet/dermal, /obj/item/clothing/under/yw/blueshield, /obj/item/clothing/under/yw/blueshield2, /obj/item/clothing/suit/armor/yw/blueshield, /obj/item/clothing/suit/armor/yw/blueshieldcoat, + /obj/item/clothing/accessory/poncho/roles/cloak/blueshield, /obj/item/clothing/shoes/laceup, /obj/item/clothing/accessory/holster/leg, /obj/item/clothing/shoes/boots/jackboots, diff --git a/code/modules/client/preference_setup/loadout/loadout_head_yw.dm b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm new file mode 100644 index 0000000000..e0178fa705 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm @@ -0,0 +1,4 @@ +/datum/gear/head/beret/blueshield + display_name = "beret, blueshield" + path = /obj/item/clothing/head/beret/blueshield + allowed_roles = list("Blueshield Guard") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm new file mode 100644 index 0000000000..bd62bf72b0 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm @@ -0,0 +1,4 @@ +/datum/gear/suit/roles/poncho/cloak/blueshield + display_name = "cloak, blueshield" + path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield + allowed_roles = list("Blueshield Guard") \ No newline at end of file diff --git a/code/modules/clothing/head/jobs_yw.dm b/code/modules/clothing/head/jobs_yw.dm new file mode 100644 index 0000000000..57712f8798 --- /dev/null +++ b/code/modules/clothing/head/jobs_yw.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/head/beret/blueshield + name = "bodyguard's beret" + desc = "A dark blue beret adorned with a silver patch. The mark of a professional bodyguard." + item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white") + icon = 'icons/obj/clothing/hats_yw.dmi' + icon_state = "beret_blueshield" + icon_override = 'icons/mob/head_yw.dmi' + item_state = "beret_blueshield" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory_yw.dm b/code/modules/clothing/under/accessories/accessory_yw.dm new file mode 100644 index 0000000000..6dd9cd7e50 --- /dev/null +++ b/code/modules/clothing/under/accessories/accessory_yw.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/accessory/poncho/roles/cloak/blueshield + name = "bodyguard's cloak" + desc = "A dark blue cloak with silver trim around the neck. The mark of a professional bodyguard, and ideal for concealing holsters or other items." + icon = 'icons/obj/clothing/ties_yw.dmi' + icon_state = "cloak_blueshield" + icon_override = 'icons/mob/ties_yw.dmi' + item_state = "cloak_blueshield" \ No newline at end of file diff --git a/icons/mob/head_yw.dmi b/icons/mob/head_yw.dmi index 76d6e80edd..124168cd68 100644 Binary files a/icons/mob/head_yw.dmi and b/icons/mob/head_yw.dmi differ diff --git a/icons/mob/ties_yw.dmi b/icons/mob/ties_yw.dmi new file mode 100644 index 0000000000..1609af6fb2 Binary files /dev/null and b/icons/mob/ties_yw.dmi differ diff --git a/icons/obj/clothing/hats_yw.dmi b/icons/obj/clothing/hats_yw.dmi index 0a9dcecabb..ab7089a4ed 100644 Binary files a/icons/obj/clothing/hats_yw.dmi and b/icons/obj/clothing/hats_yw.dmi differ diff --git a/icons/obj/clothing/ties_yw.dmi b/icons/obj/clothing/ties_yw.dmi new file mode 100644 index 0000000000..49ebe2fd36 Binary files /dev/null and b/icons/obj/clothing/ties_yw.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 50831210fc..3e7fe345c9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1688,12 +1688,14 @@ #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_head_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_suit_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_yw.dm" @@ -1739,6 +1741,7 @@ #include "code\modules\clothing\head\hood.dm" #include "code\modules\clothing\head\hood_yw.dm" #include "code\modules\clothing\head\jobs.dm" +#include "code\modules\clothing\head\jobs_yw.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_vr.dm" @@ -1836,6 +1839,7 @@ #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" #include "code\modules\clothing\under\accessories\accessory_vr.dm" +#include "code\modules\clothing\under\accessories\accessory_yw.dm" #include "code\modules\clothing\under\accessories\armband.dm" #include "code\modules\clothing\under\accessories\armor.dm" #include "code\modules\clothing\under\accessories\badges.dm" @@ -1983,8 +1987,8 @@ #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\snacks_vr.dm" -#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\thecake.dm" +#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm"