cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-23 12:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

config junk

Browse Source
This commit is contained in:
DragonTrance
2022-06-09 17:54:40 -04:00
parent c771649850
commit 7bae2a36ee
51 changed files with 192 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+9 -6
View File
@@ -217,7 +217,7 @@
resistance_flags = FREEZE_PROOF
isGlass = FALSE
foodtype = BREAKFAST
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
//Used by MREs
/obj/item/reagent_containers/food/drinks/coffee/type2
@@ -241,7 +241,7 @@
icon_state = "tea"
item_state = "coffee"
spillable = TRUE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
/* Doesn't exist lol
/datum/chemical_reaction/catnip_tea
@@ -265,7 +265,7 @@
icon_state = "tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
list_reagents = list(/datum/reagent/consumable/tea = 30)
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
@@ -284,7 +284,8 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
foodtype = GRAIN
isGlass = FALSE
price = PRICE_BASE * 0.75
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/beer
name = "space beer"
@@ -423,7 +424,8 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 0.8
/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -548,4 +550,5 @@
icon_state = "menergy"
list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
foodtype = SUGAR
price = PRICE_HIGH * 1.25
economy_type = ECONOMY_PRICE_EXPENSIVE //same as insulated gloves but slightly cheaper given the nature of these
economy_price_mul = 0.75
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+2 -1
View File
@@ -416,7 +416,8 @@
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/cream = 100)
foodtype = DAIRY
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+3 -2
View File
@@ -93,10 +93,11 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
price = PRICE_BASE * 1.1
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
name = "Syndicat Bomb"
name = "Syndicate Bomb"
list_reagents = list(/datum/reagent/consumable/ethanol/syndicatebomb = 50)
/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
code/modules/food_and_drinks/food/condiment.dm
+2 -1
View File
@@ -186,7 +186,8 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
possible_states = list()
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/condiment/flour
name = "flour sack"
code/modules/food_and_drinks/food/snacks.dm
+2
View File
@@ -35,6 +35,8 @@ All foods are distributed among various categories. Use common sense.
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
obj_flags = UNIQUE_RENAME
grind_results = list() //To let them be ground up to transfer their reagents
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
var/bitesize = 2
var/bitecount = 0
var/trash = null
code/modules/food_and_drinks/food/snacks_other.dm
+2 -1
View File
@@ -59,7 +59,8 @@
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
dunkable = TRUE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/snacks/hugemushroomslice
code/modules/food_and_drinks/food/snacks_vend.dm
+4 -10
View File
@@ -12,7 +12,6 @@
filling_color = "#D2691E"
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -24,7 +23,6 @@
filling_color = "#8B0000"
tastes = list("dried meat" = 1)
foodtype = JUNKFOOD | MEAT | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
@@ -43,7 +41,6 @@
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
foodtype = JUNKFOOD | FRIED
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
@@ -55,7 +52,6 @@
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
@@ -72,7 +68,6 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
@@ -84,7 +79,6 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/soyfood
name = "Soyfood"
@@ -96,7 +90,7 @@
filling_color = "#FFD700"
tastes = list("nanomachines" = 2, "soybeans" = 5)
foodtype = JUNKFOOD | DAIRY | GRAIN
price = PRICE_LOW
economy_price_mul = 2
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -107,7 +101,7 @@
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
price = PRICE_LOW
economy_price_mul = 2.5
/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
name = "carbon nanotube noodles"
@@ -119,7 +113,7 @@
filling_color = "#FFD700"
tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
foodtype = GRAIN | VEGETABLES
price = PRICE_LOW
economy_price_mul = 2.5
/obj/item/reagent_containers/food/snacks/bird_seed
name = "Sunflower Seeds"
@@ -130,4 +124,4 @@
filling_color = "#b497162f"
tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
foodtype = GRAIN | VEGETABLES
price = PRICE_LOW
economy_price_mul = 2.5