From 5b581893387b0d9ff52237bd3faa0210f6d6d3c0 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 21 Mar 2026 14:13:47 -0400 Subject: [PATCH 1/2] you no take candle --- code/game/Rogue Star/_skills/skills.dm | 7 + code/game/Rogue Star/crafts/candle.dm | 18 + code/game/Rogue Star/crafts/cookpot.dm | 337 ++++++++++++++++++ code/modules/food/food/snacks/meat.dm | 5 +- .../kitchen/cooking_machines/_appliance.dm | 5 + code/modules/vore/eating/leave_remains_vr.dm | 82 ++--- icons/rogue-star/obj.dmi | Bin 0 -> 335 bytes vorestation.dme | 3 + 8 files changed, 416 insertions(+), 41 deletions(-) create mode 100644 code/game/Rogue Star/_skills/skills.dm create mode 100644 code/game/Rogue Star/crafts/candle.dm create mode 100644 code/game/Rogue Star/crafts/cookpot.dm create mode 100644 icons/rogue-star/obj.dmi diff --git a/code/game/Rogue Star/_skills/skills.dm b/code/game/Rogue Star/_skills/skills.dm new file mode 100644 index 00000000000..2f5f120d87a --- /dev/null +++ b/code/game/Rogue Star/_skills/skills.dm @@ -0,0 +1,7 @@ +//RS FILE +#define SKILL_COOKING "cooking" + +/mob/var/skill_pass = FALSE + +/mob/proc/skill_check(var/skill) + return skill_pass diff --git a/code/game/Rogue Star/crafts/candle.dm b/code/game/Rogue Star/crafts/candle.dm new file mode 100644 index 00000000000..1423baa3da8 --- /dev/null +++ b/code/game/Rogue Star/crafts/candle.dm @@ -0,0 +1,18 @@ +//RS FILE + +//Knife meat to separate fat +//Pot to render fat into tallow + +//Grass into fibers +//Fibers into string + +//Tallow into a cup +//String into cup + +/obj/item/fat + name = "fat" + desc = "Soft greasy animal fat!" + icon = 'icons/rogue-star/misc.dmi' + icon_state = "see" + drop_sound = 'sound/items/drop/flesh.ogg' + pickup_sound = 'sound/items/pickup/flesh.ogg' diff --git a/code/game/Rogue Star/crafts/cookpot.dm b/code/game/Rogue Star/crafts/cookpot.dm new file mode 100644 index 00000000000..27807217251 --- /dev/null +++ b/code/game/Rogue Star/crafts/cookpot.dm @@ -0,0 +1,337 @@ +//RS FILE +//The cookpot is intended to be a very simple object that can intuitively work with existing heating methods. +//The hope is that this can allow one to process certain materials, or to cook simple but effective meals, such as soups, stews, and chili. +//Food cooked with this will ideally use a relatively small number of ingredients to make several portions. +//Rather than making specific foods, foods made with the cooking pot will probably just be a reagent slurry that you drink or eat from a bowl with a spoon. +//Tastes randomly of the ingredients that went into it, decently filling, made to fill you up, not fancy. + +/obj/item/cookpot //We're having stew tonight + name = "cooking pot" + desc = "A sturdy pot made for cooking in!" + icon = 'icons/rogue-star/obj.dmi' + icon_state = "pot" + persist_storable = FALSE + center_of_mass = list("x" = 19,"y" = 8) + var/atom/cooksource + + var/top_heat = TRUE + +/obj/item/cookpot/Initialize() + . = ..() + reagents = new/datum/reagents(600,src) + +/obj/item/cookpot/examine(mob/user) + . = ..() + if(cooksource) + . += SPAN_NOTICE("It is being heated by \the [cooksource].") + if(contents.len == 0) + if(reagents.total_volume == 0) + . += SPAN_NOTICE("It is empty.") + return + + else if(contents.len == 1) + for(var/thing in src.contents) + . += SPAN_NOTICE("You can see \the [thing] inside.") + else + var/msg = "You can see " + var/iteration = 0 + for(var/thing in src.contents) + iteration ++ + if(iteration == contents.len) + msg += "and \the [thing] inside." + else + msg += "\the [thing], " + . += SPAN_NOTICE(msg) + + if(reagents.total_volume > 0) + var/percent_full = round((reagents.total_volume / reagents.maximum_volume) * 100,1) + if(user.skill_check(SKILL_COOKING)) + . += SPAN_OCCULT("It is [percent_full]% full.") + else + var/howmuch = "" + switch(percent_full) + if(100) + howmuch = "full" + if(90 to 99) + howmuch = "almost full" + if(61 to 89) + howmuch = "over half full" + if(40 to 60) + howmuch = "around half full" + if(26 to 39) + howmuch = "over a quarter full" + else + howmuch = "almost empty" + + . += SPAN_OCCULT("It appears to be [howmuch].") + var/liquid_percent = 0 + var/reagent_msg = "It seems to contain " + var/iteration = 0 + var/hits = 0 + for(var/datum/reagent/thing in reagents.reagent_list) + iteration ++ + if(thing.reagent_state == LIQUID) + liquid_percent += thing.volume + //RE-ENABLE THIS BEFORE YOU PR +// if(!(istype(thing,/datum/reagent/drink) || istype(thing,/datum/reagent/nutriment))) +// continue + hits ++ + var/round_num = round(thing.volume,1) + if(iteration == reagents.reagent_list.len) + if(hits > 1) + reagent_msg += "and [SPAN_OCCULT(round_num)] units of [SPAN_OCCULT(thing.name)]." + else + reagent_msg += "[SPAN_OCCULT(round_num)] units of [SPAN_OCCULT(thing.name)]." + else + reagent_msg += "[SPAN_OCCULT(round_num)] units of [SPAN_OCCULT(thing.name)], " + + if(iteration > 0) + liquid_percent = round((liquid_percent / reagents.total_volume) * 100,1) + if(user.skill_check(SKILL_COOKING)) + if(hits > 0) + . += SPAN_NOTICE(reagent_msg) + . += SPAN_NOTICE("It is comprised of [SPAN_OCCULT("[liquid_percent]%")] liquid.") + else + liquid_percent += rand(-10,10) + switch(liquid_percent) + if(100 to 110) + . += SPAN_NOTICE("It seems like it's only liquid...") + if(51 to 110) + . += SPAN_OCCULT("It's mostly liquid.") + if(35 to 50) + . += SPAN_OCCULT("It's pretty runny.") + if(16 to 34) + . += SPAN_OCCULT("It moves freely.") + if(5 to 15) + . += SPAN_OCCULT("It seems sticky.") + if(1 to 5) + . += SPAN_OCCULT("It seems very sticky.") + else + . += SPAN_DANGER("It seems rather dry.") + +/obj/item/cookpot/proc/functional() + if(!isturf(src.loc)) //If we're not on the ground then we're not cooking! + unregister_cooksource() + return FALSE + if(cooksource) //We have a cooksource, but we need to be on the same turf as it to work + if(loc == cooksource.loc) + if(is_cooksource_working()) + return TRUE + unregister_cooksource() //We have a cooksource but we're not on the same tile so our cooksource is no longer valid! + var/turf/T = get_turf(src) + for(var/thing in T.contents) //Let's check the turf to see if we can find a cooksource + if(is_cooksource_working(thing)) + register_cooksource(thing) + break + + if(cooksource) + return TRUE + return FALSE + +/obj/item/cookpot/proc/is_cooksource_working(var/atom/cooker) + if(!cooker) + if(!cooksource) + return FALSE + cooker = cooksource + if(istype(cooker,/obj/structure/bonfire)) + var/obj/structure/bonfire/B = cooker + if(B.burning) + return TRUE + if(istype(cooker,/obj/machinery/appliance/cooker/grill)) + var/obj/machinery/appliance/cooker/grill/G = cooker + if(!G.stat) + return TRUE + return FALSE + +/obj/item/cookpot/proc/cook() + if(dehydrate()) + new /obj/particle_emitter/smelly(src.loc) + process_reagents() + else + burn() + + var/atom/A + if(contents.len > 0) + A = pick(contents) + if(A) + if(istype(A,/obj/item/weapon/reagent_containers)) + A.reagents.trans_to_obj(src,temp_based_reagent_calc()) + if(A.reagents.total_volume == 0) + qdel(A) + new /obj/particle_emitter/smelly(src.loc) + + if(istype(A,/obj/item/weapon/bone) || istype(A,/obj/item/weapon/digestion_remains/organic)) + broth(A) + +/obj/item/cookpot/proc/dehydrate() + var/datum/reagent/water/W = reagents.get_reagent("water") + if(W?.volume > 0) + reagents.remove_reagent("water",1) + return TRUE + var/datum/reagent/nutriment/broth/B = reagents.get_reagent("broth") + if(B?.volume > 0) + reagents.remove_reagent("broth",0.1) + return TRUE + return FALSE + +/obj/item/cookpot/proc/burn() + var/datum/reagents/R = new /datum/reagents() + var/howmuch = 1 + if(high_heat()) + howmuch = 5 + howmuch = reagents.trans_to_holder(R,howmuch) + reagents.add_reagent("slop",howmuch * 0.1) + +/obj/item/cookpot/proc/broth(var/obj/item/bone) + var/datum/reagent/water/W = reagents.get_reagent("water") + if(!W) + return + var/howmuch = W.volume + if(howmuch > 20) + howmuch = 20 + reagents.remove_reagent("water",howmuch) + reagents.add_reagent("broth",howmuch / 4) + playsound(src,pick(list('sound/effects/bubbles.ogg','sound/effects/bubbles2.ogg')),50,1) + if(bone) + if(istype(bone,/obj/item/weapon/digestion_remains/organic)) + var/datum/reagent/B = reagents.get_reagent("broth") + B.player_sourced = TRUE + if(isnull(bone.health)) + if(istype(bone,/obj/item/weapon/bone)) + bone.health = -10 + else + bone.health = 0 + else + bone.health += rand(0,1) + if(prob(bone.health)) + playsound(src, "fracture", 50, 1) + qdel(bone) + new /obj/particle_emitter/smelly(src.loc) + reagents.add_reagent("calcium",rand(1,2)) + +/obj/item/cookpot/proc/process_reagents() + for(var/datum/reagent/R in reagents.reagent_list) + R.cookpot_interact() + +/obj/item/cookpot/proc/high_heat() + #warn REPLACE THE high_heat PROC + return top_heat + +/obj/item/cookpot/proc/register_cooksource(var/atom/oursource) + if(cooksource) + unregister_cooksource() + cooksource = oursource + RegisterSignal(cooksource, COMSIG_PARENT_QDELETING, PROC_REF(unregister_cooksource)) + START_PROCESSING(SSobj,src) + +/obj/item/cookpot/proc/unregister_cooksource() + if(cooksource) + UnregisterSignal(cooksource, COMSIG_PARENT_QDELETING) + cooksource = null + +/obj/item/cookpot/proc/temp_based_reagent_calc() + #warn REPLACE THE temp_based_reagent_calc PROC BEFORE YOU PR THIS DUMBASS + return 50 + +/obj/item/cookpot/Destroy() + unregister_cooksource() + . = ..() + +/obj/item/cookpot/process() + if(!functional()) + STOP_PROCESSING(SSobj,src) + return + cook() + +/obj/item/cookpot/attackby(obj/item/weapon/W, mob/user) + if(istype(W,/obj/item/fat) || istype(W,/obj/item/weapon/reagent_containers/food/snacks) || istype(W,/obj/item/weapon/bone) || istype(W,/obj/item/weapon/digestion_remains/organic)) + if(contents.len >= 6) + to_chat(user,SPAN_DANGER("It's too full just now, wait for whatever is inside to cook down, or remove things from it first.")) + return + user.remove_from_mob(W) + W.forceMove(src) + user.visible_message(SPAN_NOTICE("\The [user] adds \the [W] to \the [src]."),SPAN_NOTICE("You add \the [W] to \the [src]."),runemessage = "plonk") + return + if(istype(W,/obj/item/weapon/reagent_containers)) + var/obj/item/weapon/reagent_containers/R = W + var/howmuch = "some" + if(R.reagents.total_volume == 0) //If the container is empty, then you are probably trying to collect some yummers!!! + if(reagents.total_volume == 0) + to_chat(user,SPAN_DANGER("\The [src] is empty...")) + return + if(user.skill_check(SKILL_COOKING)) + if(reagents.total_volume < R.reagents.maximum_volume) + howmuch = reagents.total_volume + else + howmuch = R.reagents.maximum_volume + howmuch = "[howmuch] units" + user.visible_message(SPAN_NOTICE("\The [user] fills \the [R] from \the [src]."),SPAN_NOTICE("You fill your [R] with [howmuch] of \the [src]'s contents."),runemessage = "gloop") + reagents.trans_to_obj(R,R.reagents.maximum_volume) + return + //If the container is not empty, then we will pour its contents into the pot!!! Don't poison my stew please... + if(reagents.total_volume >= reagents.maximum_volume) + to_chat(user,SPAN_DANGER("It's too full just now, wait for whatever is inside to cook down, or remove things from it first.")) + return + if(user.skill_check(SKILL_COOKING)) + if(R.reagents.total_volume < R.amount_per_transfer_from_this) + howmuch = R.reagents.total_volume + else + howmuch = R.amount_per_transfer_from_this + howmuch = "[howmuch] units" + R.reagents.trans_to_obj(src,R.amount_per_transfer_from_this) + user.visible_message(SPAN_NOTICE("\The [user] pours something from \the [R] into \the [src]."),SPAN_NOTICE("You pour [howmuch] from \the [R] into \the [src]."),runemessage = "gloop") + + if(istype(W,/obj/item/weapon/holder/micro)) + var/obj/item/weapon/holder/micro/M = W + #warn FIGURE OUT WHAT TO DO WITH MICRO HOLDERS + +/obj/item/cookpot/resolve_attackby(atom/A, mob/user, attack_modifier, click_parameters) + . = ..() + + if(istype(A,/obj/machinery/appliance/cooker/grill) || istype(A,/obj/structure/bonfire)) + user.remove_from_mob(src) + forceMove(A.loc) + auto_align(src, click_parameters) + functional() + +/datum/cookpot_meal + var/list/flavors = list() + var/nutriment_total = 0 + +/datum/reagent/nutriment/broth + name = "broth" + id = "broth" + taste_description = "savory broth" + description = "A broth of water infused with some kind of meat, sometimes formed by boiling animal bones in your cooking!" + reagent_state = LIQUID + color = "#e0a15977" + + glass_name = "broth" + glass_desc = "It's like soup but without anything in it!" + cup_name = "broth" + cup_desc = "A steaming cup of savory goodness!" + + nutriment_factor = 5 + +/datum/reagent/carbon/slop + id = "slop" + taste_description = "bitter" + description = "The bitter, charred remains of something... " + color = "#222222ff" + taste_mult = 10 + +/datum/reagent + var/player_sourced = FALSE //If this reagent is made from or out of some part of a player's body. If true then maybe some preferences can happen + +/datum/reagent/proc/cookpot_interact() + return + +/datum/reagent/carbon/cookpot_interact() + for(var/datum/reagent/R in holder.reagent_list) + if(istype(R,/datum/reagent/carbon)) + continue + if(istype(R,/datum/reagent/nutriment) || istype(R,/datum/reagent/drink)) + continue + holder.remove_reagent(R.id,5) + break + holder.remove_reagent(src.id,rand(0,1)) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index f62ae02b677..f34e3bf616f 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -27,7 +27,10 @@ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) - to_chat(user, "You cut the meat into thin strips.") + new /obj/item/fat(src) //RS ADD START + if(prob(25)) + new /obj/item/fat(src) //RS ADD END + to_chat(user, "You cut the meat into thin strips and separate the fat.") //RS EDIT qdel(src) else ..() diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 45ad6920405..49e6b28b63d 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -140,6 +140,11 @@ attempt_toggle_power(usr) +/obj/machinery/appliance/AltClick(mob/user) //RS ADD START + . = ..() + if(.) + attempt_toggle_power(user) //RS ADD END + /obj/machinery/appliance/proc/attempt_toggle_power(mob/user) if (!isliving(user)) return diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index 7a7a3ac8a85..a411bd1e150 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -1,29 +1,29 @@ /datum/species - var/skull_type = /obj/item/weapon/digestion_remains/skull + var/skull_type = /obj/item/weapon/digestion_remains/organic/skull //RS EDIT /datum/species/tajaran - skull_type = /obj/item/weapon/digestion_remains/skull/tajaran + skull_type = /obj/item/weapon/digestion_remains/organic/skull/tajaran //RS EDIT /datum/species/unathi - skull_type = /obj/item/weapon/digestion_remains/skull/unathi + skull_type = /obj/item/weapon/digestion_remains/organic/skull/unathi //RS EDIT /datum/species/skrell - skull_type = /obj/item/weapon/digestion_remains/skull/skrell + skull_type = /obj/item/weapon/digestion_remains/organic/skull/skrell //RS EDIT /datum/species/spider - skull_type = /obj/item/weapon/digestion_remains/skull/vasilissan + skull_type = /obj/item/weapon/digestion_remains/organic/skull/vasilissan //RS EDIT /datum/species/akula - skull_type = /obj/item/weapon/digestion_remains/skull/akula + skull_type = /obj/item/weapon/digestion_remains/organic/skull/akula //RS EDIT /datum/species/harpy - skull_type = /obj/item/weapon/digestion_remains/skull/rapala + skull_type = /obj/item/weapon/digestion_remains/organic/skull/rapala //RS EDIT /datum/species/vulpkanin - skull_type = /obj/item/weapon/digestion_remains/skull/vulpkanin + skull_type = /obj/item/weapon/digestion_remains/organic/skull/vulpkanin //RS EDIT /datum/species/sergal - skull_type = /obj/item/weapon/digestion_remains/skull/sergal + skull_type = /obj/item/weapon/digestion_remains/organic/skull/sergal //RS EDIT /datum/species/hi_zorren - skull_type = /obj/item/weapon/digestion_remains/skull/zorren + skull_type = /obj/item/weapon/digestion_remains/organic/skull/zorren //RS EDIT /datum/species/nevrean - skull_type = /obj/item/weapon/digestion_remains/skull/nevrean + skull_type = /obj/item/weapon/digestion_remains/organic/skull/nevrean //RS EDIT /datum/species/teshari - skull_type = /obj/item/weapon/digestion_remains/skull/teshari + skull_type = /obj/item/weapon/digestion_remains/organic/skull/teshari //RS EDIT /datum/species/vox - skull_type = /obj/item/weapon/digestion_remains/skull/vox + skull_type = /obj/item/weapon/digestion_remains/organic/skull/vox //RS EDIT /obj/belly/proc/handle_remains_leaving(var/mob/living/M) if(!ishuman(M) && !isrobot(M)) //Are we even humanoid or a borg? @@ -50,14 +50,14 @@ return if(prob(20) && !H.isSynthetic()) //ribcage surviving whole is some luck //Edit: no robor - new /obj/item/weapon/digestion_remains/ribcage(src,owner) + new /obj/item/weapon/digestion_remains/organic/ribcage(src,owner) //RS EDIT bones_amount-- var/list/organic_bones = list( //Generic bone variation system - /obj/item/weapon/digestion_remains, - /obj/item/weapon/digestion_remains/variant1, - /obj/item/weapon/digestion_remains/variant2, - /obj/item/weapon/digestion_remains/variant3 + /obj/item/weapon/digestion_remains/organic, //RS EDIT START + /obj/item/weapon/digestion_remains/organic/variant1, + /obj/item/weapon/digestion_remains/organic/variant2, + /obj/item/weapon/digestion_remains/organic/variant3 //RS EDIT END ) var/list/synthetic_bones = list( /obj/item/weapon/digestion_remains/synth, @@ -79,12 +79,12 @@ if(skull_amount && H.species.selects_bodytype) // We still haven't found correct skull... if(H.species.base_species == SPECIES_HUMAN) - new /obj/item/weapon/digestion_remains/skull/unknown(src,owner) + new /obj/item/weapon/digestion_remains/organic/skull/unknown(src,owner) //RS EDIT else - new /obj/item/weapon/digestion_remains/skull/unknown/anthro(src,owner) + new /obj/item/weapon/digestion_remains/organic/skull/unknown/anthro(src,owner) //RS EDIT else if(skull_amount) // Something entirely different... - new /obj/item/weapon/digestion_remains/skull/unknown(src,owner) + new /obj/item/weapon/digestion_remains/organic/skull/unknown(src,owner) //RS EDIT /obj/item/weapon/digestion_remains @@ -101,6 +101,8 @@ var/pred_ckey var/pred_name +/obj/item/weapon/digestion_remains/organic + /obj/item/weapon/digestion_remains/synth name = "ruined component" desc = "A ruined component. It seems to have come from some sort of robotic entity, but there's no telling what kind." @@ -119,18 +121,18 @@ to_chat(user,"As you squeeze the [name], it crumbles into dust and falls apart into nothing!") qdel(src) -/obj/item/weapon/digestion_remains/ribcage +/obj/item/weapon/digestion_remains/organic/ribcage //RS EDIT name = "ribcage" desc = "A bleached ribcage. It's very white and definitely has seen better times. Hard to tell what it belonged to." icon_state = "ribcage" -/obj/item/weapon/digestion_remains/variant1 //Generic bone variations +/obj/item/weapon/digestion_remains/organic/variant1 //Generic bone variations //RS EDIT icon_state = "generic-2" -/obj/item/weapon/digestion_remains/variant2 +/obj/item/weapon/digestion_remains/organic/variant2 //RS EDIT icon_state = "generic-3" -/obj/item/weapon/digestion_remains/variant3 +/obj/item/weapon/digestion_remains/organic/variant3 //RS EDIT icon_state = "generic-4" /obj/item/weapon/digestion_remains/synth/variant1 //synthbones start @@ -142,62 +144,62 @@ /obj/item/weapon/digestion_remains/synth/variant3 icon_state = "synth-4" -/obj/item/weapon/digestion_remains/skull +/obj/item/weapon/digestion_remains/organic/skull //RS EDIT name = "skull" desc = "A bleached skull. It looks very weakened. Seems like it belonged to a human." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/tajaran +/obj/item/weapon/digestion_remains/organic/skull/tajaran //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a tajara." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/unathi +/obj/item/weapon/digestion_remains/organic/skull/unathi //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to an unathi." icon_state = "skull_unathi" -/obj/item/weapon/digestion_remains/skull/skrell +/obj/item/weapon/digestion_remains/organic/skull/skrell //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a skrell." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/vasilissan +/obj/item/weapon/digestion_remains/organic/skull/vasilissan //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vasilissan." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/akula +/obj/item/weapon/digestion_remains/organic/skull/akula //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to an akula." icon_state = "skull_unathi" -/obj/item/weapon/digestion_remains/skull/rapala +/obj/item/weapon/digestion_remains/organic/skull/rapala //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a rapala." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/vulpkanin +/obj/item/weapon/digestion_remains/organic/skull/vulpkanin //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vulpkanin." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/sergal +/obj/item/weapon/digestion_remains/organic/skull/sergal //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a sergal." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/zorren +/obj/item/weapon/digestion_remains/organic/skull/zorren //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a zorren." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/nevrean +/obj/item/weapon/digestion_remains/organic/skull/nevrean //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a nevrean." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/teshari +/obj/item/weapon/digestion_remains/organic/skull/teshari //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a teshari." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/vox +/obj/item/weapon/digestion_remains/organic/skull/vox //RS EDIT desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vox." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/unknown +/obj/item/weapon/digestion_remains/organic/skull/unknown //RS EDIT desc = "A bleached skull. It looks very weakened. You can't quite tell what species it belonged to." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/unknown/anthro +/obj/item/weapon/digestion_remains/organic/skull/unknown/anthro //RS EDIT icon_state = "skull_taj" diff --git a/icons/rogue-star/obj.dmi b/icons/rogue-star/obj.dmi new file mode 100644 index 0000000000000000000000000000000000000000..932f1c12d54cabf8bc2049e1ae7b9dfc2d74947a GIT binary patch literal 335 zcmV-V0kHmwP)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjODN%>?;vRDP=QLleuLXN0-N5AgR+L+ zSZaQ5NUXz1?8~7gNGvn46!V!{Pi?+MNN`Rp%Vz+>H3d$P#0h+fM3zl+5 zLI3~&p-DtRR9J=WmB9_bAP7aV=|&E~>N0>c*^6yW)9S~V&;y(W9`f@EDJ8Ou&9u7% zIDi8kIY=&enPDQ z0#|@WcLkLgowyhIO9w*@plY72VeSJC-~bK)IiZLI(2TEgJGq+%g hJDy>#0S7P#H~@%xGmXUu#aI9U002ovPDHLkV1lc{girtg literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 91a701dca4b..d6a839869b0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1673,8 +1673,11 @@ #include "code\game\Rogue Star\waddle.dm" #include "code\game\Rogue Star\_HELPERS\mobs.dm" #include "code\game\Rogue Star\_HELPERS\teleport.dm" +#include "code\game\Rogue Star\_skills\skills.dm" #include "code\game\Rogue Star\abilities\return.dm" #include "code\game\Rogue Star\catborgs\catborgs.dm" +#include "code\game\Rogue Star\crafts\candle.dm" +#include "code\game\Rogue Star\crafts\cookpot.dm" #include "code\game\Rogue Star\fluff\sari-outfit-fluff.dm" #include "code\game\Rogue Star\mob\seething.dm" #include "code\game\Rogue Star\obj\spookytrees.dm" From 402dc3b1a5c7542098d12e851da7daf5d0d0a3e9 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 21 Mar 2026 14:14:08 -0400 Subject: [PATCH 2/2] also this --- code/game/Rogue Star/crafts/cookpot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/Rogue Star/crafts/cookpot.dm b/code/game/Rogue Star/crafts/cookpot.dm index 27807217251..f865cdcac35 100644 --- a/code/game/Rogue Star/crafts/cookpot.dm +++ b/code/game/Rogue Star/crafts/cookpot.dm @@ -321,7 +321,7 @@ taste_mult = 10 /datum/reagent - var/player_sourced = FALSE //If this reagent is made from or out of some part of a player's body. If true then maybe some preferences can happen + var/player_sourced = FALSE //If this reagent is made from or out of any part of any player's body. If true then maybe some preferences can happen /datum/reagent/proc/cookpot_interact() return