diff --git a/GainStation13/icons/mob/cakegolem.dmi b/GainStation13/icons/mob/cakegolem.dmi new file mode 100644 index 00000000..d8b44505 Binary files /dev/null and b/GainStation13/icons/mob/cakegolem.dmi differ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 8b2461f6..a2aa8cd5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1860,7 +1860,7 @@ "aJP" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{name = "Primary Tool Storage"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/storage/primary) "aJQ" = (/obj/structure/disposalpipe/segment,/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/storage/primary) "aJR" = (/obj/machinery/vending/autodrobe,/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/theatre/mime) -"aJS" = (/obj/structure/bed,/obj/item/bedsheet/mime,/obj/item/reagent_containers/food/condiment/enzyme,/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/theatre/mime) +"aJS" = (/obj/structure/bed,/obj/item/bedsheet/mime,/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/theatre/mime) "aJT" = (/obj/machinery/vending/autodrobe,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/theatre/clown) "aJU" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/storage/primary) "aJV" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/structure/dresser,/turf/open/floor/plasteel,/area/crew_quarters/theatre/clown) @@ -7240,7 +7240,6 @@ "frp" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/turf/open/floor/plasteel/freezer,/area/crew_quarters/dorms{name = "Saunas"}) "fBl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/washing_machine,/turf/open/floor/plasteel/freezer,/area/crew_quarters/locker) "fEc" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/cheese,/obj/item/ashtray{pixel_y = -15},/turf/open/floor/carpet,/area/quartermaster/miningdock) -"fGe" = (/obj/item/reagent_containers/food/condiment/enzyme,/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/theatre/mime) "fHR" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/carpet,/area/maintenance/starboard/fore) "fLF" = (/obj/structure/dresser,/obj/item/flashlight/lamp/green{pixel_x = -4; pixel_y = 14},/obj/machinery/button/door{id = "maintdorm2"; name = "Window Shutter Control"; pixel_x = -26; req_access_txt = "28"},/turf/open/floor/wood{icon_state = "wood-broken5"},/area/maintenance/port/fore) "fNx" = (/obj/structure/flora/junglebush/b,/turf/open/floor/grass,/area/crew_quarters/dorms{name = "Saunas"}) @@ -7463,7 +7462,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJbh aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaxvaaaaaaaaaaxwaxyaxzayTaxAaXbaxAaxCaxDaxDaxEaxFbdpaxGaxHaxDaxDaxIaveaxJauWaxKamiamiaxLaxMalzaxNaxOatZatZatZatZatZaxPateaxQdFfjtsceVjtsateaxRalzawEaxSawEaxXaxUaxVaxWbjSaxVaxYaxVaxZayaayaayaayaayaayaayaaybaycaydayeayfaygayhayiayjaykaylaymaynbjTaypayqayranbaysahfafmaqDaruarvaBKarxazAazBazzazNaAVaBOazLaATayEayEaAUaBNaBUaAWapRapRasIauJaxfatEaqKaqKaqKaqKaqKaxhaxiaxjaxkamIamIaltaorayKayKayKayKaltarPaltaltayLaltaltaltaltarPasLaltaltapialtamIasLaxnayMarSarUayNayOayPayQayRayOaySarUaadaoBaoBaoBaoBaoBaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJbhrbanaaaaaaaaaaaaaaaaweayVaweayUaBcayUayWaxBaxBayXayUaBcayUayYayZazaazbalzataauWalzalzalzalzazcazcazdazeazcazcazcazcazcaugawsaveaveaveaveaveazfaxRaoEawEaBMaBqaBqabFaxVaeXaHzazhaHHaxVaIDayaaAAazjazkazlaCWayaaybaznazoazpazpazqazrazpazpazpazsaztaztazuazvayqazwanbazxahfafmaqDastasvasvaDoaBPaBQaDraEHaEHaDraBRaBSaDpaDsaDtaDuatIaDAaDBaDCaDDaDKaDNayIaqKaqKaqKaqKaqKayJaltaltaltamIamIaltaltayKazOazPayKapZarPaltazQfHRpkvaltphKaltazSazTaltazUamIaltapiapiaIpazVapiarUazWayOazXazYazXayOazZarUaadaadaadaoBaoBaoBaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclbhPatJatJatJatJauSaAaauSaAbaRJayUaAcaAdaAeaAfayUaRJaAbayUauSaAgaAhalzaAiaAjaAkaAkaAkaAlazcaAmaAnaAoaApaAqaAraAmazcaAsaAtaAuaAvaAvaAvaAvaAvaAwarYawEaHIaBqaICaIYaxVaIZaJcaHzaJfaxVaxZayaaCXaABaACaADaCYayaaAEaAFaAGaAHaAIaAJaAKaALaAMaANaAOaAPayoayoayoaAQazwanbaARahfafmaomaomaomaomaomaDvaDwaDxaEDaEGaEIaEJazFazFazFazFazFaITaGbaGcaAXaITaILaILayJaqKaqKaqKaqKaqKayJaltapZamIamIbjJaltaAYayKaAZaBaayKamIarPaltsFHmtgfHRaOYiFMaltarPasOaltbjUamIaltaBbbjJaxnayMaqTarUarUarUarUarUarUarUarUarUarVarVarVarVarVaadaoBaoBaoBaoBaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaQJayUayUayUayUayUayUaQJayUaaaauSaBdazbaBeaBfaBgaBeaBeaBeaBhazcaAmaBiaBjaBkaBlaBmaAmazcaBnaBoaBnaBnaBnaBnaBnaBnaBpaBnaBnaJRaBqfGeaJSaxVaJTaHzaJVaJWaxVaxZayaaCXaBwaBxaByaCYayaaqsaBzaydaBAaBBaBCaBDaBEaAPaBFaBGayoayoaBHayoaAQazwanbazxahfafmaomaFVaFWaFXbjVaFHaFYazFazFazFazFaGdazFaGoaGfaGfazFaGpaHxbjWbjXaHAaHCaHDayJaqKaqKaqKaqKaqKayJaltaBYaDLaBZaCaaltaltayKaCbaCcayKaCdaCealtaltaltaltaltaltaCfaCgaChaCiaCiaCiaCjaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuaCvaCwaCwaCwaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaQJayUayUayUayUayUayUaQJayUaaaauSaBdazbaBeaBfaBgaBeaBeaBeaBhazcaAmaBiaBjaBkaBlaBmaAmazcaBnaBoaBnaBnaBnaBnaBnaBnaBpaBnaBnaJRaBqaBqaJSaxVaJTaHzaJVaJWaxVaxZayaaCXaBwaBxaByaCYayaaqsaBzaydaBAaBBaBCaBDaBEaAPaBFaBGayoayoaBHayoaAQazwanbazxahfafmaomaFVaFWaFXbjVaFHaFYazFazFazFazFaGdazFaGoaGfaGfazFaGpaHxbjWbjXaHAaHCaHDayJaqKaqKaqKaqKaqKayJaltaBYaDLaBZaCaaltaltayKaCbaCcayKaCdaCealtaltaltaltaltaltaCfaCgaChaCiaCiaCiaCjaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuaCvaCwaCwaCwaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauSayWaCxaBeaCyaCzaCAaCBaCCaCDazcaAmaCEaCGaCHaCIaCGaAmazcaCJaCKaCLaCMaCNaCOaCPaCQaEjaEmaBnawEawEaxTawEaxVaxVaKhaxVaxVaxVaxZayaaCZaDabjYbjZbkaayaaqsaDbaydaDcaDdaDeayoaDfaDgaDhaDiaDjaAQayqaDkayqazwanbazxahfafmaomaGgaFZaHuaHvaGaaGeaDqaHEaIXaYYaZgaYWbavbcwaHLazFaHNaHObjWbjXaJaaJbaJbaBVaBWaBWaBWaBWaBWaBXaltaBYaDLaDEaDFaDGaDHayKaDIaDJayKarPamIaltaaaaltaFUaGvaGxaGyaGAaDOaDOaDObkbaDOaDPaDQaDRaDSaDTaDTaDTaDUaVqaDWaDXaDYaDZaEaaEbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaEcaBeaEdaEeaEfaEgaEhaEiazcaFraFsaFwaFxaFsaFwaFxaEkaGVaGYaGZaHaaGZaGZaGZaGZaIuaGVaBnaKiaKjaKkaKkaGjaHyaKkaKpaKraBTaxZayaaEraEsaEtaEuaEvayaaqsaEwaydaydaDiaExaEyaEzaEAaydaydayoayoayqaEBayqazwanbazxahfafmaomaGgaHtbczbdwazAaGlaEKaEKaEKbkcaEMaEKbghbghbgiazFaITaJnaLMaLUaLXaJjaMgaCiaCiaCiaCiaCiaCiaCiaCibkdaltaltaltaEPaltayKaEQaERaESaETaEUaEVaEWaEVaHwaHBaHVaHWaHXaFbaFbaFbaFbaFcaFdaFeaFcaFcaFcaFcaFcaFcaFcaFfaFgaFhaCwaCwaCwaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaFiaBeaFjaFkaFlaFmaFnaFoazcaIzaYjbfNbgTbkeaCFaFqazcaIvaIwaFtaFuaElaElaElaFvaIxaIyaBnaLcaLgaKkaLhaLkaLlaKkaLnaLoaBTaFDayaaFEaFFaEtaFGaENayaaqsaFIayqaFJayoaFKaFLaFMayoaFNayqaFOaFPayqaFLayqaFQaoNaFRahfafmaombkfbkgbkhbjVaHGaHJazFbaubaKbkibkjazFazFazFazFazFaNoaNyaNIaNUaOdaOmaOwaOxaGiaGkaDOaDOaDOaDOaGmaGnaLWaOCaOCaRlbkkbklaSuaCnaGqaGraGsaGtaGuaGtaHYaGwaFbaHZaIaaKIaKJaMpaGBaFcaGCaGDaFcaGEaGFaGGaGHaGIaGJaGKaGLaGMaGNaGOaGPaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 2ad009cd..4a79b5d0 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -664,6 +664,7 @@ This is here to make the tiles around the station mininuke change when it's arme loneop.weight += 1 // if(loneop.weight % 5 == 0) // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono + return log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") else lastlocation = newturf diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index df581f65..d99ee871 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -916,4 +916,12 @@ name = "Orange Creamsical" id = /datum/reagent/consumable/orange_creamsicle results = list(/datum/reagent/consumable/orange_creamsicle = 4) - required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1) \ No newline at end of file + required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1) + +/datum/chemical_reaction/oily_oafs + name = "Oily oafs" + id = /datum/reagent/consumable/ethanol/oily_oafs + results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1) + + //b \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 7904f339..fa4c9603 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -191,15 +191,15 @@ subcategory = CAT_CAKE /datum/crafting_recipe/food/cak - name = "Living cat/cake hybrid" + name = "Living cake person" reqs = list( /obj/item/organ/brain = 1, /obj/item/organ/heart = 1, - /obj/item/reagent_containers/food/snacks/store/cake/birthday = 1, + /obj/item/reagent_containers/food/snacks/store/cake/birthday = 3, //the cake person is quite fat, so more cake is needed. good thing b-day cakes are in mealvendors /obj/item/reagent_containers/food/snacks/meat/slab = 3, /datum/reagent/blood = 30, /datum/reagent/consumable/sprinkles = 5, /datum/reagent/teslium = 1 //To shock the whole thing into life ) - result = /mob/living/simple_animal/pet/cat/cak + result = /mob/living/simple_animal/cakegolem subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 2de4dbf0..014a47aa 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -240,55 +240,6 @@ stop_automated_movement = 1 walk_to(src,movement_target,0,3) -/mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie - name = "Keeki" - desc = "It's a cat made out of cake." - icon_state = "cak" - icon_living = "cak" - icon_dead = "cak_dead" - health = 50 - maxHealth = 50 - gender = FEMALE - harm_intent_damage = 10 - butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/reagent_containers/food/snacks/cakeslice/birthday = 3, \ - /obj/item/reagent_containers/food/snacks/meat/slab = 2) - response_harm = "takes a bite out of" - attacked_sound = 'sound/items/eatfood.ogg' - deathmessage = "loses its false life and collapses!" - death_sound = "bodyfall" - held_icon = "cak" - -/mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts) - ..() - var/obj/item/organ/brain/B = locate(/obj/item/organ/brain) in contents - if(!B || !B.brainmob || !B.brainmob.mind) - return - B.brainmob.mind.transfer_to(src) - to_chat(src, "You are a cak! You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \ - so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \ - free cake to the station!") - var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change") - if(new_name) - to_chat(src, "Your name is now \"new_name\"!") - name = new_name - -/mob/living/simple_animal/pet/cat/cak/Life() - ..() - if(stat) - return - if(health < maxHealth) - adjustBruteLoss(-8) //Fast life regen - for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts! - if(!D.is_decorated) - D.decorate_donut() - -/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L) - . = ..() - if(.) //the attack was blocked - return - if(L.a_intent == INTENT_HARM && L.reagents && !stat) - L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4) - L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4) //Cat made /mob/living/simple_animal/pet/cat/custom_cat diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 5b84608f..6e86a933 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -209,7 +209,7 @@ /mob/living/simple_animal/hostile/lizard, /mob/living/simple_animal/pet/fox, /mob/living/simple_animal/butterfly, - /mob/living/simple_animal/pet/cat/cak, + /mob/living/simple_animal/cakegolem //pet/cat/cak, /mob/living/simple_animal/chick) new_mob = new path(M.loc) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 1de852dd..118b66b6 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2438,3 +2438,19 @@ datum/reagent/consumable/ethanol/creme_de_coconut boozepwr = 65 taste_description = "viscous cream" glass_desc = "The name is probably exactly what it is." + +///GS13 drinks! + +/datum/reagent/consumable/ethanol/oily_oafs + name = "Oily oafs" + description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet." + color = "#ffc75f" + boozepwr = 30 + taste_description = "rich butter and red sugar" + quality = DRINK_NICE + glass_icon_state = "oily_oafs" + glass_name = "oily oafs" + glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos." + shot_glass_icon_state = "shotglassbrown" + pH = 4.5 + value = 0.1 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 823e77ec..f2ea4106 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 7fbf4889..d50cee38 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 69476116..4210af68 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2530,6 +2530,7 @@ #include "code\modules\mob\living\simple_animal\bot\secbot.dm" #include "code\modules\mob\living\simple_animal\bot\SuperBeepsky.dm" #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm" +#include "code\modules\mob\living\simple_animal\friendly\cakegolem.dm" #include "code\modules\mob\living\simple_animal\friendly\cat.dm" #include "code\modules\mob\living\simple_animal\friendly\cockroach.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm"