diff --git a/_maps/map_files/Snowglobe/snowglobe.dmm b/_maps/map_files/Snowglobe/snowglobe.dmm index 4e69cbec286..443f46379d9 100644 --- a/_maps/map_files/Snowglobe/snowglobe.dmm +++ b/_maps/map_files/Snowglobe/snowglobe.dmm @@ -9956,6 +9956,7 @@ /area/station/science/genetics) "cGs" = ( /obj/vehicle/ridden/secway, +/obj/item/key/security, /turf/open/floor/iron/recharge_floor, /area/station/ai_monitored/security/armory) "cGu" = ( @@ -45032,10 +45033,6 @@ dir = 8 }, /area/station/command/secure_bunker) -"mai" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/turf/closed/wall/r_wall, -/area/station/security/interrogation) "mav" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -57855,6 +57852,7 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 8 }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, @@ -245043,7 +245041,7 @@ bTu bTu bTu bTu -mai +bTu bmd ayV bsm diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index e7246fd04ef..89ad7640fce 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -1,4 +1,4 @@ -/proc/empulse(turf/epicenter, heavy_range, light_range, log=0) +/proc/empulse(turf/epicenter, heavy_range, light_range, log=1) // NOVA EDIT CHANGE - ORIGINAL: /proc/empulse(turf/epicenter, heavy_range, light_range, log=0) if(!epicenter) return diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 603f537336e..ace74727d3a 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -11,7 +11,7 @@ hijack_speed = 0.5 ui_name = "AntagInfoChangeling" suicide_cry = "FOR THE HIVE!!" - can_assign_self_objectives = TRUE + can_assign_self_objectives = FALSE // NOVA EDIT CHANGE - Too loose of a cannon, and doesn't have staff sign off - ORIGINAL: can_assign_self_objectives = TRUE default_custom_objective = "Consume the station's most valuable genomes." hardcore_random_bonus = TRUE stinger_sound = 'sound/music/antag/ling_alert.ogg' diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 1d37f75eb8f..0e2ec688e28 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -14,7 +14,7 @@ ui_name = "AntagInfoTraitor" suicide_cry = "FOR THE SYNDICATE!!" preview_outfit = /datum/outfit/traitor - can_assign_self_objectives = TRUE + can_assign_self_objectives = FALSE // NOVA EDIT CHANGE - Too loose of a cannon, and doesn't have staff sign off - ORIGINAL: can_assign_self_objectives = TRUE default_custom_objective = "Perform an overcomplicated heist on valuable Nanotrasen assets." hardcore_random_bonus = TRUE stinger_sound = 'sound/music/antag/traitor/tatoralert.ogg' diff --git a/html/changelogs/AutoChangeLog-pr-5188.yml b/html/changelogs/AutoChangeLog-pr-5188.yml new file mode 100644 index 00000000000..bdeba466748 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5188.yml @@ -0,0 +1,7 @@ +author: "Thedragmeme" +delete-after: True +changes: + - rscadd: "Adds 7 new drinks: Starfruit Soda, Starfruit Lubricant(Synth), Starlit Latte, Starbeam Shake, Forgotten Star, Astral Flame, and Space Muse." + - rscadd: "Adds 14 new dishes: Glazed Ribs, BBQ Meat Platter, Chicken Alfredo(cursed), Starfruit Sushi Roll, Starfruit Sashimi, Starfruit Eggplant Stir Fry, Starfruit Tofu Beef Ramen, Starfruit Noodles, Starfruit Cake(do you see the theme yet), Starfruit Jelly, Starfruit Macaron, Starfruit Cobbler, Starfruit Jelly Toast, Starfruit Pie, Starfruit Compote, Starfruit Creme Brulee, and Starfruit Cupcake" + - image: "Adds roughly 20 new sprites to the game" + - qol: "Adds a new book to the starfruit seed crate" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5189.yml b/html/changelogs/AutoChangeLog-pr-5189.yml new file mode 100644 index 00000000000..87b30d7463a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5189.yml @@ -0,0 +1,5 @@ +author: "FlufflesTheDog" +delete-after: True +changes: + - bugfix: "stomachs no longer drop out of oversized characters on spawn" + - bugfix: "charging implants no longer drop out of synth characters on spawn" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5190.yml b/html/changelogs/AutoChangeLog-pr-5190.yml new file mode 100644 index 00000000000..0cb21d74cd2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5190.yml @@ -0,0 +1,4 @@ +author: "sqnztb" +delete-after: True +changes: + - map: "snowglobe - fixed the floating pepperspray refiller and added a secway key." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5191.yml b/html/changelogs/AutoChangeLog-pr-5191.yml new file mode 100644 index 00000000000..151755270cf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5191.yml @@ -0,0 +1,4 @@ +author: "sqnztb" +delete-after: True +changes: + - admin: "logging enabled by default for all emp sources." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5192.yml b/html/changelogs/AutoChangeLog-pr-5192.yml new file mode 100644 index 00000000000..ac4ce736083 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5192.yml @@ -0,0 +1,7 @@ +author: "iskawhiskers" +delete-after: True +changes: + - rscadd: "new sprite accessories: floppy (ears), big legs with pegfeet (taur legs), porcine and porcine + tusks (snout)" + - qol: "duplicated fuzzball/cetaceous/geniculate antennae to horns" + - rscadd: "new clothing: giant scarf (undersuit), designer gloves (hands), designer jacket (suit)" + - qol: "add security cape to the loadout menu. accessible by all players as it is a neck item with no mechanical benefit" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5193.yml b/html/changelogs/AutoChangeLog-pr-5193.yml new file mode 100644 index 00000000000..9086ae4e4c6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5193.yml @@ -0,0 +1,4 @@ +author: "RatFromTheJungle" +delete-after: True +changes: + - code_imp: "Traitors and changelings can no longer self-assign objectives." \ No newline at end of file diff --git a/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm b/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm index 7ba81054896..c627754e05f 100644 --- a/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm +++ b/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm @@ -35,6 +35,12 @@ icon_state = "labcoat_regular" gets_cropped_on_taurs = FALSE +/obj/item/clothing/suit/toggle/labcoat/nova/lalunevest + name = "sleeveless buttoned coat" + desc = "A fashionable jacket bearing the La Lune insignia on the inside. It appears similar to a labcoat in design and materials, though the tag warns against it being a replacement for such." + icon_state = "labcoat_lalunevest" + gets_cropped_on_taurs = FALSE + /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist name = "pharmacist's labcoat" desc = "A standard labcoat for chemistry which protects the wearer from acid spills." diff --git a/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm index 7b8487308ab..7e12a1dff8b 100644 --- a/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm +++ b/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm @@ -216,6 +216,17 @@ greyscale_config = /datum/greyscale_config/wedding_dress_ribbon greyscale_config_worn = /datum/greyscale_config/wedding_dress_ribbon/worn +/obj/item/clothing/under/dress/nova/giant_scarf + name = "giant scarf" + desc = "An absurdly massive scarf, worn as the main article of clothing over the body. Ironically, not very suitable for the cold." + icon_state = "giant_scarf" + body_parts_covered = CHEST|GROIN|LEGS + greyscale_config = /datum/greyscale_config/giant_scarf + greyscale_config_worn = /datum/greyscale_config/giant_scarf/worn + greyscale_colors = "#EEEEEE" + female_sprite_flags = NO_FEMALE_UNIFORM + flags_1 = IS_PLAYER_COLORABLE_1 + /* * Others */ diff --git a/modular_nova/master_files/icons/mob/clothing/hands.dmi b/modular_nova/master_files/icons/mob/clothing/hands.dmi index acc0efab98e..cae8c981681 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/hands.dmi and b/modular_nova/master_files/icons/mob/clothing/hands.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi b/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi index ac9fe47496a..d8ec78fb925 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi and b/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi b/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi index 5e24a4e01a1..2f22e469c9f 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi and b/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi differ diff --git a/modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi b/modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi new file mode 100644 index 00000000000..bbb4a225d56 Binary files /dev/null and b/modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi differ diff --git a/modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi b/modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi new file mode 100644 index 00000000000..750c7861b65 Binary files /dev/null and b/modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi index c271e055c47..00bba4bb9da 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi index a1d5cfcbd89..c3017d39e7a 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi index 3817ae01591..2be9e8a6359 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi index 4ccc42f5775..b6c9c0c7bbd 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/gloves.dmi b/modular_nova/master_files/icons/obj/clothing/gloves.dmi index 83c167227dd..8dc31ff3b82 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/gloves.dmi and b/modular_nova/master_files/icons/obj/clothing/gloves.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi b/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi index abe9f39089b..05aed77e092 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi and b/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi b/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi index e9820dd18b2..a57509a028a 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi and b/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi differ diff --git a/modular_nova/master_files/icons/obj/food/starfruit.dmi b/modular_nova/master_files/icons/obj/food/starfruit.dmi new file mode 100644 index 00000000000..7cab6449e69 Binary files /dev/null and b/modular_nova/master_files/icons/obj/food/starfruit.dmi differ diff --git a/modular_nova/master_files/icons/obj/starfruitbook.dmi b/modular_nova/master_files/icons/obj/starfruitbook.dmi new file mode 100644 index 00000000000..9f16da9ce0a Binary files /dev/null and b/modular_nova/master_files/icons/obj/starfruitbook.dmi differ diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm index 21ca55ad28d..93e6ed83044 100644 --- a/modular_nova/modules/GAGS/greyscale_configs.dm +++ b/modular_nova/modules/GAGS/greyscale_configs.dm @@ -1346,6 +1346,15 @@ name = "Wedding Dress With Ribbon (Worn)" icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi' +/datum/greyscale_config/giant_scarf + name = "Giant Scarf" + icon_file = 'modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi' + json_config = 'modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json' + +/datum/greyscale_config/giant_scarf/worn + name = "Giant Scarf (Worn)" + icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi' + // KILT // COSTUMES diff --git a/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json b/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json new file mode 100644 index 00000000000..59ce4991e5b --- /dev/null +++ b/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json @@ -0,0 +1,10 @@ +{ + "giant_scarf": [ + { + "type": "icon_state", + "icon_state": "giant_scarf", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_nova/modules/cargo/code/packs.dm b/modular_nova/modules/cargo/code/packs.dm index 8fec2c2f507..673b8f487b1 100644 --- a/modular_nova/modules/cargo/code/packs.dm +++ b/modular_nova/modules/cargo/code/packs.dm @@ -716,4 +716,5 @@ cost = CARGO_CRATE_VALUE * 5 contains = list( /obj/item/seeds/starfruit = 2, + /obj/item/book/manual/starfruit = 1, ) diff --git a/modular_nova/modules/customization/modules/client/augment/implants.dm b/modular_nova/modules/customization/modules/client/augment/implants.dm index 54e962a4f6c..93d135be607 100644 --- a/modular_nova/modules/customization/modules/client/augment/implants.dm +++ b/modular_nova/modules/customization/modules/client/augment/implants.dm @@ -1,11 +1,11 @@ /datum/augment_item/implant category = AUGMENT_CATEGORY_IMPLANTS -/datum/augment_item/implant/apply(mob/living/carbon/human/H, character_setup = FALSE, datum/preferences/prefs) +/datum/augment_item/implant/apply(mob/living/carbon/human/organ_receiver, character_setup = FALSE, datum/preferences/prefs) if(character_setup) return - var/obj/item/organ/new_organ = new path() - new_organ.Insert(H,FALSE,FALSE) + var/obj/item/organ/new_organ = new path + new_organ.Insert(organ_receiver, special = FALSE, movement_flags = DELETE_IF_REPLACED) //BRAIN IMPLANTS /datum/augment_item/implant/brain diff --git a/modular_nova/modules/customization/modules/clothing/hands/hands.dm b/modular_nova/modules/customization/modules/clothing/hands/hands.dm index 1daa85fa65e..08d4be8811e 100644 --- a/modular_nova/modules/customization/modules/clothing/hands/hands.dm +++ b/modular_nova/modules/customization/modules/clothing/hands/hands.dm @@ -9,6 +9,15 @@ cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT +/obj/item/clothing/gloves/lalune_long + icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' + worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi' + name = "designer long gloves" + desc = "A fancy set of bicep-length black gloves. The La Lune insignia is sewn into the rims." + icon_state = "lalune_long" + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS + /obj/item/clothing/gloves/kim icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi' diff --git a/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm b/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm index 163c63e3c99..66047f17feb 100644 --- a/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm +++ b/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm @@ -29,3 +29,678 @@ bite_consumption_mod = 2 foodtypes = FRUIT | SUGAR juice_typepath = /datum/reagent/consumable/starfruit_juice + +//Starfruit drinks +//All the drinks are very good because this shit cost 1k minimum to get the starfruit + +/datum/chemical_reaction/drink/starfruit_soda + results = list(/datum/reagent/consumable/ethanol/starfruit_soda = 5) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 2, + /datum/reagent/consumable/ethanol/rum = 2, + /datum/reagent/consumable/ethanol/cognac = 1, + /datum/reagent/consumable/sodawater = 1, + ) + mix_message = "The ingredients combine into fizzy soda." + +/datum/reagent/consumable/ethanol/starfruit_soda //starfruit juice 2, rum 2, cognac 1, soda water 1 + name = "Stellar Twist" + description = "A drink over tired moms could hide in their thermos." + boozepwr = 35 + color = "#434294" + quality = DRINK_VERYGOOD + taste_description = "sweet stellar adventures" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_soda + required_drink_type = /datum/reagent/consumable/ethanol/starfruit_soda + name = "Stellar Twist" + desc = "An alcoholic starfruit soda, you can see the carbination in the glass" + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starsoda" + +/datum/chemical_reaction/drink/starfruit_lubricant + results = list(/datum/reagent/consumable/ethanol/starfruit_lubricant = 2) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/ethanol/synthanol = 1, + ) + mix_message = "The ingredients combine into a fizzy soda." + +/datum/reagent/consumable/ethanol/starfruit_lubricant //starfruit juice 1, Synthanol 1 + name = "Stellar Lubricant" + description = "A drink over tired moms could hide in their thermos. Now for Synths!" + boozepwr = 35 + color = "#45b33b" + quality = DRINK_VERYGOOD + taste_description = "sweet stellar adventures" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_lubricant + required_drink_type = /datum/reagent/consumable/ethanol/starfruit_lubricant + name = "Stellar Lubricant" + desc = "An alcoholic synth friendly starfruit soda, you can see the carination in the glass." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starsodasynth" + +/datum/chemical_reaction/drink/starfruit_latte + results = list(/datum/reagent/consumable/starfruit_latte = 2) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/coffee = 1, + ) + +/datum/reagent/consumable/starfruit_latte //starfruit juice 1, coffee 1 + name = "Starlit Latte" + description = "A subtly sweet coffee seemingly out of this world." + nutriment_factor = 8 + color = "#361329" + quality = DRINK_VERYGOOD + taste_description = "hauntingly familiar allure" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_latte + required_drink_type = /datum/reagent/consumable/starfruit_latte + name = "mug of starlit latte" + desc = "A simple coffe flavored with sweet starfruit juice. It takes you on a journey to a place you’ve never been, yet somehow know by heart." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starfruit_latte" + +/datum/chemical_reaction/drink/starbeam_shake //starfruit juice 1 , vanilla dream 1 , ice 1 + results = list(/datum/reagent/consumable/starbeam_shake = 3) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/vanilla_dream = 1, + /datum/reagent/consumable/ice = 1, + ) + +/datum/reagent/consumable/starbeam_shake + name = "starbeam shake" + description = "A delightful shake made with a rare starfruit." + color = "#a551be" + nutriment_factor = 0 + quality = DRINK_VERYGOOD + taste_description = "smooth starlight" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starbeam_shake + required_drink_type = /datum/reagent/consumable/starbeam_shake + name = "starbeam shake" + desc = "A thick and creamy drink that takes you for a journey in the stars." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "voidshake" + +/datum/chemical_reaction/drink/forgotten_star + results = list(/datum/reagent/consumable/ethanol/forgotten_star = 5) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/pineapplejuice = 1, + /datum/reagent/consumable/ethanol/white_russian = 1, + /datum/reagent/consumable/ethanol/creme_de_coconut = 1, + /datum/reagent/consumable/ethanol/bitters = 1, + ) + mix_message = "The ingredients combine into a shooting star." + +/datum/reagent/consumable/ethanol/forgotten_star //starfruit juice 1, creme de coconut 1, white russian 1, pineapple juice 1, bitters 1 + name = "Forgotten Star" + description = "A cosmic cry of a bygone era." + boozepwr = 55 + color = "#434294" + quality = DRINK_VERYGOOD + taste_description = "dreamy, tropical starlit sweetness" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/forgotten_star + required_drink_type = /datum/reagent/consumable/ethanol/forgotten_star + name = "Forgotten Star" + desc = "An alcoholic starfruit coctail, you can almost make out a distant star system in the glass." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "forgottenstar" + +/datum/chemical_reaction/drink/astral_flame + results = list(/datum/reagent/consumable/ethanol/astral_flame = 6) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/ethanol/navy_rum = 1, + /datum/reagent/consumable/menthol = 1, + /datum/reagent/consumable/limejuice = 1, + /datum/reagent/consumable/sodawater = 1, + ) + mix_message = "The ingredients morph into a an enticing smell" + +/datum/reagent/consumable/ethanol/astral_flame //starfruit juice 1, navy rum 1, lime juice 1, soda water 1, menthol 1 + name = "Astral Flame" + description = "Enticing flames." + boozepwr = 55 + color = "#6b3481" + quality = DRINK_VERYGOOD + taste_description = "enticing warmth" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/astral_flame + required_drink_type = /datum/reagent/consumable/ethanol/astral_flame + name = "Astral Flame" + desc = "An alcoholic starfruit mojito, the flame in the glass tempts you closer." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "astralflame" + +/datum/chemical_reaction/drink/space_muse + results = list(/datum/reagent/consumable/ethanol/space_muse = 3) + required_reagents = list( + /datum/reagent/consumable/starfruit_juice = 1, + /datum/reagent/consumable/ethanol/creme_de_menthe = 1, + /datum/reagent/consumable/ethanol/vodka = 1, + ) + mix_message = "The mixture gives a soft crackling snap." + +/datum/reagent/consumable/ethanol/space_muse //starfruit juice 1, creme de menthe, 1 vodka + name = "Space Muse" + description = "A snapshot straight from your local telescope." + boozepwr = 35 + color = "#7cb1e2" + quality = DRINK_VERYGOOD + taste_description = "haughty cosmic thought" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/space_muse + required_drink_type = /datum/reagent/consumable/ethanol/space_muse + name = "Space Muse" + desc = "An alcoholic coctail that draws you in with sybtle bites of mint and starfruit." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "spacemuse" + +//Starfruit dishes + +/datum/crafting_recipe/food/glazed_ribs + name = "Starfruit Glazed Ribs" + reqs = list( + /obj/item/food/bbqribs = 1, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/starfruit_juice = 5, + ) + result = /obj/item/food/glazed_ribs + category = CAT_MEAT + +/obj/item/food/glazed_ribs + name = "starfruit glazed ribs" + desc = "Tender BBQ ribs, glazed with a sweet Starfruit sauce. Garinished with a carmalized starfruit on the side. The sweetest least vegan thing this side of the frontier." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "glazedchops" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 15, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/bbqsauce = 5, + /datum/reagent/consumable/starfruit_juice = 5, + ) + tastes = list("tender meat" = 2, "sweet sauce" = 1, "sugary glaze" = 1) + foodtypes = MEAT + crafting_complexity = FOOD_COMPLEXITY_4 + +/datum/crafting_recipe/food/meatplatter + name = "BBQ Meat Platter" + reqs = list( + /obj/item/food/bbqribs, + /obj/item/food/glazed_ribs, + /obj/item/food/roasted_bell_pepper = 2, + ) + result = /obj/item/food/meatplatter + category = CAT_MEAT + +/obj/item/food/meatplatter + name = "BBQ meat platter" + desc = "An elaborate BBQ platter adorned with several BBQ favorites on this side of the galaxy. Garnished with some rosted pepper." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "meatdisc" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 30, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/bbqsauce = 10, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("tender meat" = 2, "sweet sauce" = 1, "smokey BBQ" = 1, "sugary glaze" = 1) + foodtypes = MEAT + crafting_complexity = FOOD_COMPLEXITY_5 + +/datum/crafting_recipe/food/chicken_alfredo + name = "Starfruit Chicken Alfredo" + reqs = list( + /obj/item/food/meat/slab/chicken = 1, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/cream = 10, + /obj/item/food/spaghetti/boiledspaghetti = 1 + ) + result = /obj/item/food/chicken_alfredo + category = CAT_MISCFOOD + +/obj/item/food/chicken_alfredo + name = "starfruit chicken alfredo" + desc = "A chicken alfredo dish with a starfruit cream sauce. Not for the faint of heart." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "alfredo" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 15, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("sweet chicken" = 2, "creamy sauce" = 1, "cursed knowledge" = 1, "tasty noodles" = 1) + foodtypes = MEAT | GRAIN + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitsushiroll + name = "Starfruit Sushi Roll" + reqs = list( + /obj/item/food/seaweedsheet = 1, + /obj/item/food/boiledrice = 1, + /obj/item/food/starfruit_sashimi = 1, + ) + result = /obj/item/food/starfruitsushiroll + category = CAT_SEAFOOD + +/obj/item/food/starfruitsushiroll + name = "starfruit sushi roll" + desc = "A roll of simple sushi with delicious starfruit sashimi. Sliceable into pieces!" + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "sashimiroll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("boiled rice" = 2, "starfruit" = 2, "fish" = 2) + foodtypes = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruitsushiroll/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/starfruitsushislice, 4, screentip_verb = "Chop") + +/obj/item/food/starfruitsushislice + name = "starfruit sushi slice" + desc = "A slice of starfruit sushi with rice, fish, and cradled in a seaweed sheat." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "sashimirollslice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 1, + ) + tastes = list("boiled rice" = 2, "starfruit" = 2, "fish" = 2) + foodtypes = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruit_sashimi + name = "Starfruit Sashimi" + reqs = list( + /obj/item/food/fishmeat = 2, + /datum/reagent/consumable/soysauce = 10, + /obj/item/food/grown/starfruit = 1, + ) + result = /obj/item/food/starfruit_sashimi + category = CAT_SEAFOOD + +/obj/item/food/starfruit_sashimi + name = "starfruit sashimi" + desc = "Delicately slished sashimi made with a starfruit reduced soy sauce." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "sashimi" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("raw fish" = 2, "sweet fish" = 1, "soy sauce" = 1) + foodtypes = SEAFOOD + crafting_complexity = FOOD_COMPLEXITY_2 + +/datum/crafting_recipe/food/eggplantfry + name = "Starfruit Eggplant Stir Fry" + reqs = list( + /obj/item/food/grown/bell_pepper = 1, + /obj/item/food/grown/cabbage = 1, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/grown/carrot = 1, + /obj/item/food/grown/eggplant = 2, + ) + result = /obj/item/food/eggplantfry + category = CAT_MISCFOOD + +/obj/item/food/eggplantfry + name = "starfruit eggplant stir fry" + desc = "Eggplant stir fry with a reduced starfruit sauce, carrot, peppers, and cabbage. The starfruit has absolutely covered the dish." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "eggplantfry" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("eggplant" = 2, "simmered starfruit" = 1, "sautaed vegetables" = 1) + foodtypes = VEGETABLES + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/tofubeef + name = "Starfruit Tofu Beef Ramen" + reqs = list( + /obj/item/food/tofu = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + ) + result = /obj/item/food/tofubeef + category = CAT_MISCFOOD + +/obj/item/food/tofubeef + name = "starfruit tofu beef ramen" + desc = "A delightful ramen dish steeped in beef, tofu and starfruit. The uncanny combination of ingredients results in a suprisingly tangy dish with a subtly sweet aftertaste." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "tofubeef" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("noodles" = 2, "boiled starfruit" = 1, "sweet ramen" = 1) + foodtypes = VEGETABLES | MEAT | GRAIN + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitplate + name = "Starfruit Noodle Pasta" + reqs = list( + /obj/item/food/meatball = 2, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/spaghetti/pastatomato = 1, + ) + result = /obj/item/food/starfruitplate + category = CAT_MISCFOOD + +/obj/item/food/starfruitplate + name = "starfruit noodle pasta" + desc = "Savory boiled pasta with a rich and creamy reduced starfruit meat sauce." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starfruitplate" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("sweet spagetti" = 2, "simmered starfruit" = 1, "savory meat" = 1) + foodtypes = GRAIN | MEAT + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitcake + name = "Starfruit Cake" + reqs = list( + /obj/item/food/cake/plain = 1, + /obj/item/food/grown/starfruit = 5 + ) + result = /obj/item/food/cake/starfruit + category = CAT_CAKE + +/obj/item/food/cake/starfruit + name = "starfruit cake" + desc = "An elaborately decorated cake with a starfruit filling. Pairs well with a starlit latte." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starcake" + food_reagents = list( + /datum/reagent/consumable/nutriment = 20, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("cake" = 3, "sweetness" = 2, "unbearable longing" = 2) + foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + slice_type = /obj/item/food/cakeslice/starfruit + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/cakeslice/starfruit + name = "starfruit cake slice" + desc = "A slice of starfruit cake, you got a slice with extra frosting! Lucky you!" + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starcake_slice" + tastes = list("cake" = 3, "astral sweetness" = 2, "unbearable longing" = 2) + foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/reagent/consumable/starfruitjelly + name = "Starfruit Jelly" + description = "A rare sweet fruit jelly " + nutriment_factor = 10 + color = "#6d3890" + taste_description = "starfruit" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + default_container = /obj/item/reagent_containers/condiment/starfruitjelly + +/obj/item/reagent_containers/condiment/starfruitjelly + name = "starfruit jelly" + desc = "A jar of super-sweet starfruit jelly." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "spacejam" + list_reagents = list(/datum/reagent/consumable/starfruitjelly = 50) + fill_icon_thresholds = null + +/datum/crafting_recipe/bottled/starfruitjelly + name = "Starfruit Jelly" + reqs = list( + /obj/item/food/grown/starfruit = 10, + /datum/reagent/water = 25, + ) + result = /obj/item/reagent_containers/condiment/starfruitjelly + category = CAT_MISCFOOD + +/obj/item/food/cookie/macaron/starfruit + name = "starfruit macaron" + desc = "A sandwich-like confectionary with a soft cookie shell and a creamy starfruit jelly meringue center." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "macaron_4" + tastes = list("wafer" = 2, "sweet starfruit" = 2, "creamy meringue" = 3) + +/datum/crafting_recipe/food/macaron/starfruit + name = "Starfruit Macaron" + reqs = list( + /datum/reagent/consumable/eggwhite = 2, + /datum/reagent/consumable/cream = 5, + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/starfruitjelly = 5, + ) + result = /obj/item/food/cookie/macaron/starfruit + category = CAT_PASTRY + +/datum/crafting_recipe/food/starfruitcobbler + name = "Starfruit Cobbler" + reqs = list( + /obj/item/food/pastrybase = 2, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/starfruitjelly = 10, + ) + result = /obj/item/food/pie/starfruitcobbler + category = CAT_PASTRY + +/obj/item/food/pie/starfruitcobbler + name = "starfruit cobbler" + desc = "A tasty cobbler packed with sweet starfruit in a buttery pastry crust. Topped with a small amount of sweet cream." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "cobbler" + bite_consumption = 3 + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("pie" = 1, "sugar" = 2, "starfruit" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT + +/datum/crafting_recipe/food/starfruit_toast + name = "Starfruit Jellied Toast" + reqs = list( + /obj/item/food/breadslice/plain = 1, + /datum/reagent/consumable/starfruitjelly = 5, + ) + result = /obj/item/food/starfruit_toast + category = CAT_BREAD + +/obj/item/food/starfruit_toast + name = "starfruit jellied toast" + desc = "A slice of toast covered with delicious starfruit jam." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "spacejamtoast" + food_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + bite_consumption = 3 + tastes = list("toast" = 1, "jelly" = 1, "starfruit jelly" = 1) + foodtypes = GRAIN | BREAKFAST + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitpie + name = "Starfruit Pie" + reqs = list( + /obj/item/food/pie/plain = 1, + /obj/item/food/grown/starfruit = 2, + ) + result = /obj/item/food/pie/starfruitpie + category = CAT_PASTRY + +/obj/item/food/pie/starfruitpie + name = "starfruit pie" + desc = "Deceptively simple, yet flavor intensive." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starfruitpie" + food_reagents = list( + /datum/reagent/consumable/nutriment = 14, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("starfruit" = 1, "pie" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + slice_type = /obj/item/food/pieslice/starfruitpie + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/pieslice/starfruitpie + name = "starfruit pie slice" + desc = "Takes you on a journey though space!" + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starfruitpie_slice" + tastes = list("pie" = 1, "starfruit" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitcompote + name = "Starfruit Compote" + reqs = list( + /obj/item/food/grown/starfruit = 5, + /datum/reagent/consumable/sugar = 10, + /datum/reagent/consumable/ethanol/cognac = 10, + ) + result = /obj/item/food/starfruitcompote + category = CAT_MISCFOOD + +/obj/item/food/starfruitcompote + name = "starfruit compote" + desc = "An irresistibly sweet dish of starfruit boiled down in cognac and sugar." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "compote" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("starfruit" = 1, "sweet sugar" = 1, "cognac spice" = 1) + bite_consumption = 3 + foodtypes = FRUIT | SUGAR + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitbrulee + name = "Starfruit Creme Brulee" + reqs = list( + /datum/reagent/consumable/starfruit_juice = 10, + /datum/reagent/consumable/sugar = 10, + /datum/reagent/consumable/salt = 5, + /datum/reagent/consumable/eggyolk = 2, + /datum/reagent/consumable/eggwhite = 4, + ) + result = /obj/item/food/starfruitbrulee + category = CAT_MISCFOOD + +/obj/item/food/starfruitbrulee + name = "starfruit creme brulee" + desc = "A delightful pudding dish made from primarily caramel, starfruit, and egg whites." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "cremebrulee" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("starfruit" = 1, "caramel" = 1, "subtle cream" = 1) + foodtypes = FRUIT | SUGAR + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starcupcake + name = "Starfruit Cupcake" + reqs = list( + /obj/item/food/pastrybase = 1, + /obj/item/food/grown/starfruit = 2 + ) + result = /obj/item/food/starcupcake + category = CAT_PASTRY + +/obj/item/food/starcupcake + name = "starfruit cupcake" + desc = "A sweet cupcake with a starfruit frosting." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "cupcakestar" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("cake" = 3, "starfruit" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/book/manual/starfruit + name = "Starfruit preperation and you!" + icon = 'modular_nova/master_files/icons/obj/starfruitbook.dmi' + icon_state = "cookbook" + lefthand_file = 'modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi' + righthand_file = 'modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi' + starting_author = "Artic Deep Beverage Research Division" + starting_title = "Starfruit preperation and you!" + starting_content = {" + + + + + + +

