Merge branch 'master' into werewolf-content

code/game/atoms_movable.dm

@@ -185,6 +185,11 @@
 		if(MOVABLE_LIGHT_BEAM)
 			AddComponent(/datum/component/overlay_lighting, is_directional = TRUE, is_beam = TRUE)
 
+	// HUGE NON-MODULE CHANGE
+	if (has_initial_mana_pool && can_have_mana_pool())
+		mana_pool = initialize_mana_pool()
+	// END NON-MODULE CHANGE
+
 /atom/movable/Destroy(force)
 	QDEL_NULL(language_holder)
 	QDEL_NULL(em_block)
@@ -240,6 +245,8 @@
 	if (length(vis_contents))
 		vis_contents.Cut()
 
+	QDEL_NULL(mana_pool) // MAJOR NON-MODULE CHANGE
+
 /atom/movable/proc/update_emissive_block()
 	// This one is incredible.
 	// `if (x) else { /* code */ }` is surprisingly fast, and it's faster than a switch, which is seemingly not a jump table.

code/modules/hydroponics/grown/flowers.dm

@@ -221,7 +221,7 @@
 	icon_grow = "moonflower-grow"
 	icon_dead = "sunflower-dead"
 	product = /obj/item/food/grown/moonflower
-	genes = list(/datum/plant_gene/trait/glow/purple, /datum/plant_gene/trait/preserved)
+	genes = list(/datum/plant_gene/trait/glow/purple, /datum/plant_gene/trait/preserved, /datum/plant_gene/reagent/misty_quintessence) // NON-MODULE CHANGE
 	mutatelist = null
 	reagents_add = list(/datum/reagent/consumable/ethanol/moonshine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 15
@@ -334,7 +334,7 @@
 	potency = 15
 	instability = 3
 	growthstages = 3
-	genes = list(/datum/plant_gene/reagent/preset/carbon, /datum/plant_gene/trait/preserved)
+	genes = list(/datum/plant_gene/reagent/preset/carbon, /datum/plant_gene/trait/preserved, /datum/plant_gene/reagent/agnosticine) // NON-MODULE CHANGE
 	growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi'
 	icon_grow = "carbonrose-grow"
 	icon_dead = "carbonrose-dead"

code/modules/hydroponics/grown/melon.dm

@@ -47,7 +47,7 @@
 	species = "holymelon"
 	plantname = "Holy Melon Vines"
 	product = /obj/item/food/grown/holymelon
-	genes = list(/datum/plant_gene/trait/glow/yellow, /datum/plant_gene/trait/anti_magic)
+	genes = list(/datum/plant_gene/trait/glow/yellow, /datum/plant_gene/trait/anti_magic, /datum/plant_gene/reagent/foggy_agnosticine) // NON-MODULE CHANGE
 	mutatelist = null
 	reagents_add = list(/datum/reagent/water/holywater = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = PLANT_MODERATELY_RARE

code/modules/hydroponics/grown/mushrooms.dm

@@ -311,7 +311,7 @@
 	icon_dead = "shadowshroom-dead"
 	plantname = "Shadowshrooms"
 	product = /obj/item/food/grown/mushroom/glowshroom/shadowshroom
-	genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
+	genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/fading_agnosticine) // NON-MODULE CHANGE
 	mutatelist = null
 	reagents_add = list(/datum/reagent/uranium/radium = 0.2, /datum/reagent/consumable/nutriment = 0.04)
 	rarity = 30
@@ -347,7 +347,7 @@
 	instability = 65
 	growthstages = 3
 	product = /obj/item/food/grown/mushroom/odious_puffball
-	genes = list(/datum/plant_gene/trait/smoke, /datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/squash)
+	genes = list(/datum/plant_gene/trait/smoke, /datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/squash, /datum/plant_gene/reagent/agnosticine) // NON-MODULE CHANGE
 	reagents_add = list(/datum/reagent/toxin/spore = 0.2, /datum/reagent/consumable/nutriment = 0.04)
 	rarity = 35
 	graft_gene = /datum/plant_gene/trait/smoke

code/modules/hydroponics/grown/peas.dm

@@ -75,7 +75,7 @@
 	growthstages = 3
 	icon_grow = "worldpeas-grow"
 	icon_dead = "worldpeas-dead"
-	genes = list (/datum/plant_gene/trait/glow/blue)
+	genes = list (/datum/plant_gene/trait/glow/blue, /datum/plant_gene/reagent/crystalized_quintessence) // NON-MODULE CHANGE
 	reagents_add = list (/datum/reagent/pax = 0.1, /datum/reagent/drug/happiness = 0.1, /datum/reagent/consumable/nutriment = 0.15)
 	rarity = 50 // This absolutely will make even the most hardened Syndicate Operators relax.
 	graft_gene = /datum/plant_gene/trait/glow/blue

code/modules/hydroponics/grown/plum.dm

@@ -34,7 +34,7 @@
 	species = "plumb"
 	plantname = "Plumb Tree"
 	product = /obj/item/food/grown/plum/plumb
-	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/reagent/foggy_agnosticine) // NON-MODULE CHANGE
 	mutatelist = null
 	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/lead = 0.04)
 	rarity = 30

