Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
 into aneri-test
  • Loading branch information
Absolucy committed Apr 13, 2024
2 parents adfcb14 + 12116e5 commit a74a7ba
Show file tree
Hide file tree
Showing 62 changed files with 3,895 additions and 64 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
#define CAT_LIZARD "Lizard Food"
#define CAT_MEAT "Meats"
#define CAT_SEAFOOD "Seafood"
#define CAT_MARTIAN "Martian Food"
#define CAT_MISCFOOD "Misc. Food"
#define CAT_MEXICAN "Mexican Food"
#define CAT_MOTH "Mothic Food"
Expand All @@ -118,6 +119,7 @@ GLOBAL_LIST_INIT(crafting_category_food, list(
CAT_LIZARD,
CAT_MEAT,
CAT_SEAFOOD,
CAT_MARTIAN,
CAT_MISCFOOD,
CAT_MEXICAN,
CAT_MOTH,
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/stamina.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@
#define STAMINA_GRAB_AGGRESSIVE_RESIST_CHANCE 60
/// Chance to resist out of chokeholds grabs.
#define STAMINA_GRAB_CHOKE_RESIST_CHANCE 45

////
/// TRAITS
////
#define TRAIT_CANT_STAMCRIT "cant_stamcrit"
11 changes: 7 additions & 4 deletions code/controllers/subsystem/events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ SUBSYSTEM_DEF(events)
var/wizardmode = FALSE

/datum/controller/subsystem/events/Initialize()
for(var/type in typesof(/datum/round_event_control))
var/datum/round_event_control/event = new type()
if(!event.typepath || !event.valid_for_map())
continue //don't want this one! leave it for the garbage collector
for(var/datum/round_event_control/event_type as anything in typesof(/datum/round_event_control))
if(!event_type::typepath || !event_type::name)
continue
var/datum/round_event_control/event = new event_type
if(!event.valid_for_map())
qdel(event)
continue
control += event //add it to the list of all events (controls)
reschedule()
// Instantiate our holidays list if it hasn't been already
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mood_events/drink_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
timeout = 10 MINUTES

/datum/mood_event/wellcheers
description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up."
description = "What a tasty can of Wellcheers! The salty grape flavor is a great pick-me-up."
mood_change = 3
timeout = 7 MINUTES
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
item_path = /obj/item/food/fishmeat
cost_per_order = 12

/datum/orderable_item/milk_eggs/octopus
name = "Octopus Tentacle"
item_path = /obj/item/food/fishmeat/octopus
cost_per_order = 12

/datum/orderable_item/milk_eggs/spider_eggs
name = "Spider Eggs"
item_path = /obj/item/food/spidereggs
Expand Down Expand Up @@ -65,6 +70,16 @@
item_path = /obj/item/food/canned/pine_nuts
cost_per_order = 20

/datum/orderable_item/milk_eggs/canned_squid_ink
name = "Canned Squid Ink"
item_path = /obj/item/food/canned/squid_ink
cost_per_order = 20

/datum/orderable_item/milk_eggs/chap
name = "Can of CHAP"
item_path = /obj/item/food/canned/chap
cost_per_order = 20

/datum/orderable_item/milk_eggs/ready_donk
name = "Ready-Donk Meal: Bachelor Chow"
item_path = /obj/item/food/ready_donk
Expand All @@ -80,6 +95,16 @@
item_path = /obj/item/food/ready_donk/donkhiladas
cost_per_order = 40

/datum/orderable_item/milk_eggs/ready_donk_nachos
name = "Ready-Donk Meal: Donk Sol Series Boritos Nachos Grandes"
item_path = /obj/item/food/ready_donk/nachos_grandes
cost_per_order = 40

/datum/orderable_item/milk_eggs/ready_donk_orange
name = "Ready-Donk Meal: Donk-range Chicken"
item_path = /obj/item/food/ready_donk/donkrange_chicken
cost_per_order = 40

/datum/orderable_item/milk_eggs/tiziran_goods
name = "Tiziran Farm-Fresh Pack"
item_path = /obj/item/storage/box/tiziran_goods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,33 @@
name = "Cherry Jelly"
item_path = /obj/item/reagent_containers/condiment/cherryjelly
cost_per_order = 30

/datum/orderable_item/reagents/worcestershire
name = "Worcestershire Sauce"
item_path = /obj/item/reagent_containers/condiment/worcestershire
cost_per_order = 30

/datum/orderable_item/reagents/red_bay
name = "Red Bay Seasoning"
item_path = /obj/item/reagent_containers/condiment/red_bay
cost_per_order = 30

/datum/orderable_item/reagents/curry_powder
name = "Curry Powder"
item_path = /obj/item/reagent_containers/condiment/curry_powder
cost_per_order = 30

/datum/orderable_item/reagents/dashi_concentrate
name = "Dashi Concentrate"
item_path = /obj/item/reagent_containers/condiment/dashi_concentrate
cost_per_order = 30

/datum/orderable_item/reagents/coconut_milk
name = "Coconut Milk"
item_path = /obj/item/reagent_containers/condiment/coconut_milk
cost_per_order = 30

/datum/orderable_item/reagents/grounding_solution
name = "Grounding Solution"
item_path = /obj/item/reagent_containers/condiment/grounding_solution
cost_per_order = 30
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@
name = "Jar of pickles"
item_path = /obj/item/storage/fancy/pickles_jar
cost_per_order = 60

/datum/orderable_item/veggies/pickled_voltvine
name = "Pickled Voltvine"
item_path = /obj/item/food/pickled_voltvine
cost_per_order = 5
Loading

0 comments on commit a74a7ba

Please sign in to comment.