diff --git a/.gitignore b/.gitignore index abd847b8..5e4cea55 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,22 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/* !/config/title_screens/images/exclude config/admins.txt _maps/RandomRuins_SpaceRuins_TheDerelictProject.dmm +tools/dmitool/.gradle/nb-cache/trust/2018FCA27E9B9F1F5BEED454BF477F4B8A12F37DC9D4B9DA792466A05ED63656 +tools/dmitool/.gradle/buildOutputCleanup/cache.properties +tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock +tools/dmitool/.gradle/8.9/gc.properties +tools/dmitool/.gradle/8.9/fileHashes/fileHashes.lock +tools/dmitool/.gradle/8.9/fileHashes/fileHashes.bin +tools/dmitool/.gradle/8.9/fileChanges/last-build.bin +tools/dmitool/.gradle/8.9/dependencies-accessors/gc.properties +tools/dmitool/.gradle/8.9/checksums/checksums.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin +tools/dmitool/.gradle/buildOutputCleanup/cache.properties +tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin +tools/dmitool/.gradle/buildOutputCleanup/cache.properties +tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock +tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 7b9c6510..7fd847c4 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -140,6 +140,36 @@ /datum/reagent/blueberry_juice/proc/fat_hide() return (124 * (volume * volume))/1000 //123'840 600% size, about 56'000 400% size, calc was: (3 * (volume * volume))/50 +/datum/reagent/consumable/ethanol/hunchback //drink from goonstation, adapted for here. yay!! + name = "Hunchback" + description = "Better out than in." + reagent_state = LIQUID + color = "#700000CC" + metabolization_rate = 0.75 * REAGENTS_METABOLISM + taste_description = "nausea" + boozepwr = 25 + var/last_check_time = 0 + glass_name = "glass of Hunchback" + glass_desc = "An alleged cocktail invented by a notorious scientist. Useful in a pinch as an impromptu purgative, or interrogation tool." + pH = 4.5 + value = 1 + +/datum/reagent/consumable/ethanol/hunchback/on_mob_life(mob/living/carbon/M) + if(last_check_time + 50 < world.time) + to_chat(M,"You feel yourself gag...") + if(M.disgust < 80) + M.adjust_disgust(20) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/disgusting_food) + last_check_time = world.time + for(var/A in M.reagents.reagent_list) + var/datum/reagent/R = A + if(R != src) + M.reagents.remove_reagent(R.type,5) + if(M.health > 10) + M.adjustToxLoss(4*REM, 0) + . = 1 + ..() + // /obj/item/reagent_containers/food/snacks/meat/steak/troll // name = "Troll steak" // desc = "In its sliced state it remains dormant, but once the troll meat comes in contact with stomach acids, it begins a perpetual cycle of constant regrowth and digestion. You probably shouldn't eat this." diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/drinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/drinks.dm new file mode 100644 index 00000000..fa37a89c --- /dev/null +++ b/GainStation13/code/modules/reagents/chemistry/recipes/drinks.dm @@ -0,0 +1,6 @@ +/datum/chemical_reaction/hunchback + name = "hunchback" + id = /datum/reagent/consumable/ethanol/hunchback + results = list(/datum/reagent/consumable/ethanol/hunchback = 3) + required_reagents = list(/datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/ethanol/whiskey_cola = 2) + mix_message = "The chunks of tomato paste hang in the bourbon and cola as an emulsion. It looks as horrible as that sounds." diff --git a/tgstation.dme b/tgstation.dme index 4d263c91..60a7ca1a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3137,6 +3137,7 @@ #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\fatty_drinks.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\fermi_fat.dm" +#include "GainStation13\code\modules\reagents\chemistry\recipes\drinks.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatdrinks.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\ROCKANDSTONEdrinks.dm"