code/modules/hydroponics/grown/tea_coffee.dm

@@ -32,6 +32,7 @@
 	species = "teaastra"
 	plantname = "Tea Astra Plant"
 	product = /obj/item/food/grown/tea/astra
+	genes = list(/datum/plant_gene/reagent/quintessence) // NON-MODULE CHANGE
 	mutatelist = null
 	reagents_add = list(/datum/reagent/medicine/synaptizine = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/toxin/teapowder = 0.1)
 	rarity = PLANT_MODERATELY_RARE

code/modules/mining/lavaland/ash_flora.dm

@@ -297,7 +297,7 @@
 	production = 6
 	yield = 3
 	growthstages = 4
-	genes = list(/datum/plant_gene/trait/sticky, /datum/plant_gene/trait/stinging)
+	genes = list(/datum/plant_gene/trait/sticky, /datum/plant_gene/trait/stinging, /datum/plant_gene/reagent/quintessence) // NON-MODULE CHANGE
 	graft_gene = /datum/plant_gene/trait/sticky
 	growing_icon = 'icons/obj/service/hydroponics/growing_vegetables.dmi'
 	reagents_add = list(/datum/reagent/water = 0.08, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/c2/helbital = 0.05)
@@ -375,7 +375,7 @@
 	species = "fireblossom"
 	growthstages = 3
 	product = /obj/item/food/grown/ash_flora/fireblossom
-	genes = list(/datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/yellow)
+	genes = list(/datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/yellow, /datum/plant_gene/reagent/misty_quintessence) // NON-MODULE CHANGE
 	growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi'
 	reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment = 0.03, /datum/reagent/carbon = 0.05)
 

maplestation.dme

@@ -6099,7 +6099,11 @@
 #include "maplestation_modules\code\__DEFINES\traits.dm"
 #include "maplestation_modules\code\__DEFINES\vv.dm"
 #include "maplestation_modules\code\__DEFINES\magic\attunements.dm"
+#include "maplestation_modules\code\__DEFINES\magic\magic_bitflags.dm"
 #include "maplestation_modules\code\__DEFINES\magic\magic_defines.dm"
+#include "maplestation_modules\code\__DEFINES\magic\magic_signals.dm"
+#include "maplestation_modules\code\__DEFINES\magic\mana_charge_bitflags.dm"
+#include "maplestation_modules\code\__DEFINES\magic\mana_pool_process_bitflags.dm"
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_categories.dm"
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_customization_interfaces.dm"
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_entry_types.dm"
@@ -6187,6 +6191,7 @@
 #include "maplestation_modules\code\game\objects\items\devices\radio\encryptionkey.dm"
 #include "maplestation_modules\code\game\objects\items\devices\radio\headset.dm"
 #include "maplestation_modules\code\game\objects\items\devices\scanners\autopsy_scanner.dm"
+#include "maplestation_modules\code\game\objects\items\devices\scanners\mana_lens.dm"
 #include "maplestation_modules\code\game\objects\items\other_loadout_items\loadout_inhand_items.dm"
 #include "maplestation_modules\code\game\objects\items\other_loadout_items\loadout_pocket_items.dm"
 #include "maplestation_modules\code\game\objects\items\storage\belt.dm"
@@ -6353,6 +6358,7 @@
 #include "maplestation_modules\code\modules\food_and_drinks\recipes\drinks_recipes.dm"
 #include "maplestation_modules\code\modules\food_and_drinks\recipes\food\egg_recipes.dm"
 #include "maplestation_modules\code\modules\hydroponics\hydroponics.dm"
