Skip to content

Commit

Permalink
some updates
Browse files Browse the repository at this point in the history
  • Loading branch information
MrSamu99 committed Sep 30, 2023
1 parent 85dbbec commit 3f69a8a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 23 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions code/modules/cargo/packs/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
5 changes: 0 additions & 5 deletions code/modules/food_and_drinks/food/snacks_vend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='suicide'>[user] is letting [src] melt in [user.p_their()] hand! It looks like [user.p_theyre()] trying to commit suicide!</span>")
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."
Expand Down
Binary file modified icons/obj/storage.dmi
Binary file not shown.

0 comments on commit 3f69a8a

Please sign in to comment.