mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 15:38:02 +01:00
Have you bingled that (#17407)
* Initial wiki system * wiki organization and spoilers * hide belly chems * move ads to tgui * add search * . * load screen * error screen * 8 * center * . * . * make this more realistic * tgui errro col * move search to top * . * non NT theme * logo to common * base custom theme * . * wip refactor * almost halfway * reworked wiki data * easy fix * get data fix * Material Page in tgui * catch null supply points * . * forward crash * reset pages * . * canvas prep * fix icon stacking * . * colored outlined images * fix sm datum * fix material names * subType prep * only on crash * fix null crash * . * fix solgov * clean hiding * . * implement catalog page * . * particle smasher page * I'm lazy * unfuck some sins * ore page * botany page * allergen list * allergen returns null too * slime injection var * slime core data * fixed warning * wip * proper data list for chems * pass is_slime as null * chems * split that * . * . * . * . * donation for bingle, some cleanup * return types * partially colord icons for chemistry * . * more sillies * donation page * thaler * needs some variation * . * this will crash until implemented * handle it * fix that * dismiss donation banner button * . * fix that * donating procs * donation stuff for comp * - * drink glass for drinks * illegal iconstate pass * fixes * . * nuke drink fix * . * . * . * Drink reagent fix * more cleanup * adjust * . * simple food * . * food list * sending nulls, removed flavor from recipes * . * . * get_donation_current added * . * missing key * . * duped recipes fixed * . * . * wiki food reagent recipes * double list add * properly forbid remaining bad reagent * hide this too * stacky * enable eslint const * fix typing * update that * use proper donation proc * printing fixes * grinding * . * beaker fill volume * plant ore and mat grinding results * duped recipes fixed, unit test tweak * yes this is terrible * . * . * . * chem analyzer tgui mode, some subsystem changes to support it * redoce * . * , * . * small fixes, missing reagent volume * push * sort * catalog entries unlocked by explo * new chem stuff * . * fix byond code * fix scroll tracking * comment * alphabetical * also this * . * fallback icon * . * ... * rel path * that too * to defines * organ to define * . * . * . --------- Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Willburd
Kashargul
parent
0d340a761b
commit
c42610c5ae
@@ -34,6 +34,7 @@
|
||||
var/reaction_sound = 'sound/effects/bubbles.ogg'
|
||||
|
||||
var/log_is_important = 0 // If this reaction should be considered important for logging. Important recipes message admins when mixed, non-important ones just log to file.
|
||||
var/wiki_flag = 0
|
||||
|
||||
/decl/chemical_reaction/proc/can_happen(var/datum/reagents/holder)
|
||||
//check that all the required reagents are present
|
||||
|
||||
@@ -1325,14 +1325,14 @@
|
||||
result_amount = 15
|
||||
|
||||
/decl/chemical_reaction/instant/drinks/nuclearwaste_radium
|
||||
name = REAGENT_NUCLEARWASTE
|
||||
name = REAGENT_NUCLEARWASTE + " 226"
|
||||
id = "nuclearwasterad"
|
||||
result = REAGENT_ID_NUCLEARWASTE
|
||||
required_reagents = list(REAGENT_ID_OILSLICK = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1)
|
||||
result_amount = 2
|
||||
|
||||
/decl/chemical_reaction/instant/drinks/nuclearwaste_uranium
|
||||
name = REAGENT_NUCLEARWASTE
|
||||
name = REAGENT_NUCLEARWASTE + " 238"
|
||||
id = "nuclearwasteuran"
|
||||
result = REAGENT_ID_NUCLEARWASTE
|
||||
required_reagents = list(REAGENT_ID_OILSLICK = 2, REAGENT_ID_URANIUM = 1)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/decl/chemical_reaction/instant/food
|
||||
name = REAGENT_DEVELOPER_WARNING // Unit test ignore
|
||||
wiki_flag = WIKI_FOOD
|
||||
|
||||
/decl/chemical_reaction/instant/food/hot_ramen
|
||||
name = REAGENT_HOTRAMEN
|
||||
@@ -30,7 +31,7 @@
|
||||
return
|
||||
|
||||
/decl/chemical_reaction/instant/food/chocolate_bar
|
||||
name = "Chocolate Bar"
|
||||
name = "Chocolate Bar Soy"
|
||||
id = "chocolate_bar_soy"
|
||||
result = null
|
||||
required_reagents = list(REAGENT_ID_SOYMILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2)
|
||||
@@ -44,7 +45,7 @@
|
||||
return
|
||||
|
||||
/decl/chemical_reaction/instant/food/chocolate_bar2
|
||||
name = "Chocolate Bar"
|
||||
name = "Chocolate Bar Milk"
|
||||
id = "chocolate_bar_milk"
|
||||
result = null
|
||||
required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2)
|
||||
@@ -58,7 +59,7 @@
|
||||
return
|
||||
|
||||
/decl/chemical_reaction/instant/food/cookingoilcorn
|
||||
name = REAGENT_COOKINGOIL
|
||||
name = "corn " + REAGENT_COOKINGOIL
|
||||
id = "cookingoilcorn"
|
||||
result = REAGENT_ID_COOKINGOIL
|
||||
required_reagents = list(REAGENT_ID_CORNOIL = 10)
|
||||
@@ -66,7 +67,7 @@
|
||||
result_amount = 10
|
||||
|
||||
/decl/chemical_reaction/instant/food/cookingoilpeanut
|
||||
name = REAGENT_COOKINGOIL
|
||||
name = "peanut " + REAGENT_ID_COOKINGOIL
|
||||
id = "cookingoilpeanut"
|
||||
result = REAGENT_ID_COOKINGOIL
|
||||
required_reagents = list(REAGENT_ID_PEANUTOIL = 10)
|
||||
|
||||
Reference in New Issue
Block a user