From bc5cf818a41053f94a905d14e5a46c66dca5bd50 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 1 Oct 2023 14:03:24 -0500 Subject: [PATCH] lovely --- code/datums/components/crafting/recipes.dm | 2 +- code/game/objects/structures/flora.dm | 508 +++++++++--------- .../jobs/job_types/head_of_security.dm | 1 + 3 files changed, 255 insertions(+), 256 deletions(-) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index b029cc4b7c64..dfaa3d6480dc 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -1179,7 +1179,7 @@ category = CAT_PRIMAL /datum/crafting_recipe/distiller - name = "Wooden Barrel" + name = "Distiller" result = /obj/structure/fermenting_barrel/distiller reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /datum/reagent/srm_bacteria = 30) time = 50 diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index f2fdae18163b..efe2765b3854 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -525,6 +525,257 @@ . = ..() icon_state = "[initial(icon_state)][rand(1,3)]" +/obj/structure/flora/firebush + name = "flaming bush" + desc = "A bush being consumed by flames. Maybe it'll rise from its ashes like a phoenix?" + icon = 'icons/obj/flora/hellflora.dmi' + icon_state = "hell_bush" + density = FALSE + light_color = "#e08300" + light_power = 2 + light_range = 3 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/ausbushes/fullgrass/hell + name = "thick hellish grass" + desc = "A thick patch of grass tinted red." + icon = 'icons/obj/flora/hellflora.dmi' + light_range = 2 + light_power = 3 + resistance_flags = LAVA_PROOF + gender = PLURAL + +/obj/structure/flora/ausbushes/fullgrass/hell/Initialize() + . = ..() + icon_state = "fullgrass_[rand(1, 3)]" + light_color = pick("#e87800", "#780606") + +/obj/structure/flora/ausbushes/sparsegrass/hell + name = "sparse hellish grass" + desc = "A sparse patch of grass tinted red." + icon = 'icons/obj/flora/hellflora.dmi' + light_range = 2 + light_power = 3 + resistance_flags = LAVA_PROOF + gender = PLURAL + +/obj/structure/flora/ausbushes/sparsegrass/hell/Initialize() + . = ..() + icon_state = "sparsegrass_[rand(1, 3)]" + light_color = pick("#e87800", "#780606") + +/obj/structure/flora/ausbushes/grassybush/hell + name = "crimson bush" + desc = "A crimson bush, native to lava planets." + icon = 'icons/obj/flora/hellflora.dmi' + light_color = "#c70404" + light_range = 2 + light_power = 3 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/ausbushes/hell + name = "smouldering bush" + desc = "Some kind of orange plant that appears to be slowly burning." + icon = 'icons/obj/flora/hellflora.dmi' + light_range = 2 + light_power = 1 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/ausbushes/hell/Initialize() + . = ..() + if(icon_state == "firstbush_1") + icon_state = "firstbush_[rand(1, 4)]" + light_color = pick("#e87800", "#780606") + +/obj/structure/flora/ausbushes/fernybush/hell + name = "hellish fern" + desc = "Some kind of orange fern." + icon = 'icons/obj/flora/hellflora.dmi' + light_range = 2 + light_power = 1 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/ausbushes/fernybush/hell/Initialize() + . = ..() + icon_state = "fernybush_[rand(1, 3)]" + light_color = pick("#e87800", "#780606") + +/obj/structure/flora/ausbushes/genericbush/hell + name = "hellish bush" + desc = "A small crimson bush." + icon = 'icons/obj/flora/hellflora.dmi' + light_range = 2 + light_power = 2 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/ausbushes/genericbush/hell/Initialize() + . = ..() + icon_state = "genericbush_[rand(1, 4)]" + light_color = pick("#e87800", "#780606") + +/obj/structure/flora/ausbushes/ywflowers/hell + name = "lavablossom" + desc = "Some red and orange flowers. They appear to be faintly glowing." + icon = 'icons/obj/flora/hellflora.dmi' + light_color = "#aba507" + light_power = 3 + light_range = 2 + resistance_flags = LAVA_PROOF + gender = PLURAL + +/obj/structure/flora/rock/lava + name = "lavatic rock" + desc = "A volcanic rock. Lava is gushing from it. " + icon = 'icons/obj/flora/lavarocks.dmi' + icon_state = "basalt1" + base_icon_state = "basalt" + light_color = "#ab4907" + light_power = 3 + light_range = 2 + +/obj/structure/flora/rock/pile/lava + name = "rock shards" + desc = "Jagged shards of volcanic rock protuding from the ground." + icon = 'icons/obj/flora/lavarocks.dmi' + icon_state = "lavarocks1" + base_icon_state = "lavarocks" + gender = PLURAL + +/obj/structure/flora/rock/asteroid + name = "pebbles" + desc = "Some small pebbles, sheared off a larger rock." + icon_state = "asteroid0" + base_icon_state = "asteroid" + density = FALSE + gender = PLURAL + +/obj/structure/flora/rock/asteroid/Initialize() + . = ..() + icon_state = "[base_icon_state][rand(0,9)]" + +/obj/structure/flora/tree/dead/hell + name = "crimson tree" + desc = "A crimson tree with lava oozing from it, providing a slight glow." + icon = 'icons/obj/flora/lavatrees.dmi' + pixel_x = -16 + light_color = LIGHT_COLOR_BLOOD_MAGIC + light_range = 2 + light_power = 0.85 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/tree/dead_pine + name = "dead pine" + desc = "A dead pine tree, its leaves stripped away." + icon = 'icons/obj/flora/bigtrees.dmi' + icon_state = "med_pine_dead" + pixel_x = -16 + +/obj/structure/flora/tree/dead/tall + name = "dead tall tree" + desc = "The last vestiges of an once majestic tree." + icon = 'icons/obj/flora/tall_trees.dmi' + icon_state = "tree_1" + base_icon_state = "tree" + pixel_x = -16 + resistance_flags = LAVA_PROOF + +/obj/structure/flora/tree/dead/tall/Initialize() + . = ..() + icon_state = "[base_icon_state]_[rand(1,3)]" + +/obj/structure/flora/tree/dead/tall/grey + name = "petrified trunk" + desc = "An ancient tree was carbonized in fire and ash. Only a skeleton remains." + icon = 'icons/obj/flora/tall_trees_dead.dmi' + + +/obj/structure/flora/tree/cactus + name = "maguaro cactus" + desc = "A hardy species of modified Saguaro cacti, originating from the Sol system. Initially planted on Mars to help prevent soil erosion, it can now be found on frigid tundras across known space." + icon = 'icons/obj/flora/bigtrees.dmi' + icon_state = "cactus1" + density = TRUE + +/obj/structure/flora/tree/cactus/Initialize() + . = ..() + icon_state = "cactus[rand(1, 4)]" + +/obj/structure/flora/rock/hell + name = "rock" + desc = "A volcanic rock, one of the few familiar things on this planet." + icon_state = "basalt1" + base_icon_state = "basalt" + icon = 'icons/obj/flora/rocks.dmi' + +/obj/structure/flora/rock/beach + name = "sea stack" + desc = "A column of rock, formed by wave erosion." + icon_state = "basalt1" + base_icon_state = "basalt" + icon = 'icons/obj/flora/rocks.dmi' + +/obj/structure/flora/tree/dead/barren + name = "petrified tree" + desc = "An ancient trunk, mummified by the passage of time. This one still has some purple to it." + color = "#846996" + icon = 'icons/obj/flora/barren_tree.dmi' + icon_state = "barren_large" + +/obj/structure/flora/tree/dead/barren/Initialize() + . = ..() + color = pick( "#846996", "#7b4e99", "#924fab") + icon_state = "barren_large" + +/obj/structure/flora/driftwood + name = "driftwood" + desc = "Floatsam, jetsam, all molded down in the unforgiving sea." + icon = 'icons/obj/flora/grass-sticks.dmi' + icon_state = "stick2" + base_icon_state = "stick" + density = FALSE + +/obj/structure/flora/driftwood/Initialize() + . = ..() + icon_state = "[base_icon_state][rand(1, 4)]" + +/obj/structure/flora/driftlog + name = "driftwood log" + desc = "Better log this one in the database." + icon = 'icons/obj/flora/grass-sticks.dmi' + icon_state = "dry_log" + density = FALSE + +/obj/structure/flora/rock/rockplanet + name = "russet stone" + icon_state = "redrock1" + base_icon_state = "redrock" + desc = "A raised knurl of red rock." + mineResult = /obj/item/stack/ore/glass/rockplanet + +/obj/structure/flora/rock/pile/rockplanet + name = "russet stones" + desc = "A pile of rust-red rocks." + icon_state = "redrocks1" + base_icon_state = "redrocks" + mineResult = /obj/item/stack/ore/glass/rockplanet + +/obj/structure/flora/grass/rockplanet + name = "cottongrass" + desc= "A variety of cold-loving prarie grass. This variety seems to thrive the frigid rockworld enviroment, so long as water can be found nearby." + icon = 'icons/obj/flora/grass-sticks.dmi' + icon_state = "tall_grass_1" + base_icon_state = "tall_grass" + +/obj/structure/flora/grass/rockplanet/Initialize() + . = ..() + icon_state = "[base_icon_state]_[rand(1, 2)]" + +/obj/structure/flora/grass/rockplanet/dead + name = "dry cottongrass" + desc= "This patch seems to have run dry on life-giving water." + icon_state = "dry_grass_1" + base_icon_state = "dry_grass" + // Special tree used in chapel ship /obj/structure/flora/tree/chapel name = "sacred oak tree" @@ -720,6 +971,7 @@ mood_change = -6 timeout = 5 MINUTES +// Tree used in the SRM ships. /obj/structure/flora/tree/srm name = "Montagne's Oak" icon = 'icons/obj/flora/chapeltree.dmi' @@ -763,18 +1015,15 @@ /obj/structure/flora/tree/srm/Initialize() START_PROCESSING(SSobj, src) - create_reagents(300, DRAINABLE | OPENCONTAINER) + create_reagents(300, OPENCONTAINER & ~(DRAINABLE)) . = ..() /obj/structure/flora/tree/srm/process() if(world.time > (lastcycle + 100)) if(reagents.total_volume > 0) - visible_message("has reagent.") var/gainedhealth = 0 for(var/reagent in healthchems) - visible_message("for loop.") if(reagents.has_reagent(reagent, 1)) - visible_message("has healthchem.") gainedhealth += reagents.get_reagent_amount(reagent) * healthchems[reagent] health += gainedhealth reagents.remove_reagent(reagent, reagents.get_reagent_amount(reagent)) @@ -796,254 +1045,3 @@ T.air.adjust_moles(GAS_CO2, -amt) T.atmos_spawn_air("o2=[amt];TEMP=293.15") lastcycle = world.time - -/obj/structure/flora/firebush - name = "flaming bush" - desc = "A bush being consumed by flames. Maybe it'll rise from its ashes like a phoenix?" - icon = 'icons/obj/flora/hellflora.dmi' - icon_state = "hell_bush" - density = FALSE - light_color = "#e08300" - light_power = 2 - light_range = 3 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/ausbushes/fullgrass/hell - name = "thick hellish grass" - desc = "A thick patch of grass tinted red." - icon = 'icons/obj/flora/hellflora.dmi' - light_range = 2 - light_power = 3 - resistance_flags = LAVA_PROOF - gender = PLURAL - -/obj/structure/flora/ausbushes/fullgrass/hell/Initialize() - . = ..() - icon_state = "fullgrass_[rand(1, 3)]" - light_color = pick("#e87800", "#780606") - -/obj/structure/flora/ausbushes/sparsegrass/hell - name = "sparse hellish grass" - desc = "A sparse patch of grass tinted red." - icon = 'icons/obj/flora/hellflora.dmi' - light_range = 2 - light_power = 3 - resistance_flags = LAVA_PROOF - gender = PLURAL - -/obj/structure/flora/ausbushes/sparsegrass/hell/Initialize() - . = ..() - icon_state = "sparsegrass_[rand(1, 3)]" - light_color = pick("#e87800", "#780606") - -/obj/structure/flora/ausbushes/grassybush/hell - name = "crimson bush" - desc = "A crimson bush, native to lava planets." - icon = 'icons/obj/flora/hellflora.dmi' - light_color = "#c70404" - light_range = 2 - light_power = 3 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/ausbushes/hell - name = "smouldering bush" - desc = "Some kind of orange plant that appears to be slowly burning." - icon = 'icons/obj/flora/hellflora.dmi' - light_range = 2 - light_power = 1 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/ausbushes/hell/Initialize() - . = ..() - if(icon_state == "firstbush_1") - icon_state = "firstbush_[rand(1, 4)]" - light_color = pick("#e87800", "#780606") - -/obj/structure/flora/ausbushes/fernybush/hell - name = "hellish fern" - desc = "Some kind of orange fern." - icon = 'icons/obj/flora/hellflora.dmi' - light_range = 2 - light_power = 1 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/ausbushes/fernybush/hell/Initialize() - . = ..() - icon_state = "fernybush_[rand(1, 3)]" - light_color = pick("#e87800", "#780606") - -/obj/structure/flora/ausbushes/genericbush/hell - name = "hellish bush" - desc = "A small crimson bush." - icon = 'icons/obj/flora/hellflora.dmi' - light_range = 2 - light_power = 2 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/ausbushes/genericbush/hell/Initialize() - . = ..() - icon_state = "genericbush_[rand(1, 4)]" - light_color = pick("#e87800", "#780606") - -/obj/structure/flora/ausbushes/ywflowers/hell - name = "lavablossom" - desc = "Some red and orange flowers. They appear to be faintly glowing." - icon = 'icons/obj/flora/hellflora.dmi' - light_color = "#aba507" - light_power = 3 - light_range = 2 - resistance_flags = LAVA_PROOF - gender = PLURAL - -/obj/structure/flora/rock/lava - name = "lavatic rock" - desc = "A volcanic rock. Lava is gushing from it. " - icon = 'icons/obj/flora/lavarocks.dmi' - icon_state = "basalt1" - base_icon_state = "basalt" - light_color = "#ab4907" - light_power = 3 - light_range = 2 - -/obj/structure/flora/rock/pile/lava - name = "rock shards" - desc = "Jagged shards of volcanic rock protuding from the ground." - icon = 'icons/obj/flora/lavarocks.dmi' - icon_state = "lavarocks1" - base_icon_state = "lavarocks" - gender = PLURAL - -/obj/structure/flora/rock/asteroid - name = "pebbles" - desc = "Some small pebbles, sheared off a larger rock." - icon_state = "asteroid0" - base_icon_state = "asteroid" - density = FALSE - gender = PLURAL - -/obj/structure/flora/rock/asteroid/Initialize() - . = ..() - icon_state = "[base_icon_state][rand(0,9)]" - -/obj/structure/flora/tree/dead/hell - name = "crimson tree" - desc = "A crimson tree with lava oozing from it, providing a slight glow." - icon = 'icons/obj/flora/lavatrees.dmi' - pixel_x = -16 - light_color = LIGHT_COLOR_BLOOD_MAGIC - light_range = 2 - light_power = 0.85 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/tree/dead_pine - name = "dead pine" - desc = "A dead pine tree, its leaves stripped away." - icon = 'icons/obj/flora/bigtrees.dmi' - icon_state = "med_pine_dead" - pixel_x = -16 - -/obj/structure/flora/tree/dead/tall - name = "dead tall tree" - desc = "The last vestiges of an once majestic tree." - icon = 'icons/obj/flora/tall_trees.dmi' - icon_state = "tree_1" - base_icon_state = "tree" - pixel_x = -16 - resistance_flags = LAVA_PROOF - -/obj/structure/flora/tree/dead/tall/Initialize() - . = ..() - icon_state = "[base_icon_state]_[rand(1,3)]" - -/obj/structure/flora/tree/dead/tall/grey - name = "petrified trunk" - desc = "An ancient tree was carbonized in fire and ash. Only a skeleton remains." - icon = 'icons/obj/flora/tall_trees_dead.dmi' - - -/obj/structure/flora/tree/cactus - name = "maguaro cactus" - desc = "A hardy species of modified Saguaro cacti, originating from the Sol system. Initially planted on Mars to help prevent soil erosion, it can now be found on frigid tundras across known space." - icon = 'icons/obj/flora/bigtrees.dmi' - icon_state = "cactus1" - density = TRUE - -/obj/structure/flora/tree/cactus/Initialize() - . = ..() - icon_state = "cactus[rand(1, 4)]" - -/obj/structure/flora/rock/hell - name = "rock" - desc = "A volcanic rock, one of the few familiar things on this planet." - icon_state = "basalt1" - base_icon_state = "basalt" - icon = 'icons/obj/flora/rocks.dmi' - -/obj/structure/flora/rock/beach - name = "sea stack" - desc = "A column of rock, formed by wave erosion." - icon_state = "basalt1" - base_icon_state = "basalt" - icon = 'icons/obj/flora/rocks.dmi' - -/obj/structure/flora/tree/dead/barren - name = "petrified tree" - desc = "An ancient trunk, mummified by the passage of time. This one still has some purple to it." - color = "#846996" - icon = 'icons/obj/flora/barren_tree.dmi' - icon_state = "barren_large" - -/obj/structure/flora/tree/dead/barren/Initialize() - . = ..() - color = pick( "#846996", "#7b4e99", "#924fab") - icon_state = "barren_large" - -/obj/structure/flora/driftwood - name = "driftwood" - desc = "Floatsam, jetsam, all molded down in the unforgiving sea." - icon = 'icons/obj/flora/grass-sticks.dmi' - icon_state = "stick2" - base_icon_state = "stick" - density = FALSE - -/obj/structure/flora/driftwood/Initialize() - . = ..() - icon_state = "[base_icon_state][rand(1, 4)]" - -/obj/structure/flora/driftlog - name = "driftwood log" - desc = "Better log this one in the database." - icon = 'icons/obj/flora/grass-sticks.dmi' - icon_state = "dry_log" - density = FALSE - -/obj/structure/flora/rock/rockplanet - name = "russet stone" - icon_state = "redrock1" - base_icon_state = "redrock" - desc = "A raised knurl of red rock." - mineResult = /obj/item/stack/ore/glass/rockplanet - -/obj/structure/flora/rock/pile/rockplanet - name = "russet stones" - desc = "A pile of rust-red rocks." - icon_state = "redrocks1" - base_icon_state = "redrocks" - mineResult = /obj/item/stack/ore/glass/rockplanet - -/obj/structure/flora/grass/rockplanet - name = "cottongrass" - desc= "A variety of cold-loving prarie grass. This variety seems to thrive the frigid rockworld enviroment, so long as water can be found nearby." - icon = 'icons/obj/flora/grass-sticks.dmi' - icon_state = "tall_grass_1" - base_icon_state = "tall_grass" - -/obj/structure/flora/grass/rockplanet/Initialize() - . = ..() - icon_state = "[base_icon_state]_[rand(1, 2)]" - -/obj/structure/flora/grass/rockplanet/dead - name = "dry cottongrass" - desc= "This patch seems to have run dry on life-giving water." - icon_state = "dry_grass_1" - base_icon_state = "dry_grass" diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index e21a48ca42fd..d3d90a87603b 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -124,6 +124,7 @@ /datum/outfit/job/hos/roumain/post_equip(mob/living/carbon/human/H) H.faction |= list("roumain") + /datum/job/hos/roumain outfit = /datum/outfit/job/hos/roumain mind_traits = null