From fd477359233d03c71178237fc14b52d04d5073e7 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Sun, 27 Jun 2021 17:57:02 -0500 Subject: [PATCH 01/20] Fixes inverted logic in staffwho --- code/modules/client/verbs/who.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 08854d0eee..f45fcdf016 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -70,7 +70,7 @@ var/temp = "" var/category = R_ADMIN if(check_rights(R_ADMIN, FALSE, C)) // admins - if(C.holder.fakekey && check_rights(R_ADMIN|R_MOD, FALSE, src)) // Only admins and mods can see stealthmins + if(C.holder.fakekey && !check_rights_for(src, R_ADMIN|R_MOD)) // Only admins and mods can see stealthmins continue num_admins_online++ else if(check_rights(R_MOD, FALSE, C)) // mods From ae1ec55bf3e68389561fc0f528f139c70ea4a1c5 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Mon, 12 Jul 2021 00:58:28 -0500 Subject: [PATCH 02/20] Fixes utensils, adds variable scoop size (#8165) * Fixes utensils, adds variable scoop size * Update code/game/objects/items/weapons/material/kitchen.dm --- .../objects/items/weapons/material/kitchen.dm | 59 ++++++++++++------- code/modules/food/food/snacks.dm | 19 +----- .../mob/living/carbon/human/human_helpers.dm | 4 +- html/changelogs/MDP-utensilfix.yml | 36 +++++++++++ 4 files changed, 78 insertions(+), 40 deletions(-) create mode 100644 html/changelogs/MDP-utensilfix.yml diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index ea16a3be20..1f89fbc6c2 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -15,24 +15,44 @@ edge = TRUE force_divisor = 0.1 // 6 when wielded with hardness 60 (steel) thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel) - var/weakref/loaded //Weakref for currently loaded food object. + var/scoop_volume = 5 + var/loaded // Name for currently loaded food object. + var/loaded_color // Color for currently loaded food object. -/obj/item/weapon/material/kitchen/utensil/New() - ..() +/obj/item/weapon/material/kitchen/utensil/Initialize() + . = ..() if (prob(60)) src.pixel_y = rand(0, 4) - create_reagents(5) - return + create_reagents(scoop_volume) /obj/item/weapon/material/kitchen/utensil/update_icon() . = ..() cut_overlays() - var/obj/item/weapon/reagent_containers/food/snacks/eaten = loaded?.resolve() - if(eaten) + if(loaded) var/image/I = new(icon, "loadedfood") - I.color = eaten.filling_color + I.color = loaded_color add_overlay(I) +/obj/item/weapon/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/weapon/reagent_containers/food/snacks/loading) + if (reagents.total_volume > 0) + to_chat(user, SPAN_DANGER("There is already something on \the [src].")) + return + if (!loading?.reagents?.total_volume) + to_chat(user, SPAN_NOTICE("Nothing to scoop up in \the [loading]!")) + + + loaded = "\the [loading]" + user.visible_message( \ + "\The [user] scoops up some of [loaded] with \the [src]!", + SPAN_NOTICE("You scoop up some of [loaded] with \the [src]!") + ) + loading.bitecount++ + loading.reagents.trans_to_obj(src, min(loading.reagents.total_volume, scoop_volume)) + loaded_color = loading.filling_color + if (loading.reagents.total_volume <= 0) + qdel(loading) + update_icon() + /obj/item/weapon/material/kitchen/utensil/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) return ..() @@ -46,19 +66,18 @@ return ..() if (loaded && reagents.total_volume > 0) - var/atom/movable/eaten = loaded?.resolve() reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) - if(eaten) - if(M == user) - if(!M.can_eat(eaten)) - return - M.visible_message(SPAN_NOTICE("\The [user] eats some of \the [eaten] with \the [src].")) - else - user.visible_message(SPAN_WARNING("\The [user] begins to feed \the [M]!")) - if(!(M.can_force_feed(user, eaten) && do_mob(user, M, 5 SECONDS))) - return - M.visible_message(SPAN_NOTICE("\The [user] feeds some of \the [eaten] to \the [M] with \the [src].")) - playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1) + if(M == user) + if(!M.can_eat(loaded)) + return + M.visible_message("\The [user] eats some of [loaded] with \the [src].") + else + user.visible_message(SPAN_WARNING("\The [user] begins to feed \the [M]!")) + if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS))) + return + M.visible_message("\The [user] feeds some of [loaded] to \the [M] with \the [src].") + playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1) + loaded = null update_icon() return else diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index ffc8070254..9f07dbf08d 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -160,24 +160,7 @@ // Eating with forks if(istype(W,/obj/item/weapon/material/kitchen/utensil)) var/obj/item/weapon/material/kitchen/utensil/U = W - if(!U.reagents) - U.create_reagents(5) - - if (U.reagents.total_volume > 0) - to_chat(user, "You already have something on your [U].") - return - - user.visible_message( \ - "[user] scoops up some [src] with \the [U]!", \ - "You scoop up some [src] with \the [U]!" \ - ) - - bitecount++ - - reagents.trans_to_obj(U, min(reagents.total_volume,5)) - - if (reagents.total_volume <= 0) - qdel(src) + U.load_food(user, src) return if (is_sliceable()) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7a921adf04..f8b7ad6fb2 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -8,7 +8,7 @@ return 1 if(feedback) if(status[1] == HUMAN_EATING_NO_MOUTH) - to_chat(src, "Where do you intend to put \the [food]? You don't have a mouth!") + to_chat(src, "Where do you intend to put [food]? You don't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) to_chat(src, "\The [status[2]] is in the way!") return 0 @@ -19,7 +19,7 @@ return 1 if(feedback) if(status[1] == HUMAN_EATING_NO_MOUTH) - to_chat(feeder, "Where do you intend to put \the [food]? \The [src] doesn't have a mouth!") + to_chat(feeder, "Where do you intend to put [food]? \The [src] doesn't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) to_chat(feeder, "\The [status[2]] is in the way!") return 0 diff --git a/html/changelogs/MDP-utensilfix.yml b/html/changelogs/MDP-utensilfix.yml new file mode 100644 index 0000000000..017bdd55d3 --- /dev/null +++ b/html/changelogs/MDP-utensilfix.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: MoondancerPony + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Makes utensils work for eating food again." From d23aaa9e414300aaa727490cedbb40e38b0ef40b Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 12 Jul 2021 05:59:02 +0000 Subject: [PATCH 03/20] Automatic changelog generation for --- html/changelog.html | 6 +++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/MDP-utensilfix.yml | 36 ------------------------------ 3 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 html/changelogs/MDP-utensilfix.yml diff --git a/html/changelog.html b/html/changelog.html index 89684e0897..dc0b12ff83 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,12 @@ -->
+

12 July 2021

+

MoondancerPony updated:

+
    +
  • Makes utensils work for eating food again.
    • +
+

20 June 2021

MoondancerPony updated: