Skip to content

Commit

Permalink
makes it less... survivor focused. They now contain more items, but i…
Browse files Browse the repository at this point in the history
…t's a 50/50 if someone's filled them with useless crap. Funni.
  • Loading branch information
KoishiVibe committed Jun 25, 2024
1 parent c040c59 commit 0836409
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 9 deletions.
30 changes: 30 additions & 0 deletions code/game/objects/items/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
. = ..()
reagents.add_reagent("meatprotein", 2)
reagents.add_reagent("bread", 2)
reagents.add_reagent("cheese", 1)

/obj/item/reagent_container/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
if(warm)
Expand All @@ -746,6 +747,35 @@
reagents.del_reagent("tricordrazine")
name = "donk-pocket"

/obj/item/reagent_container/food/snacks/donkpocket/old
name = "questionable donkpocket"
desc = "Oh god, are those mushrooms growing out from one end?"

/obj/item/reagent_container/food/snacks/donkpocket/old/Initialize()
. = ..()
reagents.add_reagent("meatprotein", 2)
reagents.add_reagent("bread", 2)
reagents.add_reagent("cheese", 1)
reagents.add_reagent("egg", 2)
reagents.add_reagent("psilocybin", 2)

/obj/item/reagent_container/food/snacks/donkpocket/ancient
name = "moldy donkpocket"
desc = "Eating this is... probably a bad idea. It's decidedly rotten."

/obj/item/reagent_container/food/snacks/donkpocket/ancient/Initialize()
. = ..()
reagents.add_reagent("meatprotein", 1)
reagents.add_reagent("bread", 2)
reagents.add_reagent("cheese", 1)
reagents.add_reagent("mold", 5)

/obj/item/reagent_container/food/snacks/donkpocket/ancient/Initialize()
. = ..()
reagents.add_reagent("meatprotein", 2)
reagents.add_reagent("bread", 2)
reagents.add_reagent("cheese", 1)

/obj/item/reagent_container/food/snacks/brainburger
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/tools/cleaning_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@
return
..()

/obj/item/tool/soap/old
name = "grody soap"
desc = "Ewww... is that a piece of hair?"

/obj/item/tool/soap/nanotrasen
desc = "A Weyland-Yutani brand bar of soap. Smells of phoron."
icon_state = "soapnt"
Expand Down
57 changes: 48 additions & 9 deletions code/game/objects/structures/crates_lockers/largecrate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,26 +146,65 @@
// CM largecrates
/obj/structure/largecrate/random
name = "supply crate"
desc = "A partially filled small shipping crate."
fill_from_loc = FALSE
var/num_things = 0
var/list/stuff = list(/obj/item/cell/high,
/obj/item/storage/belt/utility/full,
var/list/stuff = list(
//tools
/obj/item/tool/mop,
/obj/item/device/multitool,
/obj/item/tool/crowbar,
/obj/item/device/flashlight,
/obj/item/reagent_container/food/snacks/donkpocket,
/obj/item/explosive/grenade/smokebomb,
/obj/item/circuitboard/airlock,
/obj/item/device/assembly/igniter,
/obj/item/tool/weldingtool,
/obj/item/tool/screwdriver,
/obj/item/tool/wrench,
/obj/item/tool/wirecutters,
/obj/item/device/analyzer,
/obj/item/clothing/under/marine,
/obj/item/clothing/shoes/marine)
/obj/item/tool/extinguisher,
/obj/item/tool/hand_labeler,
//components
/obj/item/circuitboard/airlock,
/obj/item/device/assembly/igniter,
/obj/item/circuitboard/machine/autolathe,
/obj/item/cell/high,
//misc
/obj/item/device/radio,
/obj/item/bedsheet,
/obj/item/facepaint,
//random food items
/obj/item/reagent_container/food/snacks/donkpocket,
/obj/item/reagent_container/food/snacks/donkpocket/old,
/obj/item/reagent_container/food/snacks/donkpocket/ancient,
/obj/item/reagent_container/food/drinks/cans/classcola,
/obj/item/reagent_container/food/drinks/cans/space_mountain_wind,
/obj/item/reagent_container/food/snacks/wy_chips/pepper,
/obj/item/reagent_container/food/snacks/candy
/obj/item/reagent_container/food/snacks/chocolatebar
//useless items
/obj/item/toy/plush,
/obj/item/toy/inflatable_duck,
/obj/item/toy/prize,
/obj/item/toy/crossbow,
/obj/item/toy/crossbow_ammo,
/obj/item/toy/sword,
/obj/item/toy/katana,
/obj/item/toy/deck,
/datum/playing_card,
/obj/item/toy/deck/uno,
/obj/item/tool/wet_sign,
/obj/item/tool/warning_cone,
/obj/item/tool/soap,
/obj/item/tool/soap/old,
/obj/item/tool/pickaxe,
/obj/item/reagent_container/food/condiment,
/obj/item/book,
/obj/item/reagent_container/blood/empty,
/obj/item/facepaint/lipstick,
)

/obj/structure/largecrate/random/Initialize()
. = ..()
if(!num_things) num_things = rand(0,3)
if(!num_things) num_things = rand(1,10)

for(var/i in 1 to num_things)
var/obj/item/thing = pick(stuff)
Expand Down

0 comments on commit 0836409

Please sign in to comment.