diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 6bd5f0c7c70..920f643c228 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -1799,6 +1799,20 @@ datum return ..() + nothing + name = "Nothing" + id = "nothing" + description = "Absolutely nothing." + nutriment_factor = 1 * REAGENTS_METABOLISM + on_mob_life(var/mob/living/M as mob) + M:nutrition += nutriment_factor + if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) + if(!M) M = holder.my_atom + M:heal_organ_damage(1,1) + ..() + return + ..() + potato_juice name = "Potato Juice" id = "potato" @@ -3113,6 +3127,27 @@ datum ..() return + silencer + name = "Silencer" + id = "silencer" + description = "A drink from Mime Heaven." + nutriment_factor = 1 * REAGENTS_METABOLISM + on_mob_life(var/mob/living/M as mob) + M:nutrition += nutriment_factor + if(!data) data = 1 + data++ + if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) + if(!M) M = holder.my_atom + M:heal_organ_damage(1,1) + M.dizziness +=5 + if(data >= 55 && data <165) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 5 + else if(data >= 165 && prob(33)) + M.confused = max(M:confused+5,0) + ..() + return + singulo name = "Singulo" id = "singulo" diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 0aab6446203..bc6e6f5834a 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -1127,9 +1127,16 @@ datum required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) result_amount = 3 + silencer + name = "Silencer" + id = "silencer" + result = "silencer" + required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) + result_amount = 3 + singulo name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "plasma" = 1, "wine" = 5) + required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5) result_amount = 10 diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 6062c1d4ecb..241ab87328a 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2206,6 +2206,14 @@ ..() reagents.add_reagent("tequilla", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing + name = "Bottle of Nothing" + desc = "A bottle filled with nothing" + icon_state = "bottleofnothing" + New() + ..() + reagents.add_reagent("nothing", 100) + /obj/item/weapon/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" desc = "Silver laced tequilla, served in space night clubs across the galaxy." @@ -2803,6 +2811,14 @@ icon_state = "bananahonkglass" name = "Banana Honk" desc = "A drink from Clown Heaven." + if("silencer") + icon_state = "silencerglass" + name = "Silencer" + desc = "A drink from mime Heaven." + if("nothing") + icon_state = "nothing" + name = "Nothing" + desc = "Absolutely nothing." if("singulo") icon_state = "singulo" name = "Singulo" diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index a2f6ad4c875..d1239b4f346 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -135,7 +135,8 @@ "/obj/item/clothing/gloves/white", "/obj/item/clothing/mask/gas/mime", "/obj/item/clothing/head/beret", - "/obj/item/clothing/suit/suspenders",) + "/obj/item/clothing/suit/suspenders", + "/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing") cost = 10 containertype = "/obj/crate/secure" containername = "Standard Costumes" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 2dc3196e51d..d1b447a0f0d 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -255,6 +255,20 @@ var/status = 1 origin_tech = "combat=2" +/obj/item/weapon/melee/chainofcommand + name = "Chain of Command" + desc = "The Captain is first and all other heads are last." + icon_state = "chainofcommand" + item_state = "chainofcommand" + flags = FPRINT | ONBELT | TABLEPASS + force = 10 + throwforce = 7 + w_class = 3 + var/charges = 50.0 + var/maximum_charges = 50.0 + var/status = 1 + origin_tech = "combat=4" + /obj/item/weapon/melee/energy var/active = 0 diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index fd59f94b21d..45da7582bba 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -298,6 +298,7 @@ src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head) src.equip_if_possible(new /obj/item/clothing/suit/suspenders(src), slot_wear_suit) src.equip_if_possible(new /obj/item/toy/crayon/mime(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src), slot_in_backpack) src.verbs += /client/proc/mimespeak src.verbs += /client/proc/mimewall src.mind.special_verbs += /client/proc/mimespeak diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f3752ab5b75..5f58abe1c93 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -751,6 +751,38 @@ reagents.add_reagent("water", 10) bitesize = 5 +/obj/item/weapon/reagent_containers/food/snacks/metroidsoup + name = "Metroid soup" + desc = "Tasty" + icon_state = "metroidsoup" + New() + ..() + reagents.add_reagent("metroid", 5) + reagents.add_reagent("water", 10) + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/bloodsoup + name = "Meatball soup" + desc = "So very, very red." + icon_state = "meatballsoup" + New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("blood", 15) + reagents.add_reagent("water", 10) + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/clownstears + name = "Clown's Tears" + desc = "Not very funny." + icon_state = "clownstears" + New() + ..() + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("banana", 5) + reagents.add_reagent("water", 10) + bitesize = 5 + /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup name = "Vegetable soup" desc = "" //TODO @@ -1004,6 +1036,16 @@ reagents.add_reagent("metroid", 5) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/metroidburger + name = "Metroid Burger" + desc = "A very toxic and tasty burger." + icon_state = "metroidburger" + New() + ..() + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("metroid", 5) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/milosoup name = "Milosoup" desc = "The universes best soup! Yum!!!" @@ -1051,6 +1093,15 @@ reagents.add_reagent("nutriment", 8) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/spesslaw + name = "Spesslaw" + desc = "A lawyers favourate" + icon_state = "spesslaw" + New() + ..() + reagents.add_reagent("nutriment", 14) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "Poppy Pretzel" desc = "A large soft pretzel full of POP!" @@ -1097,6 +1148,34 @@ reagents.add_reagent("nutriment", 4) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/twobread + name = "Two Bread" + desc = "It is very bitter and winy." + icon_state = "twobread" + New() + ..() + reagents.add_reagent("nutriment", 2) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/metroidsandwich + name = "Metroid Sandwich" + desc = "A sandwich is green stuff." + icon_state = "metroidsandwich" + New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("metroid", 5) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore + name = "Boiled Metroid Core" + desc = "A boiled red thing." + icon_state = "boiledmetroidcore" + New() + ..() + reagents.add_reagent("metroid", 5) + bitesize = 3 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels @@ -1216,13 +1295,76 @@ ..() reagents.add_reagent("nutriment", 25) - /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice name = "Vanilla Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "plaincake_slice" bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake + name = "Orange Cake" + desc = "A cake with added orange." + icon_state = "orangecake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 27) + +/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice + name = "Orange Cake slice" + desc = "Just a slice of cake, it is enough for everyone." + icon_state = "orangecake_slice" + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake + name = "Lime Cake" + desc = "A cake with added lime." + icon_state = "limecake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 27) + +/obj/item/weapon/reagent_containers/food/snacks/limecakeslice + name = "Lime Cake slice" + desc = "Just a slice of cake, it is enough for everyone." + icon_state = "limecake_slice" + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake + name = "Lemon Cake" + desc = "A cake with added lemon." + icon_state = "lemoncake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 27) + +/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice + name = "Lemon Cake slice" + desc = "Just a slice of cake, it is enough for everyone." + icon_state = "lemoncake_slice" + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake + name = "Chocolate Cake" + desc = "A cake with added chocolate" + icon_state = "chocolatecake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 27) + +/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice + name = "Chocolate Cake slice" + desc = "Just a slice of cake, it is enough for everyone." + icon_state = "chocolatecake_slice" + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel name = "Cheese wheel" desc = "A big wheel of delcious Cheddar." diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 00c310a055e..ae3fb0a3f4f 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -852,6 +852,17 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti +/datum/recipe/spesslaw + reagents = list("water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spagetti, + /obj/item/weapon/reagent_containers/food/snacks/faggot, + /obj/item/weapon/reagent_containers/food/snacks/faggot, + /obj/item/weapon/reagent_containers/food/snacks/faggot, + /obj/item/weapon/reagent_containers/food/snacks/faggot, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw + /datum/recipe/superbiteburger reagents = list("sodiumchloride" = 5, "blackpepper" = 5) items = list( @@ -904,3 +915,115 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake + +/datum/recipe/metroidburger + reagents = list("metroid" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/metroidburger + +/datum/recipe/twobread + reagents = list("wine" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/twobread + +/datum/recipe/metroidsandwich + reagents = list("metroid" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/metroidsandwich + +/datum/recipe/orangecake + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/orange, + /obj/item/weapon/reagent_containers/food/snacks/grown/orange, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake + +/datum/recipe/limecake + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/lime, + /obj/item/weapon/reagent_containers/food/snacks/grown/lime, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake + +/datum/recipe/lemoncake + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/lemon, + /obj/item/weapon/reagent_containers/food/snacks/grown/lemon, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake + +/datum/recipe/chocolatecake + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake + +/datum/recipe/bloodsoup + reagents = list("blood" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato, + /obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato, + + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup + + +/datum/recipe/metroidsoup + reagents = list("water" = 10, "metroid" = 5) + items = list( + ) + result = /obj/item/weapon/reagent_containers/food/snacks/metroidsoup + +/datum/recipe/clownstears + reagents = list("water" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/banana, + /obj/item/weapon/ore/clown, + + ) + result = /obj/item/weapon/reagent_containers/food/snacks/clownstears + +/datum/recipe/boiledmetroidcore + reagents = list("water" = 5) + items = list( + /obj/item/metroid_core, + + ) + result = /obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 1ad65c3e9ae..5c2539888d7 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index ec3df093b03..3c21336f2e2 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 0ed08fed69c..159c86f6996 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index dc8ca20a47f..bbb86dd6076 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -2482,7 +2482,7 @@ "aVL" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "aVM" = (/obj/table,/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/turf/simulated/floor,/area/crew_quarters/captain) "aVN" = (/obj/table,/obj/item/weapon/camera_test,/obj/item/weapon/storage/photo_album{pixel_y = -10},/turf/simulated/floor,/area/crew_quarters/captain) -"aVO" = (/obj/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor,/area/crew_quarters/captain) +"aVO" = (/obj/table,/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor,/area/crew_quarters/captain) "aVP" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/crew_quarters/captain) "aVQ" = (/obj/machinery/requests_console{department = "Captain's Quarters"; departmentType = 5; pixel_y = 30},/turf/simulated/floor,/area/crew_quarters/captain) "aVR" = (/turf/simulated/floor,/area/crew_quarters/captain)