From 84e3ef539ad72f58be60bec1e86d5246e31e1197 Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:55:21 -0500 Subject: [PATCH 1/3] base collars --- .../code/clothing/calorite_collar.dm | 37 +++++++++++++++++++ tgstation.dme | 1 + 2 files changed, 38 insertions(+) create mode 100644 GainStation13/code/clothing/calorite_collar.dm diff --git a/GainStation13/code/clothing/calorite_collar.dm b/GainStation13/code/clothing/calorite_collar.dm new file mode 100644 index 00000000..af7e49db --- /dev/null +++ b/GainStation13/code/clothing/calorite_collar.dm @@ -0,0 +1,37 @@ +/obj/item/clothing/neck + ///How much faster does the wearer gain weight? 1 = 100% faster + var/weight_gain_rate_modifier = 0 + +/obj/item/clothing/neck/equipped(mob/user, slot) + . = ..() + + var/mob/living/carbon/wearer = user + if(!weight_gain_rate_modifier) + return FALSE + + if(!iscarbon(wearer) || slot != SLOT_NECK || !wearer?.client?.prefs?.weight_gain_items) + return FALSE + + wearer.weight_gain_rate = wearer.weight_gain_rate * weight_gain_rate_modifier + +/obj/item/clothing/neck/dropped(mob/user) + . = ..() + var/mob/living/carbon/wearer = user + if(!weight_gain_rate_modifier) + return FALSE + + if(!iscarbon(wearer) || !(wearer.get_item_by_slot(SLOT_NECK) == src) || !wearer?.client?.prefs?.weight_gain_items) + return FALSE + + wearer.weight_gain_rate = (wearer.weight_gain_rate / weight_gain_rate_modifier) + + +/obj/item/clothing/neck/petcollar/calorite + name = "calorite collar" + desc = "A modified pet collar infused with calorite, magnifying the caloric impact of any food the wearer eats" + weight_gain_rate_modifier = 1.5 + +/obj/item/clothing/neck/petcollar/locked/calorite + name = "locked calorite collar" + desc = "A modified locked collar infused with calorite, magnifying the caloric impact of any food the wearer eats" + weight_gain_rate_modifier = 1.5 diff --git a/tgstation.dme b/tgstation.dme index de346663..aaf9795d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3316,6 +3316,7 @@ #include "code\modules\VR\vr_sleeper.dm" #include "code\modules\zombie\items.dm" #include "code\modules\zombie\organs.dm" +#include "GainStation13\code\clothing\calorite_collar.dm" #include "GainStation13\code\mechanics\fatness.dm" #include "GainStation13\code\modules\client\preferences\preferences.dm" #include "GainStation13\code\modules\mob\living\emote.dm" From 4e7b0c35e897932b8cba5b2993ac87489decec05 Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:55:34 -0500 Subject: [PATCH 2/3] Update calorite_collar.dm --- GainStation13/code/clothing/calorite_collar.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GainStation13/code/clothing/calorite_collar.dm b/GainStation13/code/clothing/calorite_collar.dm index af7e49db..10d7e29e 100644 --- a/GainStation13/code/clothing/calorite_collar.dm +++ b/GainStation13/code/clothing/calorite_collar.dm @@ -23,7 +23,7 @@ if(!iscarbon(wearer) || !(wearer.get_item_by_slot(SLOT_NECK) == src) || !wearer?.client?.prefs?.weight_gain_items) return FALSE - wearer.weight_gain_rate = (wearer.weight_gain_rate / weight_gain_rate_modifier) + wearer.weight_gain_rate = (wearer.weight_gain_rate / weight_gain_rate_modifier) /obj/item/clothing/neck/petcollar/calorite From df12b94802cc3a1b1677c79dcec0aa00d0e70f4b Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Sat, 11 Feb 2023 19:05:20 -0500 Subject: [PATCH 3/3] Update calorite_collar.dm --- GainStation13/code/clothing/calorite_collar.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/GainStation13/code/clothing/calorite_collar.dm b/GainStation13/code/clothing/calorite_collar.dm index 10d7e29e..b65315d7 100644 --- a/GainStation13/code/clothing/calorite_collar.dm +++ b/GainStation13/code/clothing/calorite_collar.dm @@ -35,3 +35,19 @@ name = "locked calorite collar" desc = "A modified locked collar infused with calorite, magnifying the caloric impact of any food the wearer eats" weight_gain_rate_modifier = 1.5 + +/datum/crafting_recipe/calorite_collar + name = "Calorite Collar" + result = /obj/item/clothing/neck/petcollar/calorite + time = 25 + reqs = list(/obj/item/clothing/neck/petcollar = 1, + /obj/item/stack/sheet/mineral/calorite = 3) + category = CAT_CLOTHING + +/datum/crafting_recipe/locked_calorite_collar + name = "Locked Calorite Collar" + result = /obj/item/clothing/neck/petcollar/locked/calorite + time = 25 + reqs = list(/obj/item/clothing/neck/petcollar/locked = 1, + /obj/item/stack/sheet/mineral/calorite = 3) + category = CAT_CLOTHING