diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 48367fd9921..2ed7626f67c 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "utilitybelt" item_state = "utility" + force = 2 storage_slots = 7 max_w_class = 3 max_storage_space = 28 @@ -314,4 +315,58 @@ icon_state = "bandolier" item_state = "bandolier" can_hold = list(/obj/item/ammo_casing/shotgun) - storage_slots = 16 \ No newline at end of file + storage_slots = 16 + +/obj/item/weapon/storage/belt/fannypack + name = "leather fannypack" + desc = "A dorky fannypack for keeping small items in." + icon_state = "fannypack_leather" + item_state = "fannypack_leather" + max_w_class = 2 + storage_slots = null + max_storage_space = 8 + +/obj/item/weapon/storage/belt/fannypack/black + name = "black fannypack" + icon_state = "fannypack_black" + item_state = "fannypack_black" + +/obj/item/weapon/storage/belt/fannypack/blue + name = "blue fannypack" + icon_state = "fannypack_blue" + item_state = "fannypack_blue" + +/obj/item/weapon/storage/belt/fannypack/cyan + name = "cyan fannypack" + icon_state = "fannypack_cyan" + item_state = "fannypack_cyan" + +/obj/item/weapon/storage/belt/fannypack/green + name = "green fannypack" + icon_state = "fannypack_green" + item_state = "fannypack_green" + +/obj/item/weapon/storage/belt/fannypack/orange + name = "orange fannypack" + icon_state = "fannypack_orange" + item_state = "fannypack_orange" + +/obj/item/weapon/storage/belt/fannypack/purple + name = "purple fannypack" + icon_state = "fannypack_purple" + item_state = "fannypack_purple" + +/obj/item/weapon/storage/belt/fannypack/red + name = "red fannypack" + icon_state = "fannypack_red" + item_state = "fannypack_red" + +/obj/item/weapon/storage/belt/fannypack/white + name = "white fannypack" + icon_state = "fannypack_white" + item_state = "fannypack_white" + +/obj/item/weapon/storage/belt/fannypack/yellow + name = "yellow fannypack" + icon_state = "fannypack_yellow" + item_state = "fannypack_yellow" \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index f0bd320de98..26ed3503e9f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -15,7 +15,10 @@ name = "patient's closet" /obj/structure/closet/secure_closet/personal/patient/fill() - new /obj/item/clothing/under/color/white( src ) + if(prob(50)) + new /obj/item/clothing/under/medical_gown(src) + else + new /obj/item/clothing/under/medical_gown/white(src) new /obj/item/clothing/shoes/white( src ) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 48ad740fd29..0a31e19eda2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -114,6 +114,13 @@ dress["dress, orange"] = /obj/item/clothing/under/dress/dress_orange dress["dress, pink"] = /obj/item/clothing/under/dress/dress_pink dress["dress, yellow"] = /obj/item/clothing/under/dress/dress_yellow + dress["dress, white"] = /obj/item/clothing/under/dress/white + dress["dress, stripped"] = /obj/item/clothing/under/dress/stripeddress + dress["dress, sailor"] = /obj/item/clothing/under/dress/sailordress + dress["dress, red swept"] = /obj/item/clothing/under/dress/red_swept_dress + dress["dress, western bustle"] = /obj/item/clothing/under/dress/westernbustle + dress["dress, black tango"] = /obj/item/clothing/under/dress/blacktango + dress["dress, black tango alternative"] = /obj/item/clothing/under/dress/blacktango/alt dress["cheongsam, white"] = /obj/item/clothing/under/cheongsam dress["cheongsam, red"] = /obj/item/clothing/under/cheongsam/red dress["cheongsam, blue"] = /obj/item/clothing/under/cheongsam/blue diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 6fd34e628c3..8bdae614387 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -2,7 +2,7 @@ display_name = "briefcase" path = /obj/item/weapon/storage/briefcase sort_category = "Utility" - + /datum/gear/utility/secure display_name = "secure briefcase" path = /obj/item/weapon/storage/secure/briefcase @@ -53,3 +53,16 @@ /datum/gear/utility/camera display_name = "camera" path = /obj/item/device/camera + +/datum/gear/utility/fannypack + display_name = "fannypack selection" + cost = 2 + path = /obj/item/weapon/storage/belt/fannypack + +/datum/gear/utility/fannypack/New() + ..() + var/list/fannys = list() + for(var/fanny in typesof(/obj/item/weapon/storage/belt/fannypack)) + var/obj/item/weapon/storage/belt/fannypack/fanny_type = fanny + fannys[initial(fanny_type.name)] = fanny_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys)) \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 62ba6df8ebb..cccdc02f189 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -332,11 +332,10 @@ item_state = "p_suit" worn_state = "dress_saloon" - /obj/item/clothing/under/dress/dress_evening - name = "Evening Gown" + name = "evening gown" desc = "A silky gown, leaves much to the imagination" - icon_state = "red_evening_gown_s" + icon_state = "red_evening_gown" item_state = "red_evening_gown" /obj/item/clothing/under/dress/dress_cap @@ -424,6 +423,40 @@ worn_state = "sundress_white" body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/under/dress/stripeddress + name = "striped dress" + desc = "Fashion in space." + icon_state = "striped_dress" + +/obj/item/clothing/under/dress/sailordress + name = "sailor dress" + desc = "Formal wear for a leading lady." + icon_state = "sailor_dress" + +/obj/item/clothing/under/dress/white + name = "white dress" + desc = "A fancy white dress with a blue underdress." + icon_state = "whitedress" + flags_inv = HIDESHOES + +/obj/item/clothing/under/dress/red_swept_dress + name = "red swept dress" + desc = "A red dress that sweeps to the side." + icon_state = "red_swept_dress" + +/obj/item/clothing/under/dress/westernbustle + name = "western bustle" + desc = "A western bustle dress from somewhere in the ancient history of Earth." + icon_state = "westernbustle" + +/obj/item/clothing/under/dress/blacktango + name = "black tango dress" + desc = "An earthen black tango dress." + icon_state = "black_tango" + +/obj/item/clothing/under/dress/blacktango/alt + icon_state = "black_tango_alt" + /obj/item/clothing/under/captainformal name = "captain's formal uniform" desc = "A captain's formal-wear, for special occasions." @@ -652,3 +685,15 @@ icon_state = "greensuit" item_state = "greensuit" worn_state = "greensuit" + +/obj/item/clothing/under/medical_gown + name = "medical gown" + desc = "A loose pieces of clothing, commonly worn by medical patients." + icon_state = "medicalgown" + item_state = "medicalgown" + has_sensor = 2 + sensor_mode = 3 + +/obj/item/clothing/under/medical_gown/white + icon_state = "whitemedicalgown" + worn_state = "whitemedicalgown" \ No newline at end of file diff --git a/html/changelogs/alberyk-clothing.yml b/html/changelogs/alberyk-clothing.yml new file mode 100644 index 00000000000..bae10dac382 --- /dev/null +++ b/html/changelogs/alberyk-clothing.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added new options to the custom loadout; dresses and fannypacks." + - rscadd: "Added medical gowns to medbay." diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index c4b395a2153..20bbedb48ff 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index b45b77df2e0..6e89eafe602 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 89e957d569f..c5415be6d46 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 9d7a7dcac17..5191321b757 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index ea9d709c20d..a550390e47e 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index eae308715f8..75d4f892905 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