diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index 9410111c9e4f..e28293a6534b 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/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 diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 45dc055e1b21..7477fba82619 100644 --- a/code/modules/vending/boozeomat.dm +++ b/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, diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index a3fa70ce6209..017fd02334ca 100644 --- a/code/modules/vending/cola.dm +++ b/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, diff --git a/mod_celadon/food_and_drinks/README.md b/mod_celadon/food_and_drinks/README.md new file mode 100644 index 000000000000..82dcbee65088 --- /dev/null +++ b/mod_celadon/food_and_drinks/README.md @@ -0,0 +1,86 @@ + +#### Список PRов + +- https://github.com/CeladonSS13/Shiptest/pulls/##### + + + +## Еда и бухло + +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` + + +### Оверрайды + +- Отсутствуют + + +### Дефайны + +- Есть дефайны дааа... пока не вынесены.. + + +### Используемые файлы, не содержащиеся в модпаке + +- Отсутствуют + + +### Авторы + +MrCat15352 + diff --git a/mod_celadon/food_and_drinks/_food_and_drinks.dm b/mod_celadon/food_and_drinks/_food_and_drinks.dm new file mode 100644 index 000000000000..2b899b0d5f98 --- /dev/null +++ b/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" + +///**********************************************************************/// diff --git a/mod_celadon/food_and_drinks/_food_and_drinks.dme b/mod_celadon/food_and_drinks/_food_and_drinks.dme new file mode 100644 index 000000000000..5158f26ad421 --- /dev/null +++ b/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 diff --git a/mod_celadon/food_and_drinks/code/alcohol_reagents.dm b/mod_celadon/food_and_drinks/code/alcohol_reagents.dm new file mode 100644 index 000000000000..05dd92468410 --- /dev/null +++ b/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("That was awful!", "Yuck!")) +*/ +/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' +*/ diff --git a/mod_celadon/food_and_drinks/code/drinks_recipes.dm b/mod_celadon/food_and_drinks/code/drinks_recipes.dm new file mode 100644 index 000000000000..de06a22e5f66 --- /dev/null +++ b/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." diff --git a/mod_celadon/food_and_drinks/code/vending.dm b/mod_celadon/food_and_drinks/code/vending.dm new file mode 100644 index 000000000000..1fdb1a6d2b6f --- /dev/null +++ b/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) diff --git a/mod_celadon/food_and_drinks/icons/drinks.dmi b/mod_celadon/food_and_drinks/icons/drinks.dmi new file mode 100644 index 000000000000..7b1d3ff75710 Binary files /dev/null and b/mod_celadon/food_and_drinks/icons/drinks.dmi differ diff --git a/mod_celadon/food_and_drinks/sound/drinkfizz.ogg b/mod_celadon/food_and_drinks/sound/drinkfizz.ogg new file mode 100644 index 000000000000..43d928b93c13 Binary files /dev/null and b/mod_celadon/food_and_drinks/sound/drinkfizz.ogg differ diff --git a/mod_celadon/mod_celadon.dme b/mod_celadon/mod_celadon.dme index 6a3386c90278..e6f6dc9ff0b4 100644 --- a/mod_celadon/mod_celadon.dme +++ b/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"