From 13220a4bed3fb282bb469cb3acdb8f5fa48a3841 Mon Sep 17 00:00:00 2001
From: CharlesWedge <52897649+CharlesWedge@users.noreply.github.com>
Date: Sun, 28 Jul 2024 13:07:11 -0500
Subject: [PATCH] Botany things (#6607)
## Adds Origins for Alraune and three new seed types.
The Alraune now have origins expanding on their colonies in line with
what already exists in the wiki. In total, they get four origins and a
new citizenship type. I also corrected some typos in the Krisitik
section. Three new seeds have also been added, Creeper Sphagnum produces
gunpowder (this is a surprise tool that will help me later), Ironwood
produces ironwood logs a superwood in low yields. Finally, fungiwheat is
a fungal alternative to regular wheat. All three seeds are obtainable
from cargo through not to represent that they are not standard issue
station plants. All three plants also have cataloguer data.
## Why It's Good For The Game
It adds further variety to botany, further background information for
Alraune characters, and a way to obtain the rare gunpowder reagent
outside of chemistry. As I plan on working on further recipes that
require the gunpowder reagent in the future, this addition will greatly
increase the accessibility of those recipes.
## Changelog
:cl:
add: Alraune Origins
add: Three new botany plants orderable from cargo.
fix: Some Krisitik origins spelling/grammar
/:cl:
---
citadel.dme | 3 +
code/__DEFINES/materials/misc.dm | 2 +
.../turfs/simulated/wall_types/wall_types.dm | 15 +++
code/modules/cargo/supplypacks/hydroponics.dm | 31 +++++++
code/modules/hydroponics/seed_datums.dm | 93 +++++++++++++++++++
code/modules/hydroponics/seed_packets.dm | 10 ++
.../lore_hardcoded/species/alraune/_base.dm | 1 +
.../species/alraune/citizenship.dm | 5 +
.../lore_hardcoded/species/alraune/origin.dm | 35 +++++++
.../species/krisitik/culture.dm | 8 +-
.../lore_hardcoded/species/krisitik/origin.dm | 12 +--
.../species/krisitik/religion.dm | 4 +-
.../materials/definitions/organic/wood/log.dm | 19 ++++
.../definitions/organic/wood/plank.dm | 20 ++++
code/modules/materials/fifty_spawner_mats.dm | 8 ++
code/modules/materials/material_sheets.dm | 39 ++++++++
16 files changed, 293 insertions(+), 12 deletions(-)
create mode 100644 code/modules/lore_hardcoded/species/alraune/_base.dm
create mode 100644 code/modules/lore_hardcoded/species/alraune/citizenship.dm
create mode 100644 code/modules/lore_hardcoded/species/alraune/origin.dm
diff --git a/citadel.dme b/citadel.dme
index 6080ab99413..b040dbb7d3b 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -3139,6 +3139,9 @@
#include "code\modules\lore_hardcoded\religion\hegemony\unathi.dm"
#include "code\modules\lore_hardcoded\species\auril.dm"
#include "code\modules\lore_hardcoded\species\species.dm"
+#include "code\modules\lore_hardcoded\species\alraune\_base.dm"
+#include "code\modules\lore_hardcoded\species\alraune\citizenship.dm"
+#include "code\modules\lore_hardcoded\species\alraune\origin.dm"
#include "code\modules\lore_hardcoded\species\krisitik\_base.dm"
#include "code\modules\lore_hardcoded\species\krisitik\citizenship.dm"
#include "code\modules\lore_hardcoded\species\krisitik\culture.dm"
diff --git a/code/__DEFINES/materials/misc.dm b/code/__DEFINES/materials/misc.dm
index 8b5eb95e89a..ee896691bdb 100644
--- a/code/__DEFINES/materials/misc.dm
+++ b/code/__DEFINES/materials/misc.dm
@@ -16,6 +16,8 @@
#define MAT_HARDWOOD "hardwood"
#define MAT_HEMATITE "hematite"
#define MAT_IRON "iron"
+#define MAT_IRONLOG "ironwood log"
+#define MAT_IRONWOOD "ironwood"
#define MAT_LEAD "lead"
#define MAT_LEATHER "leather"
#define MAT_LOG "log"
diff --git a/code/game/turfs/simulated/wall_types/wall_types.dm b/code/game/turfs/simulated/wall_types/wall_types.dm
index f70ae755cb3..5e149f37237 100644
--- a/code/game/turfs/simulated/wall_types/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types/wall_types.dm
@@ -250,6 +250,13 @@
material_reinf = null
material_girder = /datum/material/wood_plank/hardwood
+/turf/simulated/wall/wood/ironwood
+ color = "#666666"
+
+ material_outer = /datum/material/wood_plank/ironwood
+ material_reinf = null
+ material_girder = /datum/material/wood_plank/ironwood
+
/turf/simulated/wall/log
icon = 'icons/turf/walls/log.dmi'
color = "#9c5930"
@@ -266,6 +273,14 @@
material_reinf = null
material_girder = /datum/material/wood_log/sif
+/turf/simulated/wall/log_ironwood
+ icon = 'icons/turf/walls/log.dmi'
+ color = "#5C5454"
+
+ material_outer = /datum/material/wood_log/ironwood
+ material_reinf = null
+ material_girder = /datum/material/wood_log/ironwood
+
// TODO: Nuke. @Zandario
// Shuttle Walls
/turf/simulated/shuttle/wall
diff --git a/code/modules/cargo/supplypacks/hydroponics.dm b/code/modules/cargo/supplypacks/hydroponics.dm
index 61b7d0fd246..f531c2e8d47 100644
--- a/code/modules/cargo/supplypacks/hydroponics.dm
+++ b/code/modules/cargo/supplypacks/hydroponics.dm
@@ -244,3 +244,34 @@
container_type = /obj/structure/largecrate/animal/furnacegrub
container_name = "Furnace Grub crate"
access = ACCESS_GENERAL_BOTANY
+
+/datum/supply_pack/hydro/ironwood
+ name = "Ironwood Saplings"
+ contains = list(
+ /obj/item/seeds/ironwood = 6
+ )
+ cost = 25
+ container_type = /obj/structure/closet/crate/hydroponics
+ container_name = "Ironwood Sapling Samples"
+ access = ACCESS_GENERAL_BOTANY
+
+/datum/supply_pack/hydro/creeper
+ name = "Creeper Sanghum"
+ contains = list(
+ /obj/item/seeds/creepermoss = 6
+ )
+ cost = 25
+ container_type = /obj/structure/closet/crate/hydroponics
+ container_name = "Creeper Sanghum Seeds"
+ access = ACCESS_GENERAL_BOTANY
+
+/datum/supply_pack/hydro/fungiwheat
+ name = "Fungiwheat"
+ contains = list(
+ /obj/item/seeds/fungiwheat = 6
+ )
+ cost = 25
+ container_type = /obj/structure/closet/crate/hydroponics
+ container_name = "Fungiwheat Spores"
+ access = ACCESS_GENERAL_BOTANY
+
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index f1d8aec35cd..d25c9310898 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -1791,3 +1791,96 @@
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.1)
set_trait(TRAIT_WATER_CONSUMPTION, 0.1)
+
+//Exotic Seeds and Stuff
+
+/datum/seed/mushroom/fungiwheat
+ name = "fungiwheat"
+ seed_name = "black fungi-wheat spores"
+ display_name = "fungi-wheat stalks"
+ kitchen_tag = "wheat"
+ chems = list("nutriment" = list(1,25), "flour" = list(15,15))
+ catalog_data_grown = list(/datum/category_item/catalogue/flora/fungiwheat)
+
+/datum/seed/mushroom/fungiwheat/New()
+ ..()
+ set_trait(TRAIT_IMMUTABLE,1)
+ set_trait(TRAIT_MATURATION,8)
+ set_trait(TRAIT_YIELD,4)
+ set_trait(TRAIT_POTENCY,0)
+ set_trait(TRAIT_PEST_TOLERANCE,8)
+ set_trait(TRAIT_PRODUCT_ICON,"wheat")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#2e2f32")
+ set_trait(TRAIT_PLANT_COLOUR,"#2e2f32")
+ set_trait(TRAIT_PLANT_ICON,"stalk2")
+
+
+/datum/category_item/catalogue/flora/fungiwheat
+ name = "Flora - Black Fungiwheat"
+ desc = "A genetically engineered fungus created by the Department of Genetics Research on the Krisitik homeworld of Murith. It is a staple crop for the \
+ subterranean Krisitik and its coarse fungal flour is mold and pest resistant, dramatically increasing the shelf life of its products. \
+ The specific breeds of fungus used by the Krisitik are 'copyrighted' by the Department of Genetics Research and are grown exclusively \
+ at their hydroponic facilities however, recently lesser breeds of the fungus have been licensed to the wider galaxy as trade relations \
+ with the Krisitik improve."
+ value = CATALOGUER_REWARD_TRIVIAL
+
+/datum/seed/ironwood
+ name = "ironwood"
+ seed_name = "ironwood sapling"
+ display_name = "ironwood bonsai"
+ chems = list("woodpulp" = list(1,20))
+ has_item_product = /obj/item/stack/material/log/ironwood
+ catalog_data_grown = list(/datum/category_item/catalogue/flora/ironwood)
+
+/datum/seed/ironwood/New()
+ ..()
+ set_trait(TRAIT_IMMUTABLE,1)
+ set_trait(TRAIT_MATURATION,15)
+ set_trait(TRAIT_PRODUCTION,5)
+ set_trait(TRAIT_YIELD,3)
+ set_trait(TRAIT_POTENCY,20)
+ set_trait(TRAIT_WATER_CONSUMPTION,3)
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION,3)
+ set_trait(TRAIT_PRODUCT_ICON,"mushroom7")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#5C5454")
+ set_trait(TRAIT_PLANT_COLOUR,"#666666")
+ set_trait(TRAIT_PLANT_ICON,"mushroom8")
+
+/datum/category_item/catalogue/flora/ironwood
+ name = "Flora - Ironwood Bonsais"
+ desc = "The Ironwood tree is a type of tree native to the Alraune homeworld of Loam whose wood is known to be exceptionally strong rivalling many metals in terms \
+ of durability. The intense amount of nutrients Ironwood Trees consume and their slow overall growth has prevented widescale adoption by the galaxy as a building material \
+ though it remains popular among the Alraune who see it as far more ethical then traditional steel. This miniature Ironwood tree was specifically bred by the Alraune \
+ to create an ironwood tree capable of growing in hydroponics trays, resulting in a 'Ironwood Bonsai'. Despite small yields it still provides more than enough material to \
+ use in ironwood crafts."
+ value = CATALOGUER_REWARD_TRIVIAL
+
+/datum/seed/creepermoss
+ name = "creepermoss"
+ seed_name = "creeper sphagnum"
+ display_name = "creeper sphagnum"
+ chems = list("nutriment" = list(2,10), "gunpowder" = list(2,6))
+ catalog_data_grown = list(/datum/category_item/catalogue/flora/creepermoss)
+
+/datum/seed/creepermoss/New()
+ ..()
+ set_trait(TRAIT_HARVEST_REPEAT,1)
+ set_trait(TRAIT_MATURATION,6)
+ set_trait(TRAIT_PRODUCTION,6)
+ set_trait(TRAIT_YIELD,4)
+ set_trait(TRAIT_POTENCY,10)
+ set_trait(TRAIT_STINGS,1)
+ set_trait(TRAIT_PLANT_ICON,"bush5")
+ set_trait(TRAIT_PRODUCT_ICON,"nettles")
+ set_trait(TRAIT_PLANT_COLOUR,"#26d443")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#26d443")
+
+/datum/category_item/catalogue/flora/creepermoss
+ name = "Flora - Creeper Sphagnum"
+ desc = "Creeper Sphagnum was developed by a long bankrupt genetics research company in attempts to create 'growable gunpowder'. Using sphagnum moss as base the \
+ experiment failed being unable to produce a gunpowder fit for modern cartridges. The company shortly after filed for bankruptcy and for a while it was thought \
+ the 'Creeper Sphagnum' would just become another failed genetic template to be archived for eternity. Years after the company closed PMCs and Orion Naval patrols began \
+ to find a mysterious new 'gunpowder moss' growing in pirate vessels and hideouts. It did not take long to link the new moss to the now bankrupt company but how \
+ the moss fell into pirate hands remains a mystery to this day. What is certain though is that Creeper Sphagnum is now grown across the frontier whether to make ammo \
+ for a Frontiersman's primitive homemade firearm or for explosives used in pirate raids."
+ value = CATALOGUER_REWARD_TRIVIAL
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 0b3b4c77d47..0f6c3c6ae84 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -362,3 +362,13 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
/obj/item/seeds/ashlander/pokalea
seed_type = "pokalea"
+
+//Alien Plants
+/obj/item/seeds/fungiwheat
+ seed_type = "fungiwheat"
+
+/obj/item/seeds/ironwood
+ seed_type = "ironwood"
+
+/obj/item/seeds/creepermoss
+ seed_type = "creepermoss"
diff --git a/code/modules/lore_hardcoded/species/alraune/_base.dm b/code/modules/lore_hardcoded/species/alraune/_base.dm
new file mode 100644
index 00000000000..cc3e623e97f
--- /dev/null
+++ b/code/modules/lore_hardcoded/species/alraune/_base.dm
@@ -0,0 +1 @@
+SPECIES_LOCKED_BACKGROUND_ROOTS_SINGLE(alraune, /datum/species/alraune, "Species - Alraune")
diff --git a/code/modules/lore_hardcoded/species/alraune/citizenship.dm b/code/modules/lore_hardcoded/species/alraune/citizenship.dm
new file mode 100644
index 00000000000..8ca2405a49a
--- /dev/null
+++ b/code/modules/lore_hardcoded/species/alraune/citizenship.dm
@@ -0,0 +1,5 @@
+/datum/lore/character_background/citizenship/species/alraune/garden
+ name = "Garden of Majesty"
+ id = "citizenship_alraune_garden"
+ desc = "The Garden of Majesty is officially the 'nation' of the Alraune. Composed of their homeworld of Loam, the Lesser Gardens, and other Alraune colonies, the Garden of Majesty \
+ hopes to recreate the natural paradise present on Loam across the stars. It is ruled by the Gaia Blooms, the eldest of Alraune who maintain absolute rule over their paradise worlds."
diff --git a/code/modules/lore_hardcoded/species/alraune/origin.dm b/code/modules/lore_hardcoded/species/alraune/origin.dm
new file mode 100644
index 00000000000..454dc5e5063
--- /dev/null
+++ b/code/modules/lore_hardcoded/species/alraune/origin.dm
@@ -0,0 +1,35 @@
+/datum/lore/character_background/origin/species/alraune/loam
+ name = "Loam"
+ id = "origin_alraune_loam"
+ desc = "Loam is the homeworld of the Alraune. It is a planet spanning natural paradise where flora and fauna from all corners of the galaxy exist in perfect harmony \
+ thanks to the tireless efforts of the Alraune and their followers. No polluting industy is allowed on the surface however signifcant industry exists in orbit to support the \
+ Alraune's quest to build a galaxy spanning garden. Countless fantastical plants are native to Loam including Ambrosia, Ironwood Trees, and Mono-leaf. The unique flora \
+ allows for all the comforts and conviences of living an post industrial society while living in a endlessly bountiful natural paradise. Loam is frequented by tourists of other \
+ species, some of which have become permanent residents. These permanent tourists along with in the presence of various diplomatic missions on the planet make Loam the most \
+ diverse Alraune garden world."
+
+/datum/lore/character_background/origin/species/alraune/carnegiea
+ name = "Carnegiea"
+ id = "origin_alraune_canegiea"
+ desc = "The desert planet dubbed by the Alraune Carnegiea, was the first colony of the Alraune. Originally troubled due to its lack of water, the Alraune quickly adapted both \
+ their own bodies and the plants they brought to both be highly water effecient and to draw sustainably from the ground water far beneath the planet's surface. Now Carnegiea, \
+ originally resembling a sandy marble from orbit, is pocketed with spots of green as the countless lush desert gardens of the Alraune bring life to the once barren desert. \
+ The sarcity of water on the planet has made the Alraune of Carnegeia quite conservative in nature prefering not overexert themselves to mentally or phsycially 'waste good water'."
+
+/datum/lore/character_background/origin/species/alraune/chamerion
+ name = "Chamerion"
+ id = "origin_alraune_chamerion"
+ desc = "Originally a world whose planet spanning steep mountains made it near unlivable, Chamerion is now green and lush everywhere below the timberline. Thanks to the Alraune \
+ even the rocky sides of mountains are covered in the blooms of countless colorful flowers. The vallies beneath the mountains are so isolated by the mountain they are almost \
+ natural biodomes and the Alraune that inhabit each make sure to keep each valley in perfect balance. Not all life on Chamerion is welcome by the Alraune though, native to the \
+ caves of the planet is the 'Chamerion Blight', the Ouranos (or Uranus) Mushroom. Ouranos spores on Alraune as a parasitic infection driving the Alraune slowly mad and compelling \
+ it to spread the parasite to other plants and Alraune. Only treatable in early stages of infection, Ouranos infestations are destroyed with extreme malice wherever they are found \
+ even it means killing infected Alraune. The result is that Chamerion Alraune are a cautious and vigilant people unafraid of 'purging parasites' when necessary."
+
+/datum/lore/character_background/origin/species/alraune/pyrola
+ name = "Pyrola"
+ id = "origin_alraune_pyrola"
+ desc = "A cold planet, Pyrola's prospects as a colony for the Alraune seemed dim during intial colonization efforts. However, the planet's axial tilt meant the short summers \
+ of the planet had many hours of sunlight. Alraune quickly adapted trees and planets that took advantage of the long summer days while constructing greenhouses for the winter \
+ months. Now no matter the time of year there is somewhere on Pyrola where the surface where there is life and where there isn't. the greenhouses ensure there is something \
+ still growing. The Alraune of Pyrola are known to be able to stay awake for days on end and to be able to hibernate for just as long afterword."
diff --git a/code/modules/lore_hardcoded/species/krisitik/culture.dm b/code/modules/lore_hardcoded/species/krisitik/culture.dm
index 32b2472f11d..9917e33e30a 100644
--- a/code/modules/lore_hardcoded/species/krisitik/culture.dm
+++ b/code/modules/lore_hardcoded/species/krisitik/culture.dm
@@ -3,7 +3,7 @@
id = "culture_krisitik_hive"
desc = "Hailing from the densely packed cities of Murith. Hivers live a life constantly surrounded by others. Within hives, space is exspensive, and competition for \
jobs is stiff. In order to make it in these cities Hivers have learned to take advantage of every leg up they have on their competition and aren't above resorting to underhanded tactics \
- to ensure they get ahead of their peers. Unemployment is high and even with welfare the conditions often lead many to resort to crime to try and claw for any scrap of the good life the \
+ to ensure they get ahead of their peers. Unemployment is high and, even with welfare, the conditions lead many to resort to crime to try and claw for any scrap of the good life the \
can manage."
/datum/lore/character_background/culture/species/krisitik/clan
@@ -19,16 +19,16 @@
/datum/lore/character_background/culture/species/krisitik/space
name = "Spacers"
id = "culture_krisitik_space"
- desc = "Spacers come from one of three walks of life. Oldshippers who hail from colony ship turned trade caravans that were the Krisitik's earliest attempts at interstellar colonization. \
+ desc = "Spacers come from one of three walks of life. Oldshippers, who hail from the colony ships turned trade caravans that were the Krisitik's earliest attempts at interstellar colonization. \
Colonists, from asteroid outposts and small moons, and finally, the countless crews of supply ships and passenger transports running back and forth between Krisitik worlds. Spending most \
of their lives contending with the same problem as human spacers these Krisitik have become adept at existing in enviroments where atmospheric pressure and gravity are not guaranteed. \
- Most of this group has been united by the Murith League of Teamsters whose network of independ starship operators keeps the isolated asteroid bases supplied and the supply ships busy with \
+ Most of this group has been united by the Murith League of Teamsters whose network of independent starship operators keeps the isolated asteroid bases supplied and the supply ships busy with \
work. "
/datum/lore/character_background/culture/species/krisitik/colonial
name = "Colonials"
id = "culture_krisitik_colonial"
- desc = "Colonials are Krisitik native too the Colonies of the United Bureaus. Either selected for their skills or a lucky winner of a emigration lottery Colonials, have \
+ desc = "Colonials are Krisitik native to the Colonies of the United Bureaus. Either selected for their skills or a lucky winner of a emigration lottery, Colonials have \
left Murith behind for a better life on the colonies. Away from the stress of Murith's dense overcrowded cities, the Colonials are much more mellow then their homeworld \
cousins. They also have far more familar with the wider galaxy then the Krisitik of Murith with megacorporate products being much more common on Krisitik colonies then \
their homeworld."
diff --git a/code/modules/lore_hardcoded/species/krisitik/origin.dm b/code/modules/lore_hardcoded/species/krisitik/origin.dm
index fdb70a20144..a1da10beea2 100644
--- a/code/modules/lore_hardcoded/species/krisitik/origin.dm
+++ b/code/modules/lore_hardcoded/species/krisitik/origin.dm
@@ -1,17 +1,17 @@
/datum/lore/character_background/origin/species/krisitik/murith
name = "Murith"
id = "origin_krisitik_murirth"
- desc = "Murith is the homeworld of the Krisitik race. Its surface has been rendered uninhabitable by an unremembered calamity a millenia ago forcing the Krisitik underground. \
- Today it is a planet of endless underground tunnels ranging from underground metropolises to countless caves overgrown by genetically engineered fungus. Home to the vast majority \
- of the Krisitik species it faces mass emigration, encouraged by the United Bureaus, as its citizens seek to escape the poverty, crowding and crime endemic to its cities."
+ desc = "Murith is the homeworld of the Krisitik race. Its surface has been rendered uninhabitable by an unremembered calamity a millenia ago which forced the Krisitik underground. \
+ Today it is a planet of endless underground tunnels , subterranian metropolises and countless caves overgrown by genetically engineered fungus. Home to the vast majority \
+ of the Krisitik species, it faces mass emigration, encouraged by the United Bureaus, as its citizens seek to escape the poverty, crowding and crime endemic to its cities."
/datum/lore/character_background/origin/species/krisitik/spacer
name = "Oldship Spacer"
id = "origin_krisitik_spacer"
- desc = "The 'Oldships' are the remnants of the Krisitik's early attempt at interstellar colonization. Lacking cryostasis technology the Krisitik's earliest colony ships were massive \
+ desc = "The 'Oldships' are the remnants of the Krisitik's early attempts at interstellar colonization. Lacking cryostasis technology the Krisitik's earliest colony ships were massive \
self suffcient vessels equipped to last decades searching for worlds to set up new hidden colonies in. When imported FTL drives made these older vessels obsolete instead of scrapping \
- them they were refitted into spaceborne colonies of their own. Over the years the vessels have recieved countless upgrade and added on countless modules from many different species \
- meaning no two are alike. Krisitik from these vessels also have more experience with aliens then the rest of their skin owing the mission of their home ships."
+ them they were refitted into spaceborne colonies of their own. Over the years the vessels have recieved countless upgrades and added on countless modules from many different species \
+ meaning no two are alike. Krisitik from these vessels also have more experience with aliens than the rest of their kin owing the mission of their home ships."
/datum/lore/character_background/origin/species/krisitik/colonist
name = "Colonist"
diff --git a/code/modules/lore_hardcoded/species/krisitik/religion.dm b/code/modules/lore_hardcoded/species/krisitik/religion.dm
index b21f6e143af..630bcc8356f 100644
--- a/code/modules/lore_hardcoded/species/krisitik/religion.dm
+++ b/code/modules/lore_hardcoded/species/krisitik/religion.dm
@@ -5,7 +5,7 @@
desc = "Ruinism, whose followers are called Ruinists, worship the concept of cosmic. Its sole god, Ruin, is a personification of enthrophy itself \
the eventual end of everything. Ruinists believe it is the sacred mission of the Krisitik to survive to the end of time and witness the heat death of the universe in order \
to meet their god. As part of this belief the Ruinists are most concerned with the survival of the species and have been great sponsors of instellar colonization in order to help \
- ensure the sruvival of said species. Though only about a quarter of Krisitik are Ruinists their communities are found throughout their space often times further \
+ ensure the sruvival of said species. Though only about a quarter of Krisitik are Ruinists their communities are found throughout their space, often times further \
beyond what is officially considered Krisitik space."
/datum/lore/character_background/religion/krisitik_precursor
@@ -22,7 +22,7 @@
name = "Fission Cults"
id = "religion_krisitik_fission"
category = "Krisitik"
- desc = "Fission Cults are offshoot of Ruinism that is considered heretical and dangerous by their roots. The Fission cults do not worship nuclear jission rather they see jission, the splitting \
+ desc = "Fission Cults are offshoot of Ruinism that is considered heretical and dangerous by their roots. The Fission cults do not worship nuclear fission rather they see fission, the splitting \
of atoms, and the subsequent release of energy as a metaphor for how life should be lived. Radioactive particles may release a lot of energy over a long period of time as it \
undergoes natural radioactive decay however, fission can induce the split all at once. Similarly, Fission Cults believe that life should be lived 'releasing all its energy at once'. \
In practice this means Fission Cults believe in extreme hedonism, using drugs, sex, music, and extreme sports to live wild lives but short lives. Extreme Fission Cultists are known \
diff --git a/code/modules/materials/definitions/organic/wood/log.dm b/code/modules/materials/definitions/organic/wood/log.dm
index a16c65b515d..bdfda193753 100644
--- a/code/modules/materials/definitions/organic/wood/log.dm
+++ b/code/modules/materials/definitions/organic/wood/log.dm
@@ -55,3 +55,22 @@
name = MAT_HARDLOG
icon_colour = "#6f432a"
stack_type = /obj/item/stack/material/log/hard
+
+/datum/material/wood_log/ironwood
+ id = "log_ironwood"
+ name = MAT_IRONLOG
+ icon_colour = "#5C5454"
+ sheet_singular_name = "log"
+ stack_type = /obj/item/stack/material/log/ironwood
+
+ relative_integrity = 0.9
+ weight_multiplier = 0.8
+ density = 8 * 0.8
+ relative_conductivity = 0.1
+ relative_permeability = 0.05
+ relative_reactivity = 1 //Not quite as reactive as regular wood
+ hardness = MATERIAL_RESISTANCE_MODERATE
+ toughness = MATERIAL_RESISTANCE_HIGH
+ refraction = MATERIAL_RESISTANCE_NONE
+ absorption = MATERIAL_RESISTANCE_MODERATE
+ nullification = MATERIAL_RESISTANCE_NONE
diff --git a/code/modules/materials/definitions/organic/wood/plank.dm b/code/modules/materials/definitions/organic/wood/plank.dm
index cc96c5491bd..1bd8c7a6c3d 100644
--- a/code/modules/materials/definitions/organic/wood/plank.dm
+++ b/code/modules/materials/definitions/organic/wood/plank.dm
@@ -238,3 +238,23 @@
time = 5 SECONDS,
)
return recipes
+
+/datum/material/wood_plank/ironwood
+ id = "ironwood"
+ name = MAT_IRONWOOD
+ icon_colour = "#666666"
+ stack_type = /obj/item/stack/material/wood/ironwood
+
+ relative_integrity = 0.9
+ weight_multiplier = 0.8
+ density = 8 * 0.8
+ relative_conductivity = 0.1
+ relative_permeability = 0.05
+ relative_reactivity = 1 //Not quite as reactive as regular wood
+ hardness = MATERIAL_RESISTANCE_MODERATE
+ toughness = MATERIAL_RESISTANCE_HIGH
+ refraction = MATERIAL_RESISTANCE_NONE
+ absorption = MATERIAL_RESISTANCE_MODERATE
+ nullification = MATERIAL_RESISTANCE_NONE
+
+
diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm
index 7c17d3c3d8d..7215709619d 100644
--- a/code/modules/materials/fifty_spawner_mats.dm
+++ b/code/modules/materials/fifty_spawner_mats.dm
@@ -88,6 +88,10 @@
name = "stack of hardwood"
type_to_spawn = /obj/item/stack/material/wood/hard
+/obj/fiftyspawner/ironwood
+ name = "stack of ironwood"
+ type_to_spawn = /obj/item/stack/material/wood/ironwood
+
/obj/fiftyspawner/log
name = "stack of logs"
type_to_spawn = /obj/item/stack/material/log
@@ -100,6 +104,10 @@
name = "stack of hardwood logs"
type_to_spawn = /obj/item/stack/material/log/hard
+/obj/fiftyspawner/ironlog
+ name = "stack of ironwood logs"
+ type_to_spawn = /obj/item/stack/material/log/ironwood
+
/obj/fiftyspawner/cloth
name = "stack of cloth"
type_to_spawn = /obj/item/stack/material/cloth
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index f8b74c95380..950c64e4e9d 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -357,6 +357,14 @@
material = /datum/material/wood_plank/hardwood
description_info = "Rich, lustrous hardwood, imported from offworld at moderate expense. Mostly used for luxurious furniture, and not very good for weapons or other structures."
+/obj/item/stack/material/wood/ironwood
+ name = "ironwood plank"
+ color = "#666666"
+ material = /datum/material/wood_plank/ironwood
+ description_info = "A especially dense wood said to be stronger than iron. Grown from ironwood trees native to the Alraune homeworld of Loam."
+ catalogue_delay = 2 SECONDS
+ catalogue_data = list(/datum/category_item/catalogue/flora/ironwood)
+
/obj/item/stack/material/log
name = "log"
icon_state = "sheet-log"
@@ -404,6 +412,37 @@
else
return ..()
+/obj/item/stack/material/log/ironwood
+ material = /datum/material/wood_log/ironwood
+ color = "#666666"
+ plank_type = /obj/item/stack/material/wood/ironwood
+ description_info = "Use inhand to craft things. You will need something very sharp to cut it into planks though"
+ catalogue_delay = 2 SECONDS
+ catalogue_data = list(/datum/category_item/catalogue/flora/ironwood)
+
+
+/obj/item/stack/material/log/ironwood/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier)
+ if(!istype(I) || I.damage_force <= 20) //You will need at least PLASTEEL Tools to cut this.
+ return ..()
+ if(CHECK_MULTIPLE_BITFIELDS(I.damage_mode, DAMAGE_MODE_EDGE | DAMAGE_MODE_SHARP) || (I.edge && I.sharp))
+ var/time = (3 SECONDS / max(I.damage_force / 10, 1)) * I.tool_speed
+ user.setClickCooldown(time)
+ if(do_after(user, time, src) && use(1))
+ to_chat(user, "You cut up a log into planks.")
+ playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1)
+ var/obj/item/stack/material/wood/existing_wood = null
+ for(var/obj/item/stack/material/wood/M in user.loc)
+ if(M.material.name == src.material.name)
+ existing_wood = M
+ break
+
+ var/obj/item/stack/material/wood/new_wood = new plank_type(user.loc)
+ new_wood.amount = 2
+ if(existing_wood && new_wood.transfer_to(existing_wood))
+ to_chat(user, "You add the newly-formed wood to the stack. It now contains [existing_wood.amount] planks.")
+ else
+ to_chat(user, "You will need a stronger cut to cut this wood into planks.")
+ return ..()
/obj/item/stack/material/cloth
name = "cloth"