+#include "maplestation_modules\code\modules\hydroponics\plant_genes.dm"
 #include "maplestation_modules\code\modules\jobs\job_types\_job.dm"
 #include "maplestation_modules\code\modules\jobs\job_types\asset_protection.dm"
 #include "maplestation_modules\code\modules\jobs\job_types\assistant.dm"
@@ -6394,17 +6400,20 @@
 #include "maplestation_modules\code\modules\loadouts\loadout_ui\limbs.dm"
 #include "maplestation_modules\code\modules\loadouts\loadout_ui\loadout_manager.dm"
 #include "maplestation_modules\code\modules\loadouts\loadout_ui\loadout_outfit_helpers.dm"
-#include "maplestation_modules\code\modules\magic\attunement.dm"
-#include "maplestation_modules\code\modules\magic\magic.dm"
-#include "maplestation_modules\code\modules\magic\magic_subsystem.dm"
+#include "maplestation_modules\code\modules\magic\spell.dm"
 #include "maplestation_modules\code\modules\magic\components\has_mana.dm"
 #include "maplestation_modules\code\modules\magic\components\uses_mana.dm"
+#include "maplestation_modules\code\modules\magic\mana\living_mana.dm"
 #include "maplestation_modules\code\modules\magic\mana\mana.dm"
-#include "maplestation_modules\code\modules\magic\mana\misc_mana.dm"
+#include "maplestation_modules\code\modules\magic\mana\mana_chemicals.dm"
+#include "maplestation_modules\code\modules\magic\mana\mana_overload.dm"
+#include "maplestation_modules\code\modules\magic\mana\mana_pool.dm"
+#include "maplestation_modules\code\modules\magic\mana\attunements\attunement.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\mana_batteries.dm"
-#include "maplestation_modules\code\modules\magic\mana\sources\transmutation.dm"
-#include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leylines.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_attunements.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_intensities.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_variable.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\acid_touch.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\airhike.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\convect.dm"
@@ -6417,13 +6426,15 @@
 #include "maplestation_modules\code\modules\magic\story_spells\illusion.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\lycanthropy.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\mage_hand.dm"
+#include "maplestation_modules\code\modules\magic\story_spells\mana_charge.dm"
+#include "maplestation_modules\code\modules\magic\story_spells\mana_sense.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\shock_touch.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\soothe.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\thaumatergic_sense.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\water_control.dm"
-#include "maplestation_modules\code\modules\magic\story_spells\components\pointed_component.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\components\story_spell_component.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\components\touch_component.dm"
+#include "maplestation_modules\code\modules\magic\subsystems\magic_subsystem.dm"
 #include "maplestation_modules\code\modules\mining\mining_redemption.dm"
 #include "maplestation_modules\code\modules\mining\order_consumables.dm"
 #include "maplestation_modules\code\modules\mining\ores_coins.dm"

maplestation_modules/code/__DEFINES/magic/attunements.dm

@@ -20,6 +20,9 @@
 #define MAGIC_ELEMENT_ICE /datum/attunement/ice
 #define MAGIC_ELEMENT_LIGHT /datum/attunement/light
 #define MAGIC_ELEMENT_WIND /datum/attunement/wind
+#define MAGIC_ELEMENT_LIFE /datum/attunement/life
+#define MAGIC_ELEMENT_EARTH /datum/attunement/earth
+#define MAGIC_ELEMENT_ELECTRIC /datum/attunement/electric
 // When other elements are used, add them here
 
 // Alignments

maplestation_modules/code/__DEFINES/magic/magic_bitflags.dm

@@ -0,0 +1,11 @@
+
+#define NO_MANA_POOL (1<<0)
+#define MANA_POOL_FULL (1<<1)
+
+#define MANA_POOL_TRANSFER_START (1<<2)
+#define MANA_POOL_TRANSFER_STOP (1<<3)
+
+#define MANA_POOL_ALREADY_TRANSFERRING (1<<4)
+#define MANA_POOL_CANNOT_TRANSFER (1<<5)
+
+#define MANA_POOL_TRANSFER_SKIP_ACTIVE (1<<6)

maplestation_modules/code/__DEFINES/magic/magic_defines.dm

@@ -1,11 +1,46 @@
 /// Magic
 
-#define BASE_STORY_MAGIC_CAST_COST_MULT 1
-#define NO_CATALYST_COST_MULT 4
-
 // Assumes we are at average leyline intensity
