From cd91c84586b62d3d2532ccc4013684dea76003b4 Mon Sep 17 00:00:00 2001 From: Alphas00 <154434082+Alphas00@users.noreply.github.com> Date: Sun, 5 May 2024 09:41:15 +0200 Subject: [PATCH 1/4] Service sign Added an "open/closed" sign, toggles between either when used. Crafted with 1 sheet of cardboard --- GainStation13/code/obj/items/minor_items.dm | 14 ++++++++++++++ GainStation13/icons/obj/service_sign.dmi | Bin 0 -> 334 bytes .../objects/items/stacks/sheets/sheet_types.dm | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 GainStation13/icons/obj/service_sign.dmi diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index 32afc828..59b41b7f 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -143,3 +143,17 @@ icon_state = "ballgag" item_state = "ballgag" flags_inv = HIDEFACE + +/obj/item/service_sign + name = "service sign" + desc = "A sign that reads 'closed'" + icon = 'GainStation13/icons/obj/service_sign.dmi' + icon_state = "sign_closed" + +/obj/item/service_sign/attack_self() + if(icon_state == "sign_closed") + icon_state = "sign_open" + desc = "A sign that reads 'open'" + else + icon_state = "sign_closed" + desc = "A sign that reads 'closed'" diff --git a/GainStation13/icons/obj/service_sign.dmi b/GainStation13/icons/obj/service_sign.dmi new file mode 100644 index 0000000000000000000000000000000000000000..79f738a9aecb7fa8a6fb6047eb9e50aed7e635b4 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQv3lvA+84w9C-EW6_EG;|9>Dm z$#}_6AcwIe$S;_|;n|HeAg8=4B%;J6wK%ybv!En1KaYW-Voq>aK~d@VFTn*Lzdq6O z*3~+9=6vvmP=kxc4<6~9_t8AbP}I}A!@@Yo__DE=!kkBwj!X(s2wrJnY^!f)slMOB z)U~tQSatIX35~21M`wmjnK7Fyaq+6N`W|NwFAa)3c=bH%8y<$Q_cXpvZ@9;%u1m9#%|WG$_4ut!wFH c`}Z3d&pncfT()N6CZMehp00i_>zopr0FCB^mjD0& literal 0 HcmV?d00001 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 53634aa6..cf9a916a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -483,6 +483,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \ new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \ new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \ + null, \ + new/datum/stack_recipe("open/closed sign", /obj/item/service_sign), \ )) /obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck From 6ca1ea3796ddac23b0af211b5fc9a05d80cc739e Mon Sep 17 00:00:00 2001 From: Alphas00 <154434082+Alphas00@users.noreply.github.com> Date: Sun, 5 May 2024 10:38:21 +0200 Subject: [PATCH 2/4] Sign sprite Added the sign sprites made by archerln --- GainStation13/icons/obj/service_sign.dmi | Bin 334 -> 399 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/GainStation13/icons/obj/service_sign.dmi b/GainStation13/icons/obj/service_sign.dmi index 79f738a9aecb7fa8a6fb6047eb9e50aed7e635b4..76b899272afcf019e1fc0a18394f85a37f1886c4 100644 GIT binary patch delta 228 zcmV*#!R3B zc9YPVp^;NVXHJa_jf5xwN_WiY1e23M3L-4&<&vwH-s916bK=E1EjzW e)f=N=kN^PBeo$z1*#naR0000Hq)$|NsBMz`$ZNr1_CilYeSSL_t(IjqQ)i z34kyVL|1GeGaXDS5NyDM{nzBK3P~^^f(H-2z3hWwKW0B40u? Date: Mon, 6 May 2024 12:55:48 +0200 Subject: [PATCH 3/4] Extreme WG Added XWG preferences and mechanics --- GainStation13/code/mechanics/fatness.dm | 13 +++++++++++++ .../code/modules/client/preferences/preferences.dm | 2 ++ code/modules/client/preferences.dm | 3 +++ code/modules/client/preferences_savefile.dm | 2 ++ 4 files changed, 20 insertions(+) diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index 29370458..5ad4c6ed 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -52,6 +52,9 @@ else //If it's not being hidden fatness = fatness_real //Make their current fatness their real fatness + if(client?.prefs?.weight_gain_extreme) + xwg_resize() + return TRUE @@ -102,11 +105,21 @@ fatness_hidden = TRUE fatness_over = hide_amount fatness = fatness_over //To update a mob's fatness with the new amount to be shown immediately + if(client?.prefs?.weight_gain_extreme) + xwg_resize() return TRUE /mob/living/carbon/proc/fat_show() //If something that hides fatness is removed or expires, it'll call this method fatness_hidden = FALSE fatness = fatness_real //To update a mob's fatness with their real one immediately + if(client?.prefs?.weight_gain_extreme) + xwg_resize() return TRUE + +/mob/living/carbon/proc/xwg_resize() + var/xwg_size = sqrt(fatness/FATNESS_LEVEL_BLOB) + xwg_size = min(xwg_size, RESIZE_MACRO) + xwg_size = max(xwg_size, custom_body_size*0.01) + resize(xwg_size) diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm index f7f591be..f8166f8f 100644 --- a/GainStation13/code/modules/client/preferences/preferences.dm +++ b/GainStation13/code/modules/client/preferences/preferences.dm @@ -13,6 +13,8 @@ var/weight_gain_magic = FALSE ///Weight gain from viruses var/weight_gain_viruses = FALSE + ///Extreme weight gain + var/weight_gain_extreme = FALSE ///Does the person wish to be involved with non-con weight gain events? var/noncon_weight_gain = FALSE diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8702b594..0f509622 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1059,6 +1059,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Weight Gain - Weapons:[weight_gain_weapons == TRUE ? "Enabled" : "Disabled"]
" dat += "Weight Gain - Magic:[weight_gain_magic == TRUE ? "Enabled" : "Disabled"]
" dat += "Weight Gain - Viruses:[weight_gain_viruses == TRUE ? "Enabled" : "Disabled"]
" + dat += "Extreme Weight Gain:[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]
" //Add the Hyper stuff below here dat += "

