diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 4fa9c4f39ed..1593e664ceb 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -683,17 +683,17 @@ var/list/global/random_stock_large = list( var/list/allgloves = typesof(/obj/item/clothing/gloves) var/list/exclusion = list(/obj/item/clothing/gloves, - /obj/item/clothing/gloves/fluff, - /obj/item/clothing/gloves/black/fluff, - /obj/item/clothing/gloves/white/unathi/fluff, /obj/item/clothing/gloves/swat/bst, - /obj/item/clothing/gloves/swat/fluff, /obj/item/clothing/gloves/black/fluff, /obj/item/clothing/gloves/powerfist, /obj/item/clothing/gloves/claws) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) exclusion += typesof(/obj/item/clothing/gloves/watch) + exclusion += typesof(/obj/item/clothing/gloves/swat/fluff) + exclusion += typesof(/obj/item/clothing/gloves/black/fluff) + exclusion += typesof(/obj/item/clothing/gloves/white/unathi/fluff) + exclusion += typesof(/obj/item/clothing/gloves/fluff) allgloves -= exclusion var/number = rand(1,5) while (number > 0) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 5f0e3749c11..1644aa9d315 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2265,4 +2265,45 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. new /obj/item/fluff/yarn/blue(src) new /obj/item/fluff/yarn/green(src) new /obj/item/fluff/yarn/purple(src) - new /obj/item/fluff/yarn/yellow(src) \ No newline at end of file + new /obj/item/fluff/yarn/yellow(src) + + +/obj/item/clothing/under/fluff/moyers_shirt //Custom Martian Raider T-Shirt - Caiden Moyers - tylaaaar + name = "custom martian raider t-shirt" + desc = "A Martian Raider Spaceball T-shirt with the name \"MOYERS\" written on the back in plain white text." + icon = 'icons/obj/custom_items/moyers_shirt.dmi' + icon_state = "moyers_shirt" + item_state = "moyers_shirt" + contained_sprite = TRUE + + +/obj/item/clothing/suit/fluff/eri_robes //Senior Alchemist Robes - Eri Akhandi - paradoxspace + name = "senior alchemist robes" + desc = "A green set of robes, trimmed with what appears to be real gold. Looking at the necklace, you can see the alchemical symbol for the Philosopher's Stone, made of ruby." + icon = 'icons/obj/custom_items/eri_robes.dmi' + icon_state = "eri_robes" + item_state = "eri_robes" + contained_sprite = TRUE + + +/obj/item/fluff/halstere_card //Solarian Alliance Military ID - Kalren Halstere - brutishcrab51 + name = "solarian alliance military ID" + desc = "A green and white military identification card, with an Alliance of Sovereign Solarian Nations sigil stamped on the front." + icon = 'icons/obj/custom_items/halstere_clothing.dmi' + icon_state = "halstere_card" + w_class = 2 + var/flipped = FALSE + +/obj/item/fluff/halstere_card/attack_self(mob/user as mob) + flipped = !flipped + queue_icon_update() + +/obj/item/fluff/halstere_card/update_icon() + if(flipped) + icon_state = "halstere_card_open" + else + icon_state = initial(icon_state) + +/obj/item/fluff/halstere_card/examine(mob/user) + if(..(user, 1) && flipped) + to_chat(user, "The name 'Halstere, Kalren C.' is stamped on it. An expiration date is listed on it, '2465JAN01'. A pay grade is listed beside the name. 'MAJ/O4'. A number is listed under the expiration date: '14015236810'.") \ No newline at end of file diff --git a/icons/obj/custom_items/eri_robes.dmi b/icons/obj/custom_items/eri_robes.dmi new file mode 100644 index 00000000000..5a44ee03ed2 Binary files /dev/null and b/icons/obj/custom_items/eri_robes.dmi differ diff --git a/icons/obj/custom_items/halstere_clothing.dmi b/icons/obj/custom_items/halstere_clothing.dmi index c45533383cf..0d72df2f7b3 100644 Binary files a/icons/obj/custom_items/halstere_clothing.dmi and b/icons/obj/custom_items/halstere_clothing.dmi differ diff --git a/icons/obj/custom_items/moyers_shirt.dmi b/icons/obj/custom_items/moyers_shirt.dmi new file mode 100644 index 00000000000..8206e5d98c0 Binary files /dev/null and b/icons/obj/custom_items/moyers_shirt.dmi differ