-#define LEYLINE_BASE_CAPACITY 600
-#define LEYLINE_BASE_RECHARGE 2 // Per second, we recharge this much mana
+#define LEYLINE_BASE_RECHARGE 0.1 // Per second, we recharge this much man
+
+#define MANA_CRYSTAL_BASE_HARDCAP 200
+#define MANA_CRYSTAL_BASE_RECHARGE 0.001
+
+#define BASE_MANA_CAPACITY 1000
+#define MANA_CRYSTAL_BASE_MANA_CAPACITY (BASE_MANA_CAPACITY * 0.2)
+#define CARBON_BASE_MANA_CAPACITY (BASE_MANA_CAPACITY)
+#define LEYLINE_BASE_CAPACITY 600 //todo: standardize
+
+#define BASE_MANA_SOFTCAP (BASE_MANA_CAPACITY * 0.2) //20 percent
+#define BASE_MANA_CRYSTAL_SOFTCAP  MANA_CRYSTAL_BASE_MANA_CAPACITY
+#define BASE_CARBON_MANA_SOFTCAP (CARBON_BASE_MANA_CAPACITY * 0.2)
+
+#define BASE_MANA_OVERLOAD_THRESHOLD (BASE_MANA_CAPACITY * 0.9)
+#define MANA_CRYSTAL_OVERLOAD_THRESHOLD MANA_CRYSTAL_BASE_MANA_CAPACITY
+#define CARBON_MANA_OVERLOAD_THRESHOLD BASE_CARBON_MANA_SOFTCAP
+
+#define BASE_MANA_OVERLOAD_COEFFICIENT 1
+#define MANA_CRYSTAL_OVERLOAD_COEFFICIENT 0.1
+#define CARBON_MANA_OVERLOAD_COEFFICIENT 2
+
+#define ROBOTIC_MANA_OVERLOAD_COEFFICIENT_MULT 3
+#define ROBOTIC_MANA_SOFTCAP_MULT 0.5
+#define ROBOTIC_MANA_OVERLOAD_THRESHOLD_MULT ROBOTIC_MANA_SOFTCAP_MULT
+
+#define MANA_OVERLOAD_DAMAGE_THRESHOLD 2
+#define MANA_OVERLOAD_BASE_DAMAGE 1
+
+// inverse - higher numbers decrease the intensity of the decay
+#define BASE_MANA_EXPONENTIAL_DIVISOR 60 // careful with this value - low numbers will cause some fuckery
+#define BASE_CARBON_MANA_EXPONENTIAL_DIVISOR (BASE_MANA_EXPONENTIAL_DIVISOR * 0.5)
+#define MANA_CRYSTAL_BASE_DECAY_DIVISOR (BASE_MANA_EXPONENTIAL_DIVISOR * 5)
+
+// in vols per second
+#define BASE_MANA_DONATION_RATE (BASE_MANA_CAPACITY * 0.5)
+#define BASE_MANA_CRYSTAL_DONATION_RATE (BASE_MANA_DONATION_RATE * 0.1)
+#define BASE_LEYLINE_DONATION_RATE 30
+
+#define MANA_BATTERY_MAX_TRANSFER_DISTANCE 3
 
 #define MAGIC_MATERIAL_NAME "Volite"
 #define MAGIC_UNIT_OF_MEASUREMENT "Vol"
@@ -17,3 +52,7 @@
 #define THAUMATERGIC_SENSE_POOL_DISCERNMENT_LEVEL_ZERO 0
 #define THAUMATERGIC_SENSE_POOL_DISCERNMENT_LEVEL_ONE 1
 #define THAUMATERGIC_SENSE_POOL_DISCERNMENT_LEVEL_TWO 2
+
+// MAGIC TRAITS GO HERE
+// give this to an object to declare that its pool can be used during cast.
+#define TRAIT_POOL_AVAILABLE_FOR_CAST "pool_available_for_cast"

maplestation_modules/code/__DEFINES/magic/magic_signals.dm

@@ -0,0 +1,2 @@
+#define COMSIG_MANA_POOL_INTRINSIC_RECHARGE_UPDATE "mana_pool_intrinsic_recharge_update"
+#define COMSIG_ATOM_MANA_POOL_CHANGED "atom_mana_pool_changed"

maplestation_modules/code/__DEFINES/magic/mana_charge_bitflags.dm

@@ -0,0 +1,5 @@
+
+#define MANA_ALL_LEYLINES (1<<1)
+
+#define MANA_DISPERSE_EVENLY 1
+#define MANA_SEQUENTIAL 2

maplestation_modules/code/__DEFINES/magic/mana_pool_process_bitflags.dm

@@ -0,0 +1,2 @@
+#define MANA_POOL_SKIP_NEXT_TRANSFER (1<<0)
+#define MANA_POOL_INTRINSIC (1<<1)

maplestation_modules/code/datums/components/crafting/recipes.dm

@@ -28,3 +28,14 @@
 	tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
 	time = 2 SECONDS
 	category = CAT_WEAPON_MELEE
+
+/datum/crafting_recipe/volite_amulet
+	name = "Volite Amulet"
+	result = /obj/item/clothing/neck/mana_star
+	reqs = list(
+		/obj/item/mana_battery/mana_crystal/cut = 1,
+		/obj/item/stack/sheet/mineral/gold = 1, // cheap for now
+	)
+	tool_behaviors = list(TOOL_SCREWDRIVER)
+	time = 5 SECONDS
+	category = CAT_EQUIPMENT

maplestation_modules/code/game/objects/items/devices/scanners/mana_lens.dm

@@ -0,0 +1,39 @@
+// as of part one, this is just for the prototype. more will be added with higher report detail/verbosity
+/obj/item/mana_lens
+	name = "Prototype Mana Lens"
+	icon = 'maplestation_modules/icons/obj/devices.dmi'
+	icon_state = "mana_lens"
+	desc = "A prototypical device used to read out the current amount of mana within a subject. The ergonomics are terrible."
+	item_flags = NOBLUDGEON
+	throwforce = 3
+	w_class = WEIGHT_CLASS_TINY
+	throw_speed = 3
+	throw_range = 7
+	drop_sound = 'maplestation_modules/sound/items/drop/device2.ogg'
+	pickup_sound = 'maplestation_modules/sound/items/pickup/device.ogg'
+
+/obj/item/mana_lens/interact_with_atom(atom/movable/interacting_with, mob/living/user)
+	if (isturf(interacting_with))
+		balloon_alert(user, "object has no mana pool!") // turfs should not ever have mana pools, doing this just so it doesn't error
+		return
+	if (!interacting_with.mana_pool)
+		balloon_alert(user, "object has no mana pool!")
+		return
+	balloon_alert(user, "mana amount: [interacting_with.mana_pool.amount]")
+
+/datum/design/proto_mana_lens
+	name = "Prototype Mana Lens"
+	desc = "The first prototype of a device capable of reading the prescence of mana."
+	id = "mana_lens"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/gold = SMALL_MATERIAL_AMOUNT)
+	build_path = /obj/item/mana_lens
+
+/datum/techweb_node/mana_base
+	id = "mana_base"
+	starting_node = TRUE
+	display_name = "Early Magical Tech"
+	description = "The first bits of technology surronding magic."
+	design_ids = list(
+		"mana_lens", // more will be added to this
+	)

maplestation_modules/code/modules/cargo/goodies.dm

@@ -5,3 +5,35 @@
 	cost = PAYCHECK_CREW * 4
 	crate_type = /obj/structure/closet/crate/critter
 	contains = list(/obj/item/toy/plush/peepy)
+
+/datum/supply_pack/goody/cut_volite
+	name = "Cut Volite Gemstone"
+	desc = "An expertly cut volite gemstone, ready to be socketed into an amulet."
+	cost = PAYCHECK_CREW * 5
+	contains = list(
+		/obj/item/mana_battery/mana_crystal/cut,
+	)
+
+/datum/supply_pack/goody/mana_star
+	name = "Pre-Assembled Volite Amulet"
+	desc = "A volite gemstone pre-cut and placed within an amulet, saving you the hassle."
+	cost = PAYCHECK_CREW * 8
+	contains = list(
+		/obj/item/clothing/neck/mana_star,
+	)
+
+/datum/supply_pack/goody/volite_single_pack
+	name = "Volite Crystal Single Pack"
+	desc = "A singular volite crystal, ready for use." // planned to be cut with rework part 2, here for ease of access.
+	cost = PAYCHECK_CREW * 4
+	contains = list(
+		/obj/item/mana_battery/mana_crystal/standard,
+	)
+
+/datum/supply_pack/goody/small_volite_pack
+	name = "Small Volite Crystal Single Pack"
+	desc = "A miniaturized volite crystal." // planned to be cut with rework part 2
+	cost = PAYCHECK_CREW * 2
+	contains = list(
+		/obj/item/mana_battery/mana_crystal/small,
+	)