diff --git a/baystation12.dme b/baystation12.dme index a79ef70879a..5a886bea365 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -906,6 +906,7 @@ #include "code\modules\client\preferences_system_control.dm" #include "code\modules\client\preferences_toggles.dm" #include "code\modules\clothing\clothing.dm" +#include "code\modules\clothing\ears\bandanna.dm" #include "code\modules\clothing\ears\skrell.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\hud.dm" diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 215827c98cc..9093f005c88 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -563,13 +563,13 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/under/rank/medical/blue slot = slot_w_uniform cost = 1 - + /datum/gear/greenscrub display_name = "medical scrubs, green" path = /obj/item/clothing/under/rank/medical/green slot = slot_w_uniform cost = 1 - + /datum/gear/purplescrub display_name = "medical scrubs, purple" path = /obj/item/clothing/under/rank/medical/purple @@ -625,7 +625,7 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/accessory/armband/science slot = slot_tie cost = 1 - + /datum/gear/armband_movement display_name = "armband, synthetic intelligence movement" path = /obj/item/clothing/accessory/armband/movement @@ -937,7 +937,7 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/gloves/white cost = 2 slot = slot_gloves - + /datum/gear/black_gloves_unathi display_name = "black gloves, unathi" path = /obj/item/clothing/gloves/black/unathi @@ -949,7 +949,7 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/gloves/black/tajara cost = 2 slot = slot_gloves - + /datum/gear/red_gloves_unathi display_name = "red gloves, unathi" path = /obj/item/clothing/gloves/red/unathi @@ -991,7 +991,7 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/gloves/purple/unathi cost = 2 slot = slot_gloves - + /datum/gear/purple_gloves_tajaran display_name = "purple gloves, tajaran" path = /obj/item/clothing/gloves/purple/tajara @@ -1192,7 +1192,7 @@ var/global/list/gear_datums = list() display_name = "wallet" path = /obj/item/weapon/storage/wallet sort_category = "utility" - cost = 1 + cost = 1 // The rest of the trash. @@ -1267,6 +1267,18 @@ var/global/list/gear_datums = list() sort_category = "misc" cost = 1 +/datum/gear/cigar_case + display_name = "cigar case" + path = /obj/item/weapon/storage/fancy/cigar + sort_category = "misc" + cost = 2 + +/datum/gear/cigarettes + display_name = "pack of DromedaryCo cigarettes" + path = /obj/item/weapon/storage/fancy/cigarettes/dromedaryco + sort_category = "misc" + cost = 2 + /datum/gear/matchbook display_name = "matchbook" path = /obj/item/weapon/storage/box/matches @@ -1280,7 +1292,7 @@ var/global/list/gear_datums = list() cost = 1 /datum/gear/cape - display_name = " tunnel cloak" + display_name = "tunnel cloak" path = /obj/item/weapon/storage/backpack/cloak sort_category = "misc" cost = 1 @@ -1331,3 +1343,91 @@ var/global/list/gear_datums = list() cost = 1 sort_category = "ears" whitelisted = "Skrell" + +/datum/gear/red_jeweled + display_name = "skrell headtail-wear, female, red-jeweled chain" + path = /obj/item/clothing/ears/skrell/redjewel_chain + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/ebony_chain + display_name = "skrell headtail-wear, female, ebony chain" + path = /obj/item/clothing/ears/skrell/ebony_chain + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/redjeweled_band + display_name = "skrell headtail-wear, male, red-jeweled bands" + path = /obj/item/clothing/ears/skrell/redjeweled_band + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/ebony_band + display_name = "skrell headtail-wear, male, ebony bands" + path = /obj/item/clothing/ears/skrell/ebony_band + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/bluejeweled_chain + display_name = "skrell headtail-wear, female, blue-jeweled chain" + path = /obj/item/clothing/ears/skrell/bluejeweled_chain + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/bluejeweled_band + display_name = "skrell headtail-wear, male, blue-jeweled bands" + path = /obj/item/clothing/ears/skrell/bluejeweled_band + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/silver_chain + display_name = "skrell headtail-wear, female, silver chain" + path = /obj/item/clothing/ears/skrell/silver_chain + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/silver_band + display_name = "skrell headtail-wear, male, silver bands" + path = /obj/item/clothing/ears/skrell/silver_band + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/blue_skrell_cloth_band_male + display_name = "skrell headtail-wear, male, blue cloth" + path = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/blue_skrell_cloth_band_female + display_name = "skrell headtail-wear, female, blue cloth" + path = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_female + cost = 1 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/bandanna_r + display_name = "neck bandanna, red" + path = /obj/item/clothing/ears/bandanna + cost = 1 + sort_category = "ears" + +/datum/gear/bandanna_bl + display_name = "neck bandanna, blue" + path = /obj/item/clothing/ears/bandanna/blue + cost = 1 + sort_category = "ears" + +/datum/gear/bandanna_bk + display_name = "neck bandanna, black" + path = /obj/item/clothing/ears/bandanna/black + cost = 1 + sort_category = "ears" \ No newline at end of file diff --git a/code/modules/clothing/ears/bandanna.dm b/code/modules/clothing/ears/bandanna.dm new file mode 100644 index 00000000000..dfa669e9ff0 --- /dev/null +++ b/code/modules/clothing/ears/bandanna.dm @@ -0,0 +1,24 @@ +/* + Bandannas and the like +*/ + +/obj/item/clothing/ears/bandanna + name = "red bandanna" + desc = "A plain red bandanna." + icon = 'icons/obj/clothing/ears.dmi' + icon_state = "band_r" + item_state = "band_r" + w_class = 1 + slot_flags = SLOT_EARS + +/obj/item/clothing/ears/bandanna/blue + name = "blue bandanna" + desc = "A plain blue bandanna." + icon_state = "band_bl" + item_state = "band_bl" + +/obj/item/clothing/ears/bandanna/black + name = "black bandanna" + desc = "A plain black bandanna." + icon_state = "band_bk" + item_state = "band_bk" \ No newline at end of file diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index a92722db5ea..daaebcb95d1 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -32,4 +32,64 @@ name = "skrell headtail cloth" desc = "A cloth band worn by male skrell around their head tails." icon_state = "skrell_cloth_male" - item_state = "skrell_cloth_male" \ No newline at end of file + item_state = "skrell_cloth_male" + +/obj/item/clothing/ears/skrell/redjewel_chain + name = "skrell red-jeweled headtail chains" + desc = "A delicate golden chain, decorated with red jewels, worn by female skrell to decorate their head tails." + icon_state = "redjewel_chain" + item_state = "redjewel_chain" + +/obj/item/clothing/ears/skrell/ebony_chain + name = "skrell ebony headtail chains" + desc = "A delicate ebony chain worn by female skrell to decorate their head tails." + icon_state = "ebony_chain" + item_state = "ebony_chain" + +/obj/item/clothing/ears/skrell/redjeweled_band + name = "skrell red-jeweled headtail bands" + desc = "Golden metallic bands, decorated with red jewels, worn by male skrell to adorn their head tails." + icon_state = "redjeweled_band" + item_state = "redjeweled_band" + +/obj/item/clothing/ears/skrell/ebony_band + name = "skrell ebony headtail bands" + desc = "Ebony metallic bands, decorated with red jewels, worn by male skrell to adorn their head tails." + icon_state = "ebony_band" + item_state = "ebony_band" + +/obj/item/clothing/ears/skrell/bluejeweled_chain + name = "skrell blue-jeweled headtail chains" + desc = "A delicate golden chain, decorated with blue jewels, worn by female skrell to decorate their head tails." + icon_state = "bluejeweled_chain" + item_state = "bluejeweled_chain" + +/obj/item/clothing/ears/skrell/bluejeweled_band + name = "skrell blue-jeweled headtail bands" + desc = "Golden metallic bands, decorated with blue jewels, worn by male skrell to adorn their head tails." + icon_state = "bluejeweled_band" + item_state = "bluejeweled_band" + +/obj/item/clothing/ears/skrell/silver_chain + name = "skrell silver headtail chains" + desc = "A delicate silver chain worn by female skrell to decorate their head tails." + icon_state = "silver_chain" + item_state = "silver_chain" + +/obj/item/clothing/ears/skrell/silver_band + name = "skrell silver headtail bands" + desc = "Silver metallic bands, decorated with blue jewels, worn by male skrell to adorn their head tails." + icon_state = "silver_band" + item_state = "silver_band" + +/obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male + name = "skrell blue headtail cloth" + desc = "A blue cloth band worn by male skrell around their head tails." + icon_state = "blue_skrell_cloth_band_male" + item_state = "blue_skrell_cloth_band_male" + +/obj/item/clothing/ears/skrell/blue_skrell_cloth_band_female + 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 diff --git a/html/changelogs/alberyk-PR-662.yml b/html/changelogs/alberyk-PR-662.yml new file mode 100644 index 00000000000..9fa152e44bd --- /dev/null +++ b/html/changelogs/alberyk-PR-662.yml @@ -0,0 +1,8 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added more skrellian head garments, available in the custom loadout." + - rscadd: "Added some neckerchief bandanna, available in the custom loadout." + - rscadd: "Added a cigar case cigarettes to the custom loadout." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index cc0869939e7..8b1b0456377 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 0ffe252b6de..aa22f7b48b9 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