diff --git a/html/changelogs/archive/2023-04.yml b/html/changelogs/archive/2023-04.yml index 22b35133cd..0ec52452be 100644 --- a/html/changelogs/archive/2023-04.yml +++ b/html/changelogs/archive/2023-04.yml @@ -35,3 +35,8 @@ click options - bugfix: genitals now properly show how full of fluids they are - code_imp: Made breasts a not so snowflake to handle +2023-04-30: + BongaTheProto: + - rscadd: adds runner jackets + - rscadd: adds a bunch of new horns for character customization + - rscadd: adds a few more variants of sushi diff --git a/modular_splurt/code/modules/client/loadout/suit.dm b/modular_splurt/code/modules/client/loadout/suit.dm index 51954f9b6a..c816aa157c 100644 --- a/modular_splurt/code/modules/client/loadout/suit.dm +++ b/modular_splurt/code/modules/client/loadout/suit.dm @@ -74,6 +74,21 @@ path = /obj/item/clothing/suit/toggle/rp_jacket/white subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS +/datum/gear/suit/jacket_runner_engi + name = "Engineer Runner Jacket" + path = /obj/item/clothing/suit/jacket/runner/engi + subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + +/datum/gear/suit/jacket_runner_syndicate + name = "Syndicate Runner Jacket" + path = /obj/item/clothing/suit/jacket/runner/syndicate + subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + +/datum/gear/suit/jacket_runner_winter + name = "Winter Runner Jacket" + path = /obj/item/clothing/suit/jacket/runner/winter + subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + /datum/gear/suit/baroness name = "Baroness Dress" path = /obj/item/clothing/suit/baroness diff --git a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm index 8307e30221..0dbaf5cb5c 100644 --- a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm @@ -98,6 +98,23 @@ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON flags_inv = HIDESHOES|HIDEUNDERWEAR +/obj/item/clothing/suit/jacket/runner + name = "Runner Jacket" + icon = 'modular_splurt/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/suit.dmi' + +/obj/item/clothing/suit/jacket/runner/engi + name = "Engineer Runner Jacket" + icon_state = "runner_engi" + +/obj/item/clothing/suit/jacket/runner/syndicate + name = "Sydnicate Runner Jacket" + icon_state = "runner_syndi" + +/obj/item/clothing/suit/jacket/runner/winter + name = "Winter Runner Jacket" + icon_state = "runner_winter" + /* * Posshim's Corpus atire */ diff --git a/modular_splurt/code/modules/food_and_drinks/food/snacks_sushi.dm b/modular_splurt/code/modules/food_and_drinks/food/snacks_sushi.dm new file mode 100644 index 0000000000..fb3037ab72 --- /dev/null +++ b/modular_splurt/code/modules/food_and_drinks/food/snacks_sushi.dm @@ -0,0 +1,79 @@ +/obj/item/reagent_containers/food/snacks/vegetariansushiroll + name = "vegetarian sushi roll" + desc = "A roll of simple vegetarian sushi with rice, carrots, and potatoes. Sliceable into pieces!" + icon = 'modular_splurt/icons/obj/food/sushi.dmi' + icon_state = "vegetariansushiroll" + list_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/spicyfiletsushiroll + name = "spicy filet sushi roll" + desc = "A roll of tasty, spicy sushi made with fish and vegetables. Sliceable into pieces!" + icon = 'modular_splurt/icons/obj/food/sushi.dmi' + icon_state = "spicyfiletroll" + list_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/capsaicin = 4, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2) + foodtype = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/meat_poke + name = "meat poke" + desc = "Simple poke, rice on the bottom, vegetables and meat on top. Should be mixed before eating." + icon = 'modular_splurt/icons/obj/food/soupsalad.dmi' + icon_state = "pokemeat" + list_reagents = list( + /datum/reagent/consumable/nutriment = 11, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + foodtype = MEAT | VEGETABLES + tastes = list("rice and meat" = 4, "lettuce" = 2, "soy sauce" = 2) + trash = /obj/item/reagent_containers/glass/bowl + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/fish_poke + name = "fish poke" + desc = "Simple poke, rice on the bottom, vegetables and fish on top. Should be mixed before eating." + icon = 'modular_splurt/icons/obj/food/soupsalad.dmi' + icon_state = "pokefish" + list_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + foodtype = MEAT | VEGETABLES + tastes = list("rice and fish" = 4, "lettuce" = 2, "soy sauce" = 2) + trash = /obj/item/reagent_containers/glass/bowl + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/sushi_feline + name = "neko roll" + desc = "A cute sushi roll in the shape of a cat face. Almost too adorable to eat." + icon = 'modular_splurt/icons/obj/food/sushi.dmi' + icon_state = "nekoroll" + bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list( + /datum/reagent/consumable/nutriment = 2, + /datum/reagent/consumable/sugar = 1 + ) + tastes = list("rice" = 1, "fish" = 1, "cuteness" = 1) + foodtype = MEAT | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/snacks/sushi_feline/nekobara + name = "nekobara roll" + desc = "A fistful of rice with a crude cat face on it. It's got a fishy scent, too." + icon_state = "bignekoroll" + list_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/sugar = 2 + ) + tastes = list("rice" = 1, "fish" = 1, "wastefulness" = 1) diff --git a/modular_splurt/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/modular_splurt/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm new file mode 100644 index 0000000000..8c26dfe0ce --- /dev/null +++ b/modular_splurt/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -0,0 +1,72 @@ +/datum/crafting_recipe/food/vegetariansushiroll + name ="Vegetarian sushi roll" + reqs = list( + /datum/reagent/consumable/soysauce = 3, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 3, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/vegetariansushiroll + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/spicyfiletroll + name ="Spicy filet sushi roll" + reqs = list( + /datum/reagent/consumable/soysauce = 3, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 3, + /obj/item/reagent_containers/food/snacks/carpmeat = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spicyfiletsushiroll + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/meat_poke + name ="Meat poke" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 1, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 3, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1, + /datum/reagent/consumable/soysauce = 1, + ) + result = /obj/item/reagent_containers/food/snacks/meat_poke + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/fish_poke + name ="Fish poke" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 1, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1, + /datum/reagent/consumable/soysauce = 1, + ) + result = /obj/item/reagent_containers/food/snacks/fish_poke + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/sushi_feline + name = "Neko roll" + reqs = list( + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1, + /datum/reagent/consumable/soysauce = 2, + /datum/reagent/consumable/sugar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/sushi_feline + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/sushi_feline/nekobara + name = "Nekobara roll" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /datum/reagent/consumable/sugar = 2, + /obj/item/reagent_containers/food/snacks/sushi_rice = 4, + /obj/item/reagent_containers/food/snacks/carpmeat = 2, + ) + result = /obj/item/reagent_containers/food/snacks/sushi_feline/nekobara diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/horns.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/horns.dm index 4454dd0283..de5fd3430d 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/horns.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/horns.dm @@ -50,3 +50,54 @@ center = TRUE color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/horns/crippledbull + name = "Crippled Bull" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "crippledbull" + +/datum/sprite_accessory/horns/hollowpoint + name = "Hollow-Points" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "hollowpoint" + +/datum/sprite_accessory/horns/ticketrack + name = "Ticket Rack" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "ticketrack" + +/datum/sprite_accessory/horns/hopefulhorns + name = "Hopeful Horns" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "hopefulhorns" + +/datum/sprite_accessory/horns/analyticalantlers + name = "Analytical Antlers" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "analyticalantlers" + +/datum/sprite_accessory/horns/spidersspikes + name = "Spiders Spikes" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "spidersspikes" + +/datum/sprite_accessory/horns/broadcurls + name = "Broad Curls" + icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi' + icon_state = "broadcurls" + relevant_layers = list(HORNS_LAYER, BODY_FRONT_LAYER) + +/datum/sprite_accessory/horns/big/paintedpoints + name = "Painted Points" + icon = 'modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi' + icon_state = "paintedpoints" + +/datum/sprite_accessory/horns/big/whoshorns + name = "Who's Horns?" + icon = 'modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi' + icon_state = "whoshorns" + +/datum/sprite_accessory/horns/big/highrisehorns + name = "High-rise Horns" + icon = 'modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi' + icon_state = "highrisehorns" diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index 7051fb2edf..8e36dd8cbc 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/modular_splurt/code/modules/vending/clothesmate.dm @@ -9,6 +9,9 @@ /obj/item/clothing/suit/toggle/rp_jacket/purple = 3, /obj/item/clothing/suit/toggle/rp_jacket/red = 3, /obj/item/clothing/suit/toggle/rp_jacket/white = 3, + /obj/item/clothing/suit/jacket/runner/engi = 3, + /obj/item/clothing/suit/jacket/runner/syndicate = 3, + /obj/item/clothing/suit/toggle/rp_jacket/white = 3, /obj/item/clothing/under/goner/fake/poly = 10, /obj/item/clothing/suit/goner/fake/poly = 10, /obj/item/clothing/head/helmet/goner/fake/poly = 10, diff --git a/modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi b/modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi new file mode 100644 index 0000000000..2a91f68d59 Binary files /dev/null and b/modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi differ diff --git a/modular_splurt/icons/mob/clothing/suit.dmi b/modular_splurt/icons/mob/clothing/suit.dmi index ae1e1ac1d1..8320a96af1 100644 Binary files a/modular_splurt/icons/mob/clothing/suit.dmi and b/modular_splurt/icons/mob/clothing/suit.dmi differ diff --git a/modular_splurt/icons/mob/mutant_bodyparts.dmi b/modular_splurt/icons/mob/mutant_bodyparts.dmi index 4420785ce2..9bb6448c6d 100644 Binary files a/modular_splurt/icons/mob/mutant_bodyparts.dmi and b/modular_splurt/icons/mob/mutant_bodyparts.dmi differ diff --git a/modular_splurt/icons/obj/clothing/suits.dmi b/modular_splurt/icons/obj/clothing/suits.dmi index de921cc6bd..06b1a54c30 100644 Binary files a/modular_splurt/icons/obj/clothing/suits.dmi and b/modular_splurt/icons/obj/clothing/suits.dmi differ diff --git a/modular_splurt/icons/obj/food/soupsalad.dmi b/modular_splurt/icons/obj/food/soupsalad.dmi new file mode 100644 index 0000000000..d4b110a185 Binary files /dev/null and b/modular_splurt/icons/obj/food/soupsalad.dmi differ diff --git a/modular_splurt/icons/obj/food/sushi.dmi b/modular_splurt/icons/obj/food/sushi.dmi new file mode 100644 index 0000000000..28f6801a7f Binary files /dev/null and b/modular_splurt/icons/obj/food/sushi.dmi differ diff --git a/tgstation.dme b/tgstation.dme index be81168a99..2fe642dd9c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3493,7 +3493,6 @@ #include "code\modules\research\techweb\nodes\computer_hud_nodes.dm" #include "code\modules\research\techweb\nodes\engineering_nodes.dm" #include "code\modules\research\techweb\nodes\export_nodes.dm" -#include "modular_splurt\code\modules\research\techweb\nodes\janitor_nodes.dm" #include "code\modules\research\techweb\nodes\mecha_nodes.dm" #include "code\modules\research\techweb\nodes\medical_nodes.dm" #include "code\modules\research\techweb\nodes\misc_nodes.dm" @@ -4666,10 +4665,12 @@ #include "modular_splurt\code\modules\food_and_drinks\food\snacks_burgers.dm" #include "modular_splurt\code\modules\food_and_drinks\food\snacks_other.dm" #include "modular_splurt\code\modules\food_and_drinks\food\snacks_pastry.dm" +#include "modular_splurt\code\modules\food_and_drinks\food\snacks_sushi.dm" #include "modular_splurt\code\modules\food_and_drinks\food\snacks_vend.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\drink_recipes.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" +#include "modular_splurt\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" #include "modular_splurt\code\modules\holiday\holidays.dm" #include "modular_splurt\code\modules\holodeck\holo_effect.dm" #include "modular_splurt\code\modules\hydroponics\grown\towercap.dm" @@ -4829,6 +4830,7 @@ #include "modular_splurt\code\modules\research\designs\machine_designs\machine_designs_all_misc.dm" #include "modular_splurt\code\modules\research\techweb\nodes\biotech_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\bluespace_nodes.dm" +#include "modular_splurt\code\modules\research\techweb\nodes\janitor_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\mecha_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\medical_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\nanites_nodes.dm"