diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 78f306df6e..92e09022b2 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -12,6 +12,7 @@ * Cigarette Box * Cigar Case * Heart Shaped Box w/ Chocolates + * Ring Box */ /obj/item/storage/fancy @@ -352,3 +353,33 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 8 STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/tinychocolate)) + +/* + * Ring Box + */ + +/obj/item/storage/fancy/ringbox + name = "ring box" + desc = "A tiny box covered in soft red felt made for holding rings." + icon = 'icons/obj/ring.dmi' + icon_state = "gold ringbox" + icon_type = "gold ring" + w_class = WEIGHT_CLASS_TINY + spawn_type = /obj/item/clothing/gloves/ring + +/obj/item/storage/fancy/ringbox/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 1 + STR.can_hold = typecacheof(list(/obj/item/clothing/gloves/ring)) + +/obj/item/storage/fancy/ringbox/diamond + icon_state = "diamond ringbox" + icon_type = "diamond ring" + spawn_type = /obj/item/clothing/gloves/ring/diamond + +/obj/item/storage/fancy/ringbox/silver + icon_state = "silver ringbox" + icon_type = "silver ring" + spawn_type = /obj/item/clothing/gloves/ring/silver + diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index deac656109..d9c9794bd8 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -238,7 +238,7 @@ desc = "Get your mind out of the gutter operative, you have work to do. Three items per order. Possible Results: .357 Speedloaders, Kitchen Gun Mags, Stetchkin Mags." hidden = TRUE cost = 12000 - var/num_contained = 3 + var/num_contained = 3 contains = list(/obj/item/ammo_box/a357, /obj/item/ammo_box/a357, /obj/item/ammo_box/a357, @@ -268,6 +268,13 @@ /obj/item/storage/box/matches) crate_name = "candle crate" +/datum/supply_pack/misc/diamondring + name = "Diamond Ring" + desc = "Show them your love is like a diamond: unbreakable and forever lasting. Shipped straight from child slave cartels in the space african mines." + cost = 10000 + contains = list(/obj/item/storage/fancy/ringbox/diamond) + crate_name = "diamond ring crate" + /datum/supply_pack/misc/exoticfootwear name = "Exotic Footwear Crate" desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." @@ -303,6 +310,16 @@ crate_name = "coffin" crate_type = /obj/structure/closet/crate/coffin +/datum/supply_pack/misc/jewelry + name = "Jewelry Crate" + desc = "Bling out with this crate of jewelry. Includes gold necklace and a set of two rings." + cost = 5000 + contains = list(/obj/item/clothing/neck/necklace/dope, + /obj/item/storage/fancy/ringbox, + /obj/item/storage/fancy/ringbox/silver + ) + crate_name = "jewelry crate" + /datum/supply_pack/misc/jukebox name = "Jukebox" cost = 10000 diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm new file mode 100644 index 0000000000..54aaa58849 --- /dev/null +++ b/code/modules/clothing/gloves/ring.dm @@ -0,0 +1,26 @@ +/obj/item/clothing/gloves/ring + name = "gold ring" + desc = "A tiny gold ring, sized to wrap around a finger." + gender = NEUTER + w_class = WEIGHT_CLASS_TINY + icon = 'icons/obj/ring.dmi' + icon_state = "ringgold" + body_parts_covered = 0 + attack_verb = list("proposed") + transfer_prints = TRUE + strip_delay = 40 + +/obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user) + user.visible_message("\[user] is putting the [src] in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!") + return OXYLOSS + + +/obj/item/clothing/gloves/ring/diamond + name = "diamond ring" + desc = "A tiny gold ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." + icon_state = "ringdiamond" + +/obj/item/clothing/gloves/ring/silver + name = "silver ring" + desc = "A tiny silver ring, sized to wrap around a finger." + icon_state = "ringsilver" diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi new file mode 100644 index 0000000000..52fe249394 Binary files /dev/null and b/icons/obj/ring.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 48608e713e..d51f4b6125 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -95,7 +95,7 @@ name = "Newspaper" category = SLOT_IN_BACKPACK path = /obj/item/newspaper - + /datum/gear/paperbin name = "Paper Bin" category = SLOT_IN_BACKPACK @@ -128,4 +128,22 @@ category = SLOT_IN_BACKPACK path = /obj/item/modular_computer/laptop/preset/civilian cost = 7 + +/datum/gear/ringbox_gold + name = "A gold ring box" + category = SLOT_IN_BACKPACK + path = /obj/item/storage/fancy/ringbox + cost = 3 + +/datum/gear/ringbox_silver + name = "A silver ring box" + category = SLOT_IN_BACKPACK + path = /obj/item/storage/fancy/ringbox/silver + cost = 3 + +/datum/gear/ringbox_diamond + name = "A diamond ring box" + category = SLOT_IN_BACKPACK + path = /obj/item/storage/fancy/ringbox/diamond + cost = 5 diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 826e809652..72e6e91cfc 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -2,3 +2,22 @@ name = "Fingerless Gloves" category = SLOT_GLOVES path = /obj/item/clothing/gloves/fingerless + +/datum/gear/goldring + name = "A gold ring" + category = SLOT_GLOVES + path = /obj/item/clothing/gloves/ring + cost = 2 + +/datum/gear/silverring + name = "A silver ring" + category = SLOT_GLOVES + path = /obj/item/clothing/gloves/ring/silver + cost = 2 + +/datum/gear/diamondring + name = "A diamond ring" + category = SLOT_GLOVES + path = /obj/item/clothing/gloves/ring/diamond + cost = 4 + diff --git a/tgstation.dme b/tgstation.dme index 3e3a04b8a9..653b9e5b28 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1644,6 +1644,7 @@ #include "code\modules\clothing\gloves\boxing.dm" #include "code\modules\clothing\gloves\color.dm" #include "code\modules\clothing\gloves\miscellaneous.dm" +#include "code\modules\clothing\gloves\ring.dm" #include "code\modules\clothing\head\_head.dm" #include "code\modules\clothing\head\beanie.dm" #include "code\modules\clothing\head\cit_hats.dm"