From 3f69a8ad6c16afa347b283f73088e0a489776e7e Mon Sep 17 00:00:00 2001 From: MrSamu99 Date: Sat, 30 Sep 2023 12:09:18 +0300 Subject: [PATCH] some updates --- code/__DEFINES/construction.dm | 2 +- code/game/objects/items/storage/boxes.dm | 10 +++++----- .../crates_lockers/closets/cardboardbox.dm | 6 +++--- code/modules/cargo/packs/food.dm | 18 +++++++++--------- .../food_and_drinks/food/snacks_vend.dm | 5 ----- icons/obj/storage.dmi | Bin 80832 -> 80834 bytes 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 73f53ae594b0..dfb89a2725d3 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -84,7 +84,7 @@ #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" #define CAT_EGG "Egg-Based Food" -#define CAT_LIZARD "Lizard Food" +#define CAT_LIZARD "Sarathi Food" #define CAT_MEAT "Meats" #define CAT_MISCFOOD "Misc. Food" #define CAT_MOTH "Mothic Food" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 675200bc56c6..9452de7390dd 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1543,13 +1543,13 @@ ) generate_items_inside(items_inside,src) -/obj/item/storage/box/mothic_rations - name = "Mothic Rations Pack" - desc = "A box containing a few rations and some Activin gum, for keeping a starving moth going." - icon_state = "moth_package" +/obj/item/storage/box/rations + name = "Surplus Rations Box" + desc = "A box containing a few rations and some Activin gum, for keeping a starving crew going." + icon_state = "rations_package" illustration = null -/obj/item/storage/box/mothic_rations/PopulateContents() +/obj/item/storage/box/rations/PopulateContents() for(var/i in 1 to 3) var/randomFood = pick(list(/obj/item/reagent_containers/food/snacks/sustenance_bar, /obj/item/reagent_containers/food/snacks/sustenance_bar/cheese, diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index e0619b772d7f..315bb3c6fa96 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -77,7 +77,7 @@ close_sound_volume = 50 material_drop = /obj/item/stack/sheet/plasteel -/obj/structure/closet/cardboard/mothic - name = "\improper Mothic Fleet box" - desc = "For holding moths, presumably." +/obj/structure/closet/cardboard/rations + name = "Supply box" + desc = "For holding supplies, presumably." #undef SNAKE_SPAM_TICKS diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index c3fa15ea616b..5c817ad61d19 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -246,11 +246,11 @@ crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/food/mothic_rations +/datum/supply_pack/food/rations name = "Surplus Mothic Ration Pack" desc = "A single surplus ration pack from the Mothic Fleet. Comes with 3 random sustenance bars, and a package of Activin chewing gum." cost = 200 - contains = list(/obj/item/storage/box/mothic_rations) + contains = list(/obj/item/storage/box/rations) /datum/supply_pack/food/ready_donk name = "Ready-Donk Single Meal" @@ -272,12 +272,12 @@ var/item = pick(contains) new item(C) -/datum/supply_pack/food/mothic_rations - name = "Surplus Mothic Rations Triple-Pak" - desc = "Crew starving? Chef slacking off? Keep everyone fed on the barest minimum of what can be considered food with surplus ration packs, directly from the Mothic Fleet! Pack includes 3 packs of 3 bars each." +/datum/supply_pack/food/rations + name = "Surplus Ration Triple-Pak" + desc = "Crew starving? Chef slacking off? Keep everyone fed on the barest minimum of what can be considered food with surplus ration packs, directly from survival stores and military surplus! Pack includes 3 packs of 3 bars each." cost = 600 - contains = list(/obj/item/storage/box/mothic_rations, - /obj/item/storage/box/mothic_rations, - /obj/item/storage/box/mothic_rations,) + contains = list(/obj/item/storage/box/rations, + /obj/item/storage/box/rations, + /obj/item/storage/box/rations,) crate_name = "surplus rations box" - crate_type = /obj/structure/closet/cardboard/mothic + crate_type = /obj/structure/closet/cardboard/rations diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 14d5ed7fd660..0382ffdd843d 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -213,11 +213,6 @@ foodtype = JUNKFOOD w_class = WEIGHT_CLASS_SMALL -/obj/item/reagent_containers/food/snacks/cnds/suicide_act(mob/user) - . = ..() - user.visible_message("[user] is letting [src] melt in [user.p_their()] hand! It looks like [user.p_theyre()] trying to commit suicide!") - return TOXLOSS - /obj/item/reagent_containers/food/snacks/cnds/caramel name = "caramel C&Ds" desc = "Stuffed with sugary sweet caramel, making them a diabetic's worst nightmare." diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index a450419fa1b6eedf2fd710c050858dd64fe4bee5..02c3dceeb620f529fd37e4237f0392988633e7bf 100644 GIT binary patch delta 56 zcmV-80LTBp_XNWC1dt>F$gw4`1|akajEba~n|&R7jsJ1=@$-k(hu=Qk{~w$%1XE;_ OLz{#12DkGD0nIcyTO61G delta 54 zcmV-60LlNt_XNQA1dt>F#<3-^1|Af9sdUZ0h`k2?xcd0{!|KCtpYHz;d_@Bb_8mpa MgY^ct^#%dWG!zmXUjP6A