diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 01ce9f87c8c..75b8685c80d 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -21,13 +21,16 @@ /obj/item/weapon/lipstick/black name = "black lipstick" colour = "black" - + +/obj/item/weapon/lipstick/pink + name = "pink lipstick" + colour = "pink" /obj/item/weapon/lipstick/random name = "lipstick" /obj/item/weapon/lipstick/random/New() - colour = pick("red","purple","jade","black") + colour = pick("red","purple","jade","pink","black") name = "[colour] lipstick" @@ -78,4 +81,4 @@ item_state = "purplecomb" /obj/item/weapon/haircomb/attack_self(mob/user) - user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [user.gender == FEMALE ? "lady" : "guy"].") \ No newline at end of file + user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [user.gender == FEMALE ? "lady" : "guy"].") diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8b4d6bb598e..d4f244ed93a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -24,6 +24,7 @@ armbands["science armband"] = /obj/item/clothing/accessory/armband/science armbands["synthetic intelligence movement armband"] = /obj/item/clothing/accessory/armband/movement armbands["ATLAS armband"] = /obj/item/clothing/accessory/armband/atlas + armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac gear_tweaks += new/datum/gear_tweak/path(armbands) /datum/gear/accessory/holster @@ -60,12 +61,37 @@ /datum/gear/accessory/black_vest display_name = "webbing, security" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective" ) + allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective") + +/datum/gear/accessory/white_vest + display_name = "webbing, medical" + path = /obj/item/clothing/accessory/storage/white_vest + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern") /datum/gear/accessory/webbing display_name = "webbing, simple" path = /obj/item/clothing/accessory/storage/webbing cost = 2 + +/datum/gear/accessory/brown_pouches + display_name = "drop pouches, engineering" + path = /obj/item/clothing/accessory/storage/brown_pouches + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer", "Engineering Apprentice") + +/datum/gear/accessory/black_pouches + display_name = "drop pouches, security" + path = /obj/item/clothing/accessory/storage/black_pouches + allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective") + +/datum/gear/accessory/white_pouches + display_name = "drop pouches, medical" + path = /obj/item/clothing/accessory/storage/white_pouches + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern") + +/datum/gear/accessory/pouches + display_name = "drop pouches, simple" + path = /obj/item/clothing/accessory/storage/pouches + cost = 2 /datum/gear/accessory/locket display_name = "silver locket" diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm index a4fec0e0bcc..bf40ab96cdc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm @@ -14,6 +14,7 @@ lipsticks["lipstick, purple"] = /obj/item/weapon/lipstick/purple lipsticks["lipstick, jade"] = /obj/item/weapon/lipstick/jade lipsticks["lipstick, black"] = /obj/item/weapon/lipstick/black + lipsticks["lipstick, pink"] = /obj/item/weapon/lipstick/pink gear_tweaks += new/datum/gear_tweak/path(lipsticks) /datum/gear/cosmetic/mirror diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 5a7fae169d0..48eef4ce9b8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -18,6 +18,9 @@ jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen jackets["black jacket"] = /obj/item/clothing/suit/storage/leather_jacket jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket + jackets["green flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel + jackets["red flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/red + jackets["blue flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/blue gear_tweaks += new/datum/gear_tweak/path(jackets) /datum/gear/suit/hazard_vest diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index ee2e295d197..438f00068ba 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -49,6 +49,7 @@ skirts["plaid skirt, purple"] = /obj/item/clothing/under/dress/plaid_purple skirts["plaid skirt, red"] = /obj/item/clothing/under/dress/plaid_red skirts["jumpskirt, black"] = /obj/item/clothing/under/blackjumpskirt + skirts["skirt, black"] = /obj/item/clothing/under/blackskirt gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 29ccdbbf1f8..aad7b37034a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -1,4 +1,4 @@ -//unathi clothing +//unathi items /datum/gear/suit/unathi_mantle display_name = "hide mantle (Unathi)" @@ -20,8 +20,27 @@ cost = 1 whitelisted = "Unathi" sort_category = "Xenowear" + +/datum/gear/gloves/unathi + display_name = "gloves selection (Unathi)" + path = /obj/item/clothing/gloves/black/unathi + whitelisted = "Unathi" + sort_category = "Xenowear" -//skrell headtail adorns +/datum/gear/gloves/unathi/New() + ..() + var/un_gloves = list() + un_gloves["black gloves"] = /obj/item/clothing/gloves/black/unathi + un_gloves["red gloves"] = /obj/item/clothing/gloves/red/unathi + un_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/unathi + un_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/unathi + un_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/unathi + un_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/unathi + un_gloves["green gloves"] = /obj/item/clothing/gloves/green/unathi + un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi + gear_tweaks += new/datum/gear_tweak/path(un_gloves) + +//skrell items /datum/gear/ears/f_skrell display_name = "headtail-wear, female (Skrell)" @@ -57,6 +76,7 @@ m_chains["blue-jeweled bands"] = /obj/item/clothing/ears/skrell/bluejeweled_band m_chains["silver bands"] = /obj/item/clothing/ears/skrell/silver_band m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male + m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/purple_skrell_cloth_male gear_tweaks += new/datum/gear_tweak/path(m_chains) //vaurca items @@ -82,26 +102,7 @@ whitelisted = "Vaurca Worker" sort_category = "Xenowear" -//beastmen gloves - -/datum/gear/gloves/unathi - display_name = "gloves selection (Unathi)" - path = /obj/item/clothing/gloves/black/unathi - whitelisted = "Unathi" - sort_category = "Xenowear" - -/datum/gear/gloves/unathi/New() - ..() - var/un_gloves = list() - un_gloves["black gloves"] = /obj/item/clothing/gloves/black/unathi - un_gloves["red gloves"] = /obj/item/clothing/gloves/red/unathi - un_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/unathi - un_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/unathi - un_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/unathi - un_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/unathi - un_gloves["green gloves"] = /obj/item/clothing/gloves/green/unathi - un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi - gear_tweaks += new/datum/gear_tweak/path(un_gloves) +//tajara items /datum/gear/gloves/tajara display_name = "gloves selection (Tajara)" @@ -121,3 +122,16 @@ taj_gloves["green gloves"] = /obj/item/clothing/gloves/green/tajara taj_gloves["white gloves"] = /obj/item/clothing/gloves/white/tajara gear_tweaks += new/datum/gear_tweak/path(taj_gloves) + +/datum/gear/suit/tajara_coat + display_name = "tajaran naval coat (Tajara)" + path = /obj/item/clothing/suit/storage/tajaran + whitelisted = "Tajara" + sort_category = "Xenowear" + +/datum/gear/suit/tajaran_labcoat + display_name = "people's republic medical coat (Tajara)" + path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran + whitelisted = "Tajara" + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern") + sort_category = "Xenowear" diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index daaebcb95d1..5dc258a4dad 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -92,4 +92,10 @@ name = "skrell blue headtail cloth" desc = "A blue cloth band worn by female skrell around their head tails." icon_state = "blue_skrell_cloth_band_female" - item_state = "blue_skrell_cloth_band_female" \ No newline at end of file + item_state = "blue_skrell_cloth_band_female" + +/obj/item/clothing/ears/skrell/purple_skrell_cloth_male + name = "skrell purple head cloth" + desc = "A purple cloth band worn by male skrell around their head tails." + icon_state = "purple_skrell_cloth_male" + item_state = "purple_skrell_cloth_male" diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 17852819c78..5fd5fd84c14 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -37,3 +37,17 @@ desc = "A scarf of coarse fabric. Seems to have ear-holes." icon_state = "zhan_scarf" body_parts_covered = HEAD|FACE + +/obj/item/clothing/suit/storage/tajaran + name = "tajaran naval coat" + desc = "A thick wool coat from Adhomai." + icon_state = "naval_coat" + item_state = "naval_coat" + +/obj/item/clothing/suit/storage/toggle/labcoat/tajaran + name = "people's republic medical coat" + desc = "A sterile insulated coat made of leather stitched over fur." + icon_state = "taj_jacket" + item_state = "taj_jacket" + icon_open = "taj_jacket_open" + icon_closed = "taj_jacket" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 88cb4cdb2bf..adeaaccaf03 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -326,3 +326,26 @@ icon_open = "trackjacket_open" icon_closed = "trackjacket" contained_sprite = 1 + +/obj/item/clothing/suit/storage/toggle/flannel + name = "green flannel shirt" + desc = "A flannel shirt, for all your space hipster needs." + icon_state = "flannel_green" + item_state = "flannel_green" + icon_open = "flannel_green_open" + icon_closed = "flannel_green" + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/toggle/flannel/red + name = "red flannel shirt" + icon_state = "flannel_red" + item_state = "flannel_red" + icon_open = "flannel_red_open" + icon_closed = "flannel_red" + +/obj/item/clothing/suit/storage/toggle/flannel/blue + name = "blue flannel shirt" + icon_state = "flannel_blue" + item_state = "flannel_blue" + icon_open = "flannel_blue_open" + icon_closed = "flannel_blue" diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 2fcbf17ce04..08d4da670fe 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -92,4 +92,3 @@ usr << "\The [src] does not have a vest badge." return update_clothing_icon() - diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index e971d1d1124..2f8d14e29cc 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -43,3 +43,8 @@ name = "atlas armband" desc = "This is a armband showing anyone who sees this person, as a member of the political party Atlas. This one is black." icon_state = "black" + +/obj/item/clothing/accessory/armband/iac + name = "interstellar aid corps armband" + desc = "An armband denoting its wearer as a medical worker of the Interstellar Aid Corps. This one is white and blue." + icon_state = "iac" diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 0ff978902dc..b4254e66d7d 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -60,6 +60,35 @@ desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands." icon_state = "vest_brown" slots = 5 + +/obj/item/clothing/accessory/storage/white_vest + name = "white webbing vest" + desc = "Durable white synthcotton vest with lots of pockets to carry essentials." + icon_state = "vest_white" + slots = 5 + +/obj/item/clothing/accessory/storage/pouches + name = "drop pouches" + desc = "Synthcotton bags to hold whatever you need, but cannot hold in hands." + icon_state = "thigh_brown" //todo: get a different sprite for it + +/obj/item/clothing/accessory/storage/black_pouches + name = "black drop pouches" + desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in hands." + icon_state = "thigh_black" + slots = 5 + +/obj/item/clothing/accessory/storage/brown_pouches + name = "brown drop pouches" + desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in hands." + icon_state = "thigh_brown" + slots = 5 + +/obj/item/clothing/accessory/storage/white_pouches + name = "white drop pouches" + desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in hands." + icon_state = "thigh_white" + slots = 5 /obj/item/clothing/accessory/storage/knifeharness name = "decorated harness" diff --git a/html/changelogs/alberky-PR-2267.yml b/html/changelogs/alberky-PR-2267.yml new file mode 100644 index 00000000000..29157912974 --- /dev/null +++ b/html/changelogs/alberky-PR-2267.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added more options to the custom loadout." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 8b1b0456377..f11f9a9d62c 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 8be358bc7ea..b2700c1bba2 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index a6ab12720b4..bd4a10be1b3 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 82693da39e5..f93de3b289f 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index aa22f7b48b9..6073d67da4e 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 7e121c23ad1..2e187fef447 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 43362d92d1a..0daa74fcb4c 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index fd0618fd340..926fcc29e0f 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