Merge pull request #670 from MrCat15352/syntanol

Add: syntanol

code/modules/mob/living/carbon/human/species_types/IPC.dm

@@ -4,7 +4,10 @@
 	sexes = FALSE
 	species_age_min = 0
 	species_age_max = 300
-	species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH,NO_BONES) //all of these + whatever we inherit from the real species
+	// [CELADON-EDIT] - CELADON_FOOD_AND_DRINKS - Всё для того чтобы ИПС могли пить синтанол и припой
+	// species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH,NO_BONES) //all of these + whatever we inherit from the real species		// CELADONE-EDIT - ORIGINAL
+	species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NO_BONES) //all of these + whatever we inherit from the real species
+	// [/CELADON-EDIT]
 	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_LIMBATTACHMENT)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
 	mutantbrain = /obj/item/organ/brain/mmi_holder/posibrain

code/modules/vending/boozeomat.dm

@@ -4,7 +4,10 @@
 	icon_state = "boozeomat"
 	icon_deny = "boozeomat-deny"
 	products = list( // All of drink dispenser reagents should be available here.
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
+		// [CELADON-ADD] - CELADON_FOOD_AND_DRINKS
+		/obj/item/reagent_containers/food/drinks/soda_cans/synthanol = 10,
+		// [/CELADON-ADD]
+    /obj/item/reagent_containers/food/drinks/drinkingglass = 30,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
 		/obj/item/reagent_containers/food/drinks/modglass/small = 10,
 		/obj/item/reagent_containers/food/drinks/modglass = 10,

code/modules/vending/cola.dm

@@ -6,6 +6,9 @@
 	product_slogans = "RobustMore Softdrinks: More robust than a toolbox to the head!"
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 10 trillion drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks this side of the galaxy."
 	products = list(
+		// [CELADON-ADD] - CELADON_FOOD_AND_DRINKS
+		/obj/item/reagent_containers/food/drinks/soda_cans/synthanol = 10,
+		// [/CELADON-ADD]
 		/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 10,

mod_celadon/food_and_drinks/README.md

@@ -0,0 +1,86 @@
+
+#### Список PRов
+
+- https://github.com/CeladonSS13/Shiptest/pulls/#####
+<!--
+  Ссылки на PRы, связанные с модом:
+  - Создание
+  - Большие изменения
+-->
+
+<!-- Название мода. Не важно на русском или на английском. -->
+## Еда и бухло
+
+ID мода: CELADON_FOOD_AND_DRINKS
+<!--
+  Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
+  которое ты будешь использовать для обозначения файлов.
+  При запуске скрипта выставляется автоматически.
+-->
+
+### Описание мода
+
+Этот мод добавляет бухло и еду в билд. Будь она проклята.
+<!--
+  Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
+  А также любая полезная информация.
+-->
+
+### Изменения *кор кода*
+
+- ADD: `code/modules/vending/cola.dm` -> добавлен синтанол в банке
+- ADD: `code/modules/vending/boozeomat.dm` -> добавлен синтанол в банке
+- EDIT: `code/modules/mob/living/carbon/human/species_types/IPC.dm` -> удален флаг `NOMOUTH`
+<!--
+  Если вы редактировали какие-либо процедуры или переменные в кор коде,
+  они должны быть указаны здесь.
+  Нужно указать и файл, и процедуры/переменные.
+
+  Изменений нет - напиши "Отсутствуют"
+  Примеры: `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+### Оверрайды
+
+- Отсутствуют
+<!--
+  Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
+  Здесь указываются оверрайды в твоём моде и папке `_master_files`
+
+  Изменений нет - напиши "Отсутствуют"
+  Примеры: 
+  - `mods/_master_files/sound/my_cool_sound.ogg`
+  - `mods/_master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+### Дефайны
+
+- Есть дефайны дааа... пока не вынесены..
+<!--
+  Если требовалось добавить какие-либо дефайны, укажи файлы,
+  в которые ты их добавил, а также перечисли имена.
+  И то же самое, если ты используешь дефайны, определённые другим модом.
+
+  Не используешь - напиши "Отсутствуют"
+  Примеры: `code/__defines/~mods/food_and_drinks.dm`: `FOOD_AND_DRINKS_SPEED_MULTIPLIER`, `FOOD_AND_DRINKS_SPEED_BASE`
+-->
+
+### Используемые файлы, не содержащиеся в модпаке
+
+- Отсутствуют
+<!--
+  Будь то немодульный файл или модульный файл, который не содержится в папке,
+  принадлежащей этому конкретному моду, он должен быть упомянут здесь.
+  Хорошими примерами являются иконки или звуки, которые используются одновременно
+  несколькими модулями, или что-либо подобное.
+  Примеры: `mods/_master_files/icons/obj/alien.dmi`
+-->
+
+### Авторы
+
+MrCat15352
+<!--
+  Здесь находится твой никнейм
+  Если работал совместно - никнеймы тех, кто помогал.
+  В случае порта чего-либо должна быть ссылка на источник.
+-->

mod_celadon/food_and_drinks/_food_and_drinks.dm

@@ -0,0 +1,9 @@
+/datum/modpack/food_and_drinks
+	/// Строковое имя модпака. Используется для поиска других модпаков в init.
+	name = "Food and Drinks"
+	/// Строковое описание для модпака. Может использоваться для списка глаголов модпака в качестве описания.
+	desc = "Добавляет много еды и напитков."
+	/// Строка с авторами этого модпака.
+	author = "MrCat15352"
+
+///**********************************************************************///

mod_celadon/food_and_drinks/_food_and_drinks.dme

@@ -0,0 +1,10 @@
+#ifndef MODPACK_CELADON_FOOD_AND_DRINKS
+#define MODPACK_CELADON_FOOD_AND_DRINKS
+
+#include "_food_and_drinks.dm"
+
+#include "code/alcohol_reagents.dm"
+#include "code/drinks_recipes.dm"
+#include "code/vending.dm"
+
+#endif

mod_celadon/food_and_drinks/code/alcohol_reagents.dm

@@ -0,0 +1,116 @@
+// ROBOT ALCOHOL PAST THIS POINT
+// WOOO!
+// /obj/structure/aquarium
+// 	icon = 'mod_celadon/food_and_drinks/icons/drinks.dmi'
+
+/obj/item/reagent_containers/food/drinks
+	icon = 'mod_celadon/food_and_drinks/icons/drinks.dmi'
+
+#define REAGENT_TOUCH 1
+#define REAGENT_INGEST 2
+
+/datum/reagent/consumable/ethanol/synthanol
+	name = "Synthanol"
+	description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
+	reagent_state = LIQUID
+	color = "#1BB1FF"
+	process_flags = ORGANIC | SYNTHETIC
+	boozepwr = 5
+	glass_icon_state = "synthanolglass"
+	glass_name = "Glass of Synthanol"
+	glass_desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too."
+	taste_description = "motor oil"
+
+/datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/carbon/M)
+	metabolization_rate = REAGENTS_METABOLISM
+	if(!(M.dna.species.reagent_tag & PROCESS_SYNTHETIC))
+		metabolization_rate += 9 * REAGENTS_METABOLISM //gets removed from organics very fast
+		if(prob(25))
+			metabolization_rate += 40 * REAGENTS_METABOLISM
+			// M.fakevomit()
+	return ..()
+/*
+/datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/carbon/M, method=REAGENT_TOUCH, volume)
+	if(M.dna.species.reagent_tag & PROCESS_SYNTHETIC)
+		return
+	if(method == REAGENT_INGEST)
+		to_chat(M, pick("<span class = 'danger'>That was awful!</span>", "<span class = 'danger'>Yuck!</span>"))
+*/
+/datum/reagent/consumable/ethanol/synthanol/robottears
+	name = "Robot Tears"
+	description = "An oily substance that an IPC could technically consider a 'drink'."
+	reagent_state = LIQUID
+	color = "#363636"
+	boozepwr = 25
+	glass_icon_state = "robottearsglass"
+	glass_name = "Glass of Robot Tears"
+	glass_desc = "No robots were hurt in the making of this drink."
+	taste_description = "existential angst"
+
+
+/datum/reagent/consumable/ethanol/synthanol/trinary
+	name = "Trinary"
+	description = "A fruit drink meant only for synthetics, however that works."
+	reagent_state = LIQUID
+	color = "#adb21f"
+	boozepwr = 2
+	glass_icon_state = "trinaryglass"
+	glass_name = "Glass of Trinary"
+	glass_desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
+	taste_description = "modem static"
+
+/datum/reagent/consumable/ethanol/synthanol/servo
+	name = "Servo"
+	description = "A drink containing some organic ingredients, but meant only for synthetics."
+	reagent_state = LIQUID
+	color = "#5b3210"
+	boozepwr = 25
+	glass_icon_state = "servoglass"
+	glass_name = "Glass of Servo"
+	glass_desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
+	taste_description = "motor oil and cocoa"
+
+/datum/reagent/consumable/ethanol/synthanol/uplink
+	name = "Uplink"
+	description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
+	reagent_state = LIQUID
+	color = "#e7ae04"
+	boozepwr = 15
+	glass_icon_state = "uplinkglass"
+	glass_name = "Glass of Uplink"
+	glass_desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
+	taste_description = "a GUI in visual basic"
+
+/datum/reagent/consumable/ethanol/synthanol/synthnsoda
+	name = "Synth and Soda"
+	description = "The classic drink adjusted for a robot's tastes."
+	reagent_state = LIQUID
+	color = "#7204e7"
+	boozepwr = 25
+	glass_icon_state = "synthnsodaglass"
+	glass_name = "Glass of Synth 'n Soda"
+	glass_desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
+	taste_description = "fizzy motor oil"
+
+/datum/reagent/consumable/ethanol/synthanol/synthignon
+	name = "Synthignon"
+	description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
+	reagent_state = LIQUID
+	color = "#d004e7"
+	boozepwr = 25
+	glass_icon_state = "synthignonglass"
+	glass_name = "Glass of Synthignon"
+	glass_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious."
+	taste_description = "fancy motor oil"
+
+
+/*
+/datum/chemical_reaction/synthanol
+	name = "Synthanol"
+	id = "synthanol"
+	result = "synthanol"
+	required_reagents = list("lube" = 1, "plasma" = 1, "fuel" = 1)
+	result_amount = 3
+	mix_message = "The chemicals mix to create shiny, blue substance."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+*/

mod_celadon/food_and_drinks/code/drinks_recipes.dm

@@ -0,0 +1,48 @@
+/datum/chemical_reaction/synthanol
+	results = list(/datum/reagent/consumable/ethanol/synthanol = 3)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1,
+							 /datum/reagent/fuel = 1) //"lube" = 1,
+	mix_message = "The chemicals mix to create shiny, blue substance."
+	mix_sound = 'mod_celadon/food_and_drinks/sound/drinkfizz.ogg'
+
+/datum/chemical_reaction/synthanol/robottears
+	results = list(/datum/reagent/consumable/ethanol/synthanol/robottears = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 1,
+							/datum/reagent/fuel = 1,
+							/datum/reagent/consumable/sodawater = 1) //"oil" = 1
+	mix_message = "The ingredients combine into a stiff, dark goo."
+
+/datum/chemical_reaction/synthanol/trinary
+	results = list(/datum/reagent/consumable/ethanol/synthanol/trinary = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 1,
+							/datum/reagent/consumable/limejuice = 1,
+							/datum/reagent/consumable/orangejuice = 1)
+	mix_message = "The ingredients mix into a colorful substance."
+
+/datum/chemical_reaction/synthanol/servo
+	results = list(/datum/reagent/consumable/ethanol/synthanol/servo = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 2,
+							/datum/reagent/consumable/cream = 1,
+							/datum/reagent/consumable/hot_coco = 1)
+	mix_message = "The ingredients mix into a dark brown substance."
+
+/datum/chemical_reaction/synthanol/uplink
+	results = list(/datum/reagent/consumable/ethanol/synthanol/uplink = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1,
+							/datum/reagent/consumable/ethanol/vodka = 1,
+							/datum/reagent/consumable/ethanol/tequila = 1,
+							/datum/reagent/consumable/ethanol/whiskey = 1,
+							/datum/reagent/consumable/ethanol/synthanol = 1)
+	mix_message = "The chemicals mix to create a shiny, orange substance."
+
+/datum/chemical_reaction/synthanol/synthnsoda
+	results = list(/datum/reagent/consumable/ethanol/synthanol/synthnsoda = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 1,
+							/datum/reagent/consumable/space_cola = 1)
+	mix_message = "The chemicals mix to create a smooth, fizzy substance."
+
+/datum/chemical_reaction/synthanol/synthignon
+	results = list(/datum/reagent/consumable/ethanol/synthanol/synthignon = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 1,
+							/datum/reagent/consumable/ethanol/wine = 1)
+	mix_message = "The chemicals mix to create a fine, red substance."

mod_celadon/food_and_drinks/code/vending.dm

@@ -0,0 +1,6 @@
+/obj/item/reagent_containers/food/drinks/soda_cans/synthanol
+	name = "Beep's Classic Synthanol"
+	desc = "A can of IPC booze, however that works."
+	icon = 'mod_celadon/food_and_drinks/icons/drinks.dmi'
+	icon_state = "synthanolcan"
+	list_reagents = list(/datum/reagent/consumable/ethanol/synthanol = 50)

mod_celadon/mod_celadon.dme

@@ -40,12 +40,14 @@
 #include "items/_items.dme"
 #include "flora/_flora.dme"
 #include "musician/_musician.dme"
+#include "food_and_drinks/_food_and_drinks.dme"
 #include "pizzamat/_pizzamat.dme"
 #include "barsigns/_barsigns.dme"
 #include "stamps/_stamps.dme"
 #include "stuff_gamma/_stuff_gamma.dme"
 #include "turrets/_turrets.dme"
 
+
 // --- MOBS --- //
 #include "mobs/_mobs.dme"
 #include "drakeborgs/_drakeborgs.dme"