Artic Starfruit Beverage Recipies:

+ +Starfruit Soda: Two parts starfruit juice, two parts rum, one part cognac, one part soda water
+ +Starfruit Lubricant: One part starfruit juice, one part synthanol
+ +Starlit Latte: One part starfruit juice, one part coffee
+ +Starbeam Shake: One part starfruit juice, one part vanilla dream, one part ice
+ +Forgotten Star: One part starfruit juice, one part creme de coconut, one part white russian, one part pineapple juice, one part bitters + +Astral Flame: One Part Starfruit juice, one part navy rum,one part lime juice,one part soda water, one part menthol + +Space Muse: One part starfruit juice, one part creme de menthe, one part vodka + + +"} diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index 2275667d34f..d1ac1391976 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -173,6 +173,10 @@ icon_state = "fish" color_src = USE_ONE_COLOR +/datum/sprite_accessory/ears/mutant/floppy + name = "Floppy" + icon_state = "floppy" + /datum/sprite_accessory/ears/mutant/vulpkanin/fox name = "Fox" icon_state = "fox" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm index 1b86771e909..eeea4204e80 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -140,6 +140,26 @@ name = "Broad Curls" icon_state = "broadcurls" +/datum/sprite_accessory/horns/antenna_fuzzball_v2 + name = "Fuzzball Antenna" + icon_state = "antenna_fuzzballv2" + color_src = USE_MATRIXED_COLORS + +/datum/sprite_accessory/horns/setaceous + name = "Setaceous Antenna" + icon_state = "setaceous" + color_src = USE_ONE_COLOR + +/datum/sprite_accessory/horns/setaceousm + name = "Medium Setaceous Antenna" + icon_state = "setaceousm" + color_src = USE_ONE_COLOR + +/datum/sprite_accessory/horns/geniculate + name = "Geniculate Antenna" + icon_state = "geniculate" + color_src = USE_ONE_COLOR + /datum/sprite_accessory/horns/moogle_pom icon = 'modular_nova/master_files/icons/mob/sprite_accessory/moogle_pom.dmi' color_src = USE_MATRIXED_COLORS diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm index daa3aa5c4b5..2c3321dec5a 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm @@ -232,6 +232,14 @@ name = "Scolipede" icon_state = "pede" +/datum/sprite_accessory/snouts/mammal/pig + name = "Porcine" + icon_state = "pig" + +/datum/sprite_accessory/snouts/mammal/pig/boar + name = "Porcine + Tusks" + icon_state = "boar" + /datum/sprite_accessory/snouts/mammal/sergal name = "Sergal" icon_state = "sergal" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm index 4bb4a3ad828..86f9ebba93b 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm @@ -198,3 +198,11 @@ /datum/sprite_accessory/taur/biglegs/stanced/bird name = "Big Legs, Stanced Bird" icon_state = "biglegs_bird_stanced" + +/datum/sprite_accessory/taur/biglegs/peg + name = "Big Legs, Pegs" + icon_state = "biglegs_peg" + +/datum/sprite_accessory/taur/biglegs/stanced/peg + name = "Big Legs, Stanced Pegs" + icon_state = "biglegs_peg_stanced" diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm index c68fb214206..d62606144e1 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm @@ -41,6 +41,8 @@ GLOBAL_LIST_EMPTY(customizable_races) /// Replacing organs with oversized versions, for the oversized quirk. Add implementation for species-specific oversized organs as needed /datum/species/proc/gain_oversized_organs(mob/living/carbon/human/human_holder, datum/quirk/oversized/oversized_quirk) + if(isnull(human_holder.loc)) + return // preview characters don't need funny organs, prevents a runtime var/obj/item/organ/internal/stomach/old_stomach = human_holder.get_organ_slot(ORGAN_SLOT_STOMACH) if(old_stomach?.is_oversized) // don't override augments that are already oversized. Need to do this because augments get applied first, so quirks will overwrite them. TODO: Maybe the augments middleware should be renamed so it gets applied last. return @@ -48,11 +50,11 @@ GLOBAL_LIST_EMPTY(customizable_races) var/obj/item/organ/internal/stomach/oversized/new_stomach = new //YOU LOOK HUGE, THAT MUST MEAN YOU HAVE HUGE GUTS! RIP AND TEAR YOUR HUGE GUTS! oversized_quirk.old_organs += list(old_stomach) - if(new_stomach.Insert(human_holder, special = TRUE)) - to_chat(human_holder, span_warning("You feel your massive stomach rumble!")) - if(old_stomach) - old_stomach.moveToNullspace() - STOP_PROCESSING(SSobj, old_stomach) + new_stomach.Insert(human_holder, special = TRUE) + to_chat(human_holder, span_warning("You feel your massive stomach rumble!")) + if(old_stomach) + old_stomach.moveToNullspace() + STOP_PROCESSING(SSobj, old_stomach) /datum/species/dullahan mutant_bodyparts = list() diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index cf8a562f3a9..b3bbee6e6fc 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -63,6 +63,9 @@ ) /datum/species/jelly/gain_oversized_organs(mob/living/carbon/human/human_holder, datum/quirk/oversized/oversized_quirk) + if(isnull(human_holder.loc)) + return // preview characters don't need funny organs, prevents a runtime + var/obj/item/organ/internal/brain/slime/oversized/new_slime_brain = new var/obj/item/organ/internal/stomach/slime/oversized/new_slime_stomach = new //YOU LOOK HUGE! THAT MUST MEAN YOU HAVE HUGE golgi apparatus! RIP AND TEAR YOUR HUGE golgi apparatus! @@ -76,20 +79,20 @@ // To prevent ghosting. We have to do this manually here because TG has replace_into() hardcoded to qdel the old brain no matter what and there is no way around it. old_brain.Remove(human_holder, special = TRUE, movement_flags = NO_ID_TRANSFER) - if(new_slime_brain.Insert(human_holder, special = TRUE, movement_flags = NO_ID_TRANSFER)) - to_chat(human_holder, span_warning("Your massive core pulses with bioelectricity!")) - if(old_brain) - old_brain.moveToNullspace() - STOP_PROCESSING(SSobj, old_brain) + new_slime_brain.Insert(human_holder, special = TRUE, movement_flags = NO_ID_TRANSFER) + to_chat(human_holder, span_warning("Your massive core pulses with bioelectricity!")) + if(old_brain) + old_brain.moveToNullspace() + STOP_PROCESSING(SSobj, old_brain) if(old_stomach.is_oversized) // don't override augments that are already oversized oversized_quirk.old_organs -= old_stomach qdel(new_slime_stomach) return - if(new_slime_stomach.Insert(human_holder, special = TRUE)) - to_chat(human_holder, span_warning("You feel your massive golgi apparatus squish!")) - if(old_stomach) - old_stomach.moveToNullspace() - STOP_PROCESSING(SSobj, old_stomach) + new_slime_stomach.Insert(human_holder, special = TRUE) + to_chat(human_holder, span_warning("You feel your massive golgi apparatus squish!")) + if(old_stomach) + old_stomach.moveToNullspace() + STOP_PROCESSING(SSobj, old_stomach) /obj/item/organ/internal/eyes/jelly name = "photosensitive eyespots" diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm index 39c13ddfb99..e9894a1d10d 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm @@ -28,6 +28,10 @@ name = "Fingerless Gloves" item_path = /obj/item/clothing/gloves/fingerless +/datum/loadout_item/gloves/lalune_long + name = "Designer Black Gloves" + item_path = /obj/item/clothing/gloves/lalune_long + /datum/loadout_item/gloves/black name = "Black Gloves" item_path = /obj/item/clothing/gloves/color/black diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm index 1648fdb8b97..84077209678 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -304,6 +304,10 @@ item_path = /obj/item/clothing/neck/security_cape/tarkon blacklisted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_CORRECTIONS_OFFICER) +/datum/loadout_item/neck/security_cape + name = "Security Cape" + item_path = /obj/item/clothing/neck/security_cape + /* * DONATOR */ diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm index 71c6f3dd6ff..ed848d61993 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -127,6 +127,10 @@ name = "Researcher's Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/nova/regular +/datum/loadout_item/suit/labcoat_lalunevest + name = "Designer Buttoned Coat" + item_path = /obj/item/clothing/suit/toggle/labcoat/nova/lalunevest + /datum/loadout_item/suit/labcoat_pharmacist name = "Pharmacist's Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 69f24fe4755..ecc6972e949 100644 --- a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -464,6 +464,10 @@ name = "Wedding Dress With Ribbon" item_path = /obj/item/clothing/under/dress/wedding_dress/ribbon +/datum/loadout_item/under/miscellaneous/giant_scarf + name = "Giant Scarf" + item_path = /obj/item/clothing/under/dress/nova/giant_scarf + /datum/loadout_item/under/miscellaneous/red_skirt name = "Red Bra and Skirt" item_path = /obj/item/clothing/under/dress/skirt/nova/red_skirt diff --git a/modular_nova/modules/modular_vending/code/clothesmate.dm b/modular_nova/modules/modular_vending/code/clothesmate.dm index 25d060c5acb..2f3e3c1aa17 100644 --- a/modular_nova/modules/modular_vending/code/clothesmate.dm +++ b/modular_nova/modules/modular_vending/code/clothesmate.dm @@ -90,6 +90,7 @@ /obj/item/clothing/under/suit/nova/helltaker/skirt = 3, /obj/item/clothing/under/dress/skirt/nova/medium = 5, /obj/item/clothing/under/dress/skirt/nova/long = 5, + /obj/item/clothing/under/dress/nova/giant_scarf = 5, ), ), @@ -182,6 +183,8 @@ /obj/item/clothing/suit/brownbattlecoat = 1, /obj/item/clothing/suit/blackfurrich = 1, /obj/item/clothing/suit/frenchtrench = 1, + /obj/item/clothing/suit/toggle/labcoat/nova/lalunevest = 2, + /obj/item/clothing/gloves/lalune_long = 2, ) contraband_nova = list( diff --git a/modular_nova/modules/synths/code/species/synthetic.dm b/modular_nova/modules/synths/code/species/synthetic.dm index b3328ee40ad..bc93911cdbd 100644 --- a/modular_nova/modules/synths/code/species/synthetic.dm +++ b/modular_nova/modules/synths/code/species/synthetic.dm @@ -161,6 +161,9 @@ UnregisterSignal(human, COMSIG_LIVING_DEATH) /datum/species/synthetic/gain_oversized_organs(mob/living/carbon/human/human_holder, datum/quirk/oversized/oversized_quirk) + if(isnull(human_holder.loc)) + return // preview characters don't need funny organs, prevents a runtime + var/obj/item/organ/internal/stomach/old_stomach = human_holder.get_organ_slot(ORGAN_SLOT_STOMACH) if(old_stomach.is_oversized) // don't override augments that are already oversized return @@ -169,11 +172,11 @@ oversized_quirk.old_organs += list(old_stomach) - if(new_synth_stomach.Insert(human_holder, special = TRUE)) - to_chat(human_holder, span_warning("You feel your massive engine rumble!")) - if(old_stomach) - old_stomach.moveToNullspace() - STOP_PROCESSING(SSobj, old_stomach) + new_synth_stomach.Insert(human_holder, special = TRUE) + to_chat(human_holder, span_warning("You feel your massive engine rumble!")) + if(old_stomach) + old_stomach.moveToNullspace() + STOP_PROCESSING(SSobj, old_stomach) /datum/species/synthetic/proc/on_emag_act(mob/living/carbon/human/source, mob/user) SIGNAL_HANDLER