From 137ed7f372606456ff8c6b80e2233a85042e9769 Mon Sep 17 00:00:00 2001 From: CygnusB <39594514+MalricB@users.noreply.github.com> Date: Fri, 3 Jul 2020 19:59:19 -0300 Subject: [PATCH] Rings hell yeah rings --- code/game/objects/items/storage/fancy.dm | 31 +++++++++++++++++ code/modules/cargo/packs.dm | 17 ++++++++++ code/modules/clothing/gloves/ring.dm | 32 ++++++++++++++++++ icons/mob/hands.dmi | Bin 9070 -> 9410 bytes icons/obj/ring.dmi | Bin 0 -> 815 bytes .../code/modules/client/loadout/backpack.dm | 20 ++++++++++- .../code/modules/client/loadout/gloves.dm | 18 ++++++++++ tgstation.dme | 1 + 8 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 code/modules/clothing/gloves/ring.dm create mode 100644 icons/obj/ring.dmi diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index a38d3d2f..e3955fa2 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 @@ -350,3 +351,33 @@ GET_COMPONENT(STR, /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.dm b/code/modules/cargo/packs.dm index 149416bf..861c122a 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -3283,3 +3283,20 @@ /obj/item/toner, /obj/item/toner) crate_name = "toner 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/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" diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm new file mode 100644 index 00000000..d4728493 --- /dev/null +++ b/code/modules/clothing/gloves/ring.dm @@ -0,0 +1,32 @@ +/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" + item_state = "gring" + 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" + item_state = "dring" + +/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) + user.visible_message("\The [user] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") + desc = "An expensive 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" + item_state = "sring" \ No newline at end of file diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index b69c6c88b1c9d20ba46a0f5a830f6eab4493b9c6..63263b835ca57b2498dadee68312dae99ea1411b 100644 GIT binary patch literal 9410 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 Y=B48FbG?&~cL$kXx4Kqibmz(c0kY*4lK=n! diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3b985fa262eb6be016f49edbf2d4c7b702283790 GIT binary patch literal 815 zcmV+~1JL}5P)C0001cP)t-sz`($n z05kspGt2-pGXOIH003qHGv&ES;;I|v!fF54b^rhWX8-^H%mCKr^Z((rLyO@60004WQchCV=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sVFlqJt@CJiHkEOv#1y-V#vjrR+N~V3Sq<5rDP`N=I5m-5Uaj8GY9AtqLruT z=MZl;RGk5-jwY-D)zyU6BRiX9=NOV?JYm(Sjwh@hq!45SQ3@f36QvaDOp$pCz6do0004|Nkl@E^6h-l)hCpo+n-K{_Lt@+f|6f>W>@MKy z4KD6k#KqOzGYs>_#~1(rfR|#kkTKr|qTis-*=D;7Y@;tA&e>+S5Pbo0&h~E$`%HQM z6M#VWIRF3v00000$p5$eu|DU^b8kk6$M$;2l)r$$Kbi9UcK`zU2N3`O00000fc$TF zQE<*v0>t}&Daz72#D7n``3NaQnL2~8KEFR%ua8gik9aOBDFx?sUB?U#;r+*C!L$4$ z7)0{2sw!XI)TgKb>Hc2`5&BtkiVD!)fua<=@%=nJ^9YpuvuXSd$Rxmc$=kNA>u5jq zAmV-mv~_Y25yN?U4gvrG0002+3Y^bMsYHIcXsrqRJJWUEAr?z3``$Z{^&4rtLG%pd zRbFpe)184Cq%=x7=hh9Zl+uRJk;tGMhQU`)?!GSYcLG7+i$>sVOz3CReO=)4eY2sT zPM|Yt^8G42*97{d*J?}B?*%&bGfn;mBnA8pAQE7zQ}aAKx8Bc~?zOdc9I5)5@*`k& t@j;~h2yi3iAW|wl2PtO&004k&`~vyvAc>o51DpT=002ovPDHLkV1ixUh${d9 literal 0 HcmV?d00001 diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 0a2922f7..1c0b40f4 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -120,4 +120,22 @@ name = "A fancy pen" category = SLOT_IN_BACKPACK path = /obj/item/pen/fountain - cost = 2 \ No newline at end of file + cost = 2 + +/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 \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 826e8096..641d4f2e 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -2,3 +2,21 @@ 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 \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 9fd96b62..cf10f10c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1509,6 +1509,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\gloves\vg_gloves.dm" #include "code\modules\clothing\head\_head.dm" #include "code\modules\clothing\head\beanie.dm"