From feac28a5f72d674543ba45c3daec515d8b2b52cc Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 06:31:59 -0500 Subject: [PATCH 01/23] ring.dmi --- icons/ring.dmi | Bin 0 -> 487 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/ring.dmi diff --git a/icons/ring.dmi b/icons/ring.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4e775d0677649e9521a73c285c3e086aff07c4e0 GIT binary patch literal 487 zcmVHObeCSBM*p^V6(~(qg>_gcbDWa+ z<9*%I{UjzoV*-4slK5N1V)_M{0RAX!4!ojj1`5aZbcS&lJA4`jKflrBKV?_m7` z_&XpXqAh`c>rI(!B;(68m9-s#j2GOB5y%^ucb*T3i0Bji8#kW^H1iT^Q@X49eyIGa z=X_Dn_w@xj55xBY^LaqCzXO-Sg6w`TRBM=c0k>;LtZf9dbRt0lwEvWb2UZD5h d{0KyU?hTAnV0gi^H?RNz002ovPDHLkV1l%q*hv5Y literal 0 HcmV?d00001 From 065691ca1efed59ab47c7fbe4f48c8a692876289 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 06:33:13 -0500 Subject: [PATCH 02/23] adds ring boxes to fancy --- code/game/objects/items/storage/fancy.dm | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 78f306df6e..eeaa4c5d82 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,30 @@ 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 = "ringboxg" + item_state = "ringbox" + 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 = "ringboxd" + spawn_type = /obj/item/clothing/gloves/ring/diamond + +/obj/item/storage/fancy/ringbox/silver + icon_state = "ringboxs" + spawn_type = /obj/item/clothing/gloves/ring/silver \ No newline at end of file From 922f91b4093296b5751e5ce72af355cf4ca9d080 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 06:34:29 -0500 Subject: [PATCH 03/23] adds ring.dm to gloves --- code/modules/clothing/gloves/ring.dm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 code/modules/clothing/gloves/ring.dm diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm new file mode 100644 index 0000000000..3a0b6697ef --- /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 = 0 + 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 ring 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" \ No newline at end of file From 1ed4b90e5fb08ad1841a9eee21020c5470a14fdd Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 07:14:58 -0500 Subject: [PATCH 04/23] update fancy --- code/game/objects/items/storage/fancy.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index eeaa4c5d82..208f8aebec 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -363,7 +363,6 @@ desc = "A tiny box covered in soft red felt made for holding rings." icon = 'icons/obj/ring.dmi' icon_state = "ringboxg" - item_state = "ringbox" w_class = WEIGHT_CLASS_TINY spawn_type = /obj/item/clothing/gloves/ring From 7b1af64a3175099cbc77009388ff8a11707a1c23 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 08:50:55 -0500 Subject: [PATCH 05/23] update ring.dmi --- icons/obj/ring.dmi | Bin 0 -> 501 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/ring.dmi diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e91a7b6b98f61f04070b40eea20fdf9ce5c2b719 GIT binary patch literal 501 zcmV0;TeCah`b*#>%3WH}k3} z;b>iWX(_o|Hj6laoir1NT+ETpM(2BnQ|Qj-t80p))B2}6eXz|g%V|q<(g)j|v|r$o zlm*wCEE_}q(Hi=(`~1~6kNeD{0P{8-0002UNkl&uwV~V96UY(V z3)pys4WXmKdK-^mVoBqD-O~LeCO=~W!Fk;jOn?w(MTqvK2_Ya^Lf4%9f6D&+=>y%8<=;V4~U596Z{)D zp9eJa5@}PqtNDJY{Ho`CQPB7G1v(GI_X6{IK(oICm%)PUep_Jwkklg(5fPE*o^@_# rV?kC0b89WA_ugKh_ul*nM1SrLj8kBE!Lv8800000NkvXXu0mjfncd?z literal 0 HcmV?d00001 From acb6bb63f672f2138f54a6e53eadf61e3c8bdde2 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 13:51:30 +0000 Subject: [PATCH 06/23] Delete ring.dmi --- icons/ring.dmi | Bin 487 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/ring.dmi diff --git a/icons/ring.dmi b/icons/ring.dmi deleted file mode 100644 index 4e775d0677649e9521a73c285c3e086aff07c4e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmVHObeCSBM*p^V6(~(qg>_gcbDWa+ z<9*%I{UjzoV*-4slK5N1V)_M{0RAX!4!ojj1`5aZbcS&lJA4`jKflrBKV?_m7` z_&XpXqAh`c>rI(!B;(68m9-s#j2GOB5y%^ucb*T3i0Bji8#kW^H1iT^Q@X49eyIGa z=X_Dn_w@xj55xBY^LaqCzXO-Sg6w`TRBM=c0k>;LtZf9dbRt0lwEvWb2UZD5h d{0KyU?hTAnV0gi^H?RNz002ovPDHLkV1l%q*hv5Y From 89134d8b30a2cadedcd04aee4026421c61e9c3b1 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 08:52:45 -0500 Subject: [PATCH 07/23] updates fancy the boxes actually work now --- code/game/objects/items/storage/fancy.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 208f8aebec..d03835c97e 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -362,7 +362,8 @@ name = "ring box" desc = "A tiny box covered in soft red felt made for holding rings." icon = 'icons/obj/ring.dmi' - icon_state = "ringboxg" + icon_state = "gold ringbox" + icon_type = "gold ring" w_class = WEIGHT_CLASS_TINY spawn_type = /obj/item/clothing/gloves/ring @@ -373,9 +374,11 @@ STR.can_hold = typecacheof(list(/obj/item/clothing/gloves/ring)) /obj/item/storage/fancy/ringbox/diamond - icon_state = "ringboxd" + icon_state = "diamond ringbox" + icon_type = "diamond ring" spawn_type = /obj/item/clothing/gloves/ring/diamond /obj/item/storage/fancy/ringbox/silver - icon_state = "ringboxs" + icon_state = "silver ringbox" + icon_type = "silver ring" spawn_type = /obj/item/clothing/gloves/ring/silver \ No newline at end of file From 32f3b3112718c05bc8c7ba7ee50844d70729ae32 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 08:54:07 -0500 Subject: [PATCH 08/23] adds two crates --- code/modules/cargo/packs/misc.dm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index deac656109..2b54a28971 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 @@ -343,6 +360,7 @@ /obj/item/clothing/suit/hooded/chaplain_hoodie) crate_name = "religious supplies crate" + /datum/supply_pack/misc/shower name = "Shower Supplies" desc = "Everyone needs a bit of R&R. Make sure you get can get yours by ordering this crate filled with towels, rubber duckies, and some soap!" From c489571d69460590c5db3b375fedbb844ed1c316 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 13:55:06 +0000 Subject: [PATCH 09/23] Update ring.dm --- code/modules/clothing/gloves/ring.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 3a0b6697ef..176b2d0081 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -1,7 +1,7 @@ /obj/item/clothing/gloves/ring name = "gold ring" desc = "A tiny gold ring, sized to wrap around a finger." - gender = 0 + gender = NEUTER w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/ring.dmi' icon_state = "ringgold" @@ -23,4 +23,4 @@ /obj/item/clothing/gloves/ring/silver name = "silver ring" desc = "A tiny silver ring, sized to wrap around a finger." - icon_state = "ringsilver" \ No newline at end of file + icon_state = "ringsilver" From 77f6074c674838f94ff8a54fd46607db562fe24f Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 08:56:20 -0500 Subject: [PATCH 10/23] adds rings to loadout --- .../code/modules/client/loadout/backpack.dm | 21 +++++++++++++++++-- .../code/modules/client/loadout/gloves.dm | 18 ++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 48608e713e..61230407dc 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,21 @@ 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 \ 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 826e809652..641d4f2e3b 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 From 4c4fda809112b5f1e1553f97efab5f16794f865f Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 14:14:34 +0000 Subject: [PATCH 11/23] line ending --- code/game/objects/items/storage/fancy.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d03835c97e..92e09022b2 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -381,4 +381,5 @@ /obj/item/storage/fancy/ringbox/silver icon_state = "silver ringbox" icon_type = "silver ring" - spawn_type = /obj/item/clothing/gloves/ring/silver \ No newline at end of file + spawn_type = /obj/item/clothing/gloves/ring/silver + From 6c3069e944f3fb2c3653fbc801ce3bea7762f9ae Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 14:15:13 +0000 Subject: [PATCH 12/23] less empty line --- code/modules/cargo/packs/misc.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 2b54a28971..d9c9794bd8 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -360,7 +360,6 @@ /obj/item/clothing/suit/hooded/chaplain_hoodie) crate_name = "religious supplies crate" - /datum/supply_pack/misc/shower name = "Shower Supplies" desc = "Everyone needs a bit of R&R. Make sure you get can get yours by ordering this crate filled with towels, rubber duckies, and some soap!" From babeea0b28d370893d609ee7a85c29386575c5fd Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 14:15:38 +0000 Subject: [PATCH 13/23] empty line --- modular_citadel/code/modules/client/loadout/gloves.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 641d4f2e3b..72e6e91cfc 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -19,4 +19,5 @@ name = "A diamond ring" category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/diamond - cost = 4 \ No newline at end of file + cost = 4 + From 9ba8a0e8e07caaca5cc63dec6ad8e9730ed223cd Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 14:15:59 +0000 Subject: [PATCH 14/23] empty line --- modular_citadel/code/modules/client/loadout/backpack.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 61230407dc..d51f4b6125 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -145,4 +145,5 @@ name = "A diamond ring box" category = SLOT_IN_BACKPACK path = /obj/item/storage/fancy/ringbox/diamond - cost = 5 \ No newline at end of file + cost = 5 + From 65ca071eb4e97bea688b7a3bf6869bd3615b7774 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 14:29:40 +0000 Subject: [PATCH 15/23] linting?? --- code/modules/clothing/gloves/ring.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 176b2d0081..33afa35959 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -14,7 +14,6 @@ user.visible_message("\ [user] is putting the ring 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." @@ -24,3 +23,5 @@ name = "silver ring" desc = "A tiny silver ring, sized to wrap around a finger." icon_state = "ringsilver" + + From a5991eac3eace5793ec9779a5bea1f883440e0cd Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 22:40:06 +0000 Subject: [PATCH 16/23] Update tgstation.dme --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index ee457b102e..a772733503 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1635,6 +1635,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" From 6d44e59497df2b36d94dd25d8722dbabd6f2cd1f Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 22:56:34 +0000 Subject: [PATCH 17/23] Update ring.dm --- code/modules/clothing/gloves/ring.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 33afa35959..2a8deebe27 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -11,7 +11,7 @@ strip_delay = 40 /obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user) - user.visible_message("\ [user] is putting the ring in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!") + user.visible_message("[user] is putting the ring in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!") return OXYLOSS /obj/item/clothing/gloves/ring/diamond From 35e16c5cd54c89414543bd7e784d4786e73cf831 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 22:58:05 +0000 Subject: [PATCH 18/23] Update ring.dm --- code/modules/clothing/gloves/ring.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 2a8deebe27..252978ccc2 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -11,7 +11,7 @@ strip_delay = 40 /obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is putting the ring in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!") + 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 From c12022123417433e91a1ee990f491b8228dfa0fc Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 23:13:58 +0000 Subject: [PATCH 19/23] Update ring.dm --- code/modules/clothing/gloves/ring.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 252978ccc2..42a3152607 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -23,5 +23,3 @@ name = "silver ring" desc = "A tiny silver ring, sized to wrap around a finger." icon_state = "ringsilver" - - From 0020977891c603f8d923f67aff0a2c6dadd82ab3 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 19:05:23 -0500 Subject: [PATCH 21/23] this line ending shit is legitimate cancer --- code/modules/clothing/gloves/ring.dm | 51 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 42a3152607..cfa15c1af5 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -1,25 +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" +/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 ring 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" \ No newline at end of file From 0d1d90cc969a6330653c819d60d09b6cd015866d Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 31 Jan 2020 19:23:59 -0500 Subject: [PATCH 22/23] bigger rings --- icons/obj/ring.dmi | Bin 501 -> 550 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi index e91a7b6b98f61f04070b40eea20fdf9ce5c2b719..52fe249394d60452225592422e0862afb6ff222d 100644 GIT binary patch delta 280 zcmV+z0q6ep1EvJ97y*CzNklR{4ZQsP5Z*5YA^$`sr9`xlRkbexEw)M>NBIBBhq zfW|9W-T;0Fgb+g31pKXMF0K)cCsXIrwgoh9aCWqSUO~KbJ|KUD5Hbb+#-rzfkmw`| z>GUOt?|Y!1ew@z?>e}BB>ZX|)gEM_xhSa!b9?pkb>95 z6mqZtLI@#iXLEzL=jQsDYHK46jBij_J46=Xhov2gxDx!hb_SpIQv>t}VcthKahCVd e*GR~Mya3y1dGHVbdzZfe000037y*CCNkl&uwV~V96UY(V3)pys4WXmKdK-^m zVoBqD-O~LeCO=~W!Fk;jOn?w(MTqvK2_Ya^Lf4%9f6D&+=>y%8<=;V4~U596Z~EqH=hSI^Ac%Ox~utq zsQjwud{NN%^#wW)!}kL7c|fzj1DC;q?0#Ed|B%!p5D^iP=ALzKXJbKD1#@dHsQ2Dp gp!eSV2t Date: Sat, 1 Feb 2020 00:28:04 +0000 Subject: [PATCH 23/23] Update ring.dm --- code/modules/clothing/gloves/ring.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index cfa15c1af5..54aaa58849 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -11,7 +11,7 @@ strip_delay = 40 /obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user) - user.visible_message("\ [user] is putting the ring in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!") + 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 @@ -23,4 +23,4 @@ /obj/item/clothing/gloves/ring/silver name = "silver ring" desc = "A tiny silver ring, sized to wrap around a finger." - icon_state = "ringsilver" \ No newline at end of file + icon_state = "ringsilver"