Hyper Preferences

" @@ -2623,6 +2624,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) weight_gain_magic = !weight_gain_magic if("weight_gain_viruses") weight_gain_viruses = !weight_gain_viruses + if("weight_gain_extreme") + weight_gain_extreme = !weight_gain_extreme if("noncon_weight_gain") noncon_weight_gain = !noncon_weight_gain if("max_fatness") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index edf5db99..b87e0420 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -153,6 +153,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["weight_gain_magic"] >> weight_gain_magic S["weight_gain_viruses"] >> weight_gain_viruses S["weight_gain_weapons"] >> weight_gain_weapons + S["weight_gain_extreme"] >> weight_gain_extreme S["wg_rate"] >> wg_rate S["wl_rate"] >> wl_rate S["noncon_weight_gain"] >> noncon_weight_gain @@ -292,6 +293,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["weight_gain_viruses"], weight_gain_viruses) WRITE_FILE(S["weight_gain_chems"], weight_gain_chems) WRITE_FILE(S["weight_gain_weapons"], weight_gain_weapons) + WRITE_FILE(S["weight_gain_extreme"], weight_gain_extreme) WRITE_FILE(S["wg_rate"], wg_rate) WRITE_FILE(S["wl_rate"], wl_rate) WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain) From 1c4f1abeeaec43ed9f7e31b92061975d22e76628 Mon Sep 17 00:00:00 2001 From: Alphas00 <154434082+Alphas00@users.noreply.github.com> Date: Tue, 7 May 2024 14:27:49 +0200 Subject: [PATCH 4/4] Sticky Web pulled by Web Weaver Characters that are being pulled by a character who has the Web Weaver quirk will not get stuck in the webs --- code/game/objects/effects/spiders.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 737247ac..e83c3e9a 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -41,6 +41,9 @@ else if(isliving(mover)) if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider)) return TRUE + if(mover.pulledby) + if(HAS_TRAIT(mover.pulledby, TRAIT_WEB_WEAVER)) + return TRUE if(prob(50)) to_chat(mover, "You get stuck in \the [src] for a moment.") return FALSE