diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 9b4f9271a24..724b6c31ac1 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -8,6 +8,7 @@ /obj/item/weapon/spacecash, /obj/item/weapon/card, /obj/item/clothing/mask/smokable/cigarette/, + /obj/item/clothing/accessory/badge, /obj/item/device/flashlight/pen, /obj/item/seeds, /obj/item/stack/medical, diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 3e6e94ebcec..2d4139d4a0c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -587,6 +587,12 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/accessory/armband/science slot = slot_tie cost = 1 + +/datum/gear/armband_science + display_name = "armband, synthetic intelligence movement" + path = /obj/item/clothing/accessory/armband/movement + slot = slot_tie + cost = 1 /datum/gear/armpit display_name = "holster, armpit" @@ -893,6 +899,102 @@ 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 + cost = 2 + slot = slot_gloves + +/datum/gear/black_gloves_tajara + display_name = "black gloves, tajaran" + 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 + cost = 2 + slot = slot_gloves + +/datum/gear/red_gloves_tajaran + display_name = "red gloves, tajaran" + path = /obj/item/clothing/gloves/red/tajara + cost = 2 + slot = slot_gloves + +/datum/gear/blue_gloves_unathi + display_name = "blue gloves, unathi" + path = /obj/item/clothing/gloves/blue/unathi + cost = 2 + slot = slot_gloves + +/datum/gear/blue_gloves_tajaran + display_name = "blue gloves, tajaran" + path = /obj/item/clothing/gloves/blue/tajara + cost = 2 + slot = slot_gloves + +/datum/gear/orange_gloves_unathi + display_name = "orange gloves, unathi" + path = /obj/item/clothing/gloves/orange/unathi + cost = 2 + slot = slot_gloves + +/datum/gear/orange_gloves_tajaran + display_name = "orange gloves, tajaran" + path = /obj/item/clothing/gloves/orange/tajara + cost = 2 + slot = slot_gloves + +/datum/gear/purple_gloves_unathi + display_name = "purple gloves, unathi" + 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 + cost = 2 + slot = slot_gloves + +/datum/gear/brown_gloves_unathi + display_name = "brown gloves, unathi" + path = /obj/item/clothing/gloves/brown/unathi + cost = 2 + slot = slot_gloves + +/datum/gear/brown_gloves_tajaran + display_name = "brown gloves, tajaran" + path = /obj/item/clothing/gloves/brown/tajara + cost = 2 + slot = slot_gloves + +/datum/gear/green_gloves_unathi + display_name = "green gloves, unathi" + path = /obj/item/clothing/gloves/green/unathi + cost = 2 + slot = slot_gloves + +/datum/gear/green_gloves_tajaran + display_name = "green gloves, tajaran" + path = /obj/item/clothing/gloves/green/tajara + cost = 2 + slot = slot_gloves + +/datum/gear/white_gloves_unathi + display_name = "white gloves, unathi" + path = /obj/item/clothing/gloves/white/unathi + cost = 2 + slot = slot_gloves + +/datum/gear/white_gloves_tajaran + display_name = "white gloves, tajaran" + path = /obj/item/clothing/gloves/white/tajara + cost = 2 + slot = slot_gloves // Shoelocker @@ -1048,6 +1150,12 @@ var/global/list/gear_datums = list() sort_category = "utility" cost = 2 +/datum/gear/wallet + display_name = "wallet" + path = /obj/item/weapon/storage/wallet + sort_category = "utility" + cost = 1 + // The rest of the trash. /datum/gear/ashtray diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 35fa1a19360..f1e2644a225 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -112,3 +112,75 @@ name = "black gloves" desc = "black gloves made for Tajara use." species_restricted = list("Tajara") + +//more snowflake gloves for the custom loadout + +/obj/item/clothing/gloves/red/unathi + name = "red gloves" + desc = "Red gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/red/tajara + name = "red gloves" + desc = "Red gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/blue/unathi + name = "blue gloves" + desc = "Blue gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/blue/tajara + name = "blue gloves" + desc = "Blue gloves made for Tajaran use." + species_restricted = list("Tajara") + +/obj/item/clothing/gloves/orange/unathi + name = "orange gloves" + desc = "Orange gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/orange/tajara + name = "orange gloves" + desc = "Orange gloves made for Tajaran use." + species_restricted = list("Tajara") + +/obj/item/clothing/gloves/purple/unathi + name = "purple gloves" + desc = "Purple gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/purple/tajara + name = "purple gloves" + desc = "Purple gloves made for Tajaran use." + species_restricted = list("Tajara") + +/obj/item/clothing/gloves/brown/unathi + name = "brown gloves" + desc = "Brown gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/brown/tajara + name = "brown gloves" + desc = "Brown gloves made for Tajaran use." + species_restricted = list("Tajara") + +/obj/item/clothing/gloves/green/unathi + name = "green gloves" + desc = "Green gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/green/tajara + name = "green gloves" + desc = "Green gloves made for Tajaran use." + species_restricted = list("Tajara") + +/obj/item/clothing/gloves/white/unathi + name = "white gloves" + desc = "White gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/white/tajara + name = "white gloves" + desc = "White gloves made for Tajaran use." + species_restricted = list ("Tajara") diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 9aa2ec2b709..ba5b7d22571 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -33,3 +33,9 @@ name = "EMT armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green." icon_state = "medgreen" + +/obj/item/clothing/accessory/armband/movement //cakeisossim armband + name = "synthetic intelligence movement armband" + desc = "An armband, signifying membership of the Synthetic Intelligence Movement. It's white, with a brown stripe that appears to look like an active positronic brain." + icon_state = "movement" + slot = "armband" diff --git a/html/changelogs/alberyk-PR-401.yml b/html/changelogs/alberyk-PR-401.yml new file mode 100644 index 00000000000..be8a7b9fb16 --- /dev/null +++ b/html/changelogs/alberyk-PR-401.yml @@ -0,0 +1,7 @@ +author: Alberky + +delete-after: True + +changes: + - rscadd: "Added tajaran and unathi gloves, a wallet and a new armband to the custom loadout." + - rscadd: "Added the Synthetic Intelligence Movement armband." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index a4d3c386126..8e2fbd124d9 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 7ea52eaf5d8..18106c0cec3 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