[Bounty] The Arti-Re-Factoring Base

code/__DEFINES/~monkestation/artifact.dm

@@ -18,11 +18,11 @@
 #define ARTIFACT_VERYRARE 140
 
 //cuts down on boiler plate code
-#define ARTIFACT_SETUP(X,subsystem) ##X/Initialize(mapload, var/forced_origin = null){\
+#define ARTIFACT_SETUP(X,subsystem) ##X/Initialize(mapload, var/forced_origin = null,var/forced_effect = null){\
 	. = ..();\
 	START_PROCESSING(subsystem, src);\
 	if(assoc_comp) {\
-		assoc_comp = AddComponent(assoc_comp, forced_origin);\
+		assoc_comp = AddComponent(assoc_comp, forced_origin, forced_effect);\
 		RegisterSignal(src, COMSIG_QDELETING, PROC_REF(on_delete));\
 	}\
 } \
@@ -33,7 +33,9 @@
 ##X/process(){\
 	assoc_comp?.stimulate_from_turf_heat(get_turf(src));\
 	if(assoc_comp?.active) {\
-		assoc_comp.effect_process();\
+		for(var/datum/artifact_effect/eff in assoc_comp.artifact_effects) {\
+			eff.effect_process();\
+		}\
 	}\
 } \
 ##X/rad_act(intensity){\

monkestation/code/modules/art_sci_overrides/activators/_base.dm

@@ -5,12 +5,16 @@
 	var/required_stimuli = NONE
 	/// our baseline amount needed to even think about triggering (do this in setup otherwise its gonna be static)
 	var/base_trigger_amount = 0
-	///the highest number our trigger can be 
+	///the highest number our trigger can be
 	var/highest_trigger_amount = 0
 	///the end goal of the amount we need set by setup below
 	var/amount = 0
 	///the hint we want to pass into the componenet for when we hit hint triggers
-	var/list/hint_texts = list("emits a <i>faint</i> noise..")
+	var/list/hint_texts = list("Emits a <i>faint</i> noise..")
+	///what it says on inspect when discovered
+	var/discovered_text = "Activated by ... coderbus"
+	///Research value when discovered
+	var/research_value = 0
 
 /datum/artifact_activator/proc/setup(potency)
 	amount = round(max(base_trigger_amount, base_trigger_amount + (highest_trigger_amount - base_trigger_amount) * (potency/100)))

monkestation/code/modules/art_sci_overrides/activators/range.dm

@@ -20,14 +20,16 @@
 	highest_trigger_amount = 30 //any higher than this and its gonna be practically impossible to trigger
 	hint_prob = 50
 	hint_range = 10
-	hint_texts = list("you almost want to start hitting things.", "a good whack might fix this.")
+	hint_texts = list("You almost want to start hitting things.", "A good whack might fix this.")
+	discovered_text = "Activated by Kinetic Energy"
 
 /datum/artifact_activator/range/heat
 	name = "Heat Sensisty"
 	required_stimuli = STIMULUS_HEAT
 	hint_range = 20
 	highest_trigger_amount = 15000
-	hint_texts = list("it feels like someone messed with the thermostat.", "it feels unpleasent being near")
+	hint_texts = list("It feels like someone messed with the thermostat.", "It feels unpleasent being near")
+	discovered_text = "Activated by Thermal Energy"
 
 /datum/artifact_activator/range/heat/New()
 	base_trigger_amount = rand(350, 1000)
@@ -37,7 +39,8 @@
 	required_stimuli = STIMULUS_SHOCK
 	highest_trigger_amount = 10000 // requires atleast t2 parts to trigger a max roll one
 	hint_range = 500
-	hint_texts = list("you can feel the static in the air", "your hairs stand on their ends")
+	hint_texts = list("You can feel the static in the air", "Your hairs stand on their ends")
+	discovered_text = "Activated by Electrical Energy"
 
 /datum/artifact_activator/range/shock/New()
 	base_trigger_amount = rand(400, 1200)
@@ -48,4 +51,5 @@
 	highest_trigger_amount = 10
 	hint_range = 2
 	base_trigger_amount = 1 //x-ray machine goes from 1-10
-	hint_texts = list("emits a hum that resembles the Super Matter", "you could swear you saw your bones for a second")
+	hint_texts = list("Emits a hum that resembles the Super Matter", "You could swear you saw your bones for a second")
+	discovered_text = "Activated by Radiation"

monkestation/code/modules/art_sci_overrides/activators/touch.dm

@@ -8,13 +8,16 @@
 	name = "Data"
 	required_stimuli = STIMULUS_DATA
 	hint_texts = list("It yearns for information")
+	discovered_text = "Activated by Information"
 
 /datum/artifact_activator/touch/carbon
 	name = "Carbon Touch"
 	required_stimuli = STIMULUS_CARBON_TOUCH
 	hint_texts = list("You swear you hear the artifact saying it yearns for flesh.", "One touch couldn't hurt could it?")
+	discovered_text = "Activated by Organic Contact"
 
 /datum/artifact_activator/touch/silicon
 	name = "Silicon Touch"
 	required_stimuli = STIMULUS_SILICON_TOUCH
 	hint_texts  = list("It feels like it's malfunctioning")
+	discovered_text = "Activated by Silicon Contact"

monkestation/code/modules/art_sci_overrides/artifact_components/_artifact_effect.dm

@@ -0,0 +1,66 @@
+/datum/artifact_effect
+	///string added to artifact desc, if not discovered.
+	var/examine_hint
+	///string added to artifact desc, if the effect has been discovered
+	var/examine_discovered
+	///When you discover this, how many credits does it add to the sell price?
+	var/discovered_credits = CARGO_CRATE_VALUE*0.75
+	///how likely is it that this effect is added to an artifact?
+	var/weight = ARTIFACT_COMMON
+	///if defined, artifact must be this size to roll
+	var/artifact_size
+	///how strong is this effect,1-100
+	var/potency
+	///If the artifact doesnt have the right activator, cant be put on. If null, assume any
+	var/list/valid_activators
+	///If the artifact doesnt have this origin, cant be put on. If null, assume any
+	var/list/valid_origins
+	///sent on activation
+	var/activation_message
+	///played on activation
+	var/activation_sound
+	///sent on deactivation
+	var/deactivation_message
+	///played on deactivation
+	var/deactivation_sound
+
+
+	///Research value when discovered
+	var/research_value = 100
+	///The artifact we're on.
+	var/datum/component/artifact/our_artifact
+	///Type of effect, shows up in Xray Machine
+	var/type_name = "Generic Artifact Effect"
+
+/datum/artifact_effect/New()
+	. = ..()
+	potency = rand(1,100)
+
+
+///Called when the artifact has been created
+/datum/artifact_effect/proc/setup()
+	return
+///Called when the artifact has been activated
+/datum/artifact_effect/proc/effect_activate(silent)
+	return
+///Called when the artifact has been de-activated
+/datum/artifact_effect/proc/effect_deactivate(silent)
+	return
+///Called when the artifact has been touched by a living mob.
+/datum/artifact_effect/proc/effect_touched(mob/living/user)
+	return
+///Called on every artifact subsystem tick.
+/datum/artifact_effect/proc/effect_process()
+	return
+///Called when the artifact is destroyed
+/datum/artifact_effect/proc/on_destroy(atom/source)
+	return
+///Util, can be called to activate, then de-activate the artifact as a whole swiftly. Wont Re activate already active artifacts.
+/datum/artifact_effect/proc/flick_active(silent)
+	if(!our_artifact.active)
+		our_artifact.artifact_activate(silent)
+	our_artifact.artifact_deactivate(silent)
+	return
+///Util, can be called to swap the artifacts active status quickly.
+/datum/artifact_effect/proc/toggle_active(silent)
+	our_artifact.active ? our_artifact.artifact_deactivate(silent) : our_artifact.artifact_activate(silent)