DEBUG PRINTOUT PAIN: [REF(src)]"
+ final_print += "[parent] has an average pain of [get_average_pain()]."
+ final_print += "[parent] has a pain modifier of [pain_modifier]."
+ final_print += " - - - - "
+ final_print += "[parent] bodypart printout: (min / current / soft max)"
+ for(var/part in body_zones)
+ var/obj/item/bodypart/checked_bodypart = body_zones[part]
+ final_print += "[checked_bodypart.name]: [checked_bodypart.min_pain] / [checked_bodypart.pain] / [checked_bodypart.soft_max_pain]"
+
+ final_print += " - - - - "
+ final_print += "[parent] pain modifier printout:"
+ for(var/mod in pain_mods)
+ final_print += "[mod]: [pain_mods[mod]]"
+
+ final_print += "
"
+ to_chat(usr, final_print.Join("\n"))
+
+/datum/pain/proc/admin_adjust_bodypart_pain()
+ var/zone = input(usr, "Which bodypart") as null|anything in BODY_ZONES_ALL + "All"
+ var/amount = input(usr, "How much?") as null|num
+
+ if(isnull(amount) || isnull(zone))
+ return
+ if(zone == "All")
+ zone = BODY_ZONES_ALL
+
+ amount = clamp(amount, -200, 200)
+ adjust_bodypart_pain(zone, amount)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/bodyparts.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/bodyparts.dm
new file mode 100644
index 000000000000..9a14a244f0fc
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/bodyparts.dm
@@ -0,0 +1,286 @@
+// Bodypart extensions to handle pain
+// Yes pain is handled on a per-bodypart basis
+/obj/item/bodypart
+ /// The amount of pain this limb is experiencing (A bit for default)
+ var/pain = 15
+ /// The min amount of pain this limb can experience
+ var/min_pain = 0
+ /// The soft cap of pain that this limb can experience
+ /// This is not a hard cap, pain can go above this, but beyond this effects will not worsen
+ var/soft_max_pain = PAIN_LIMB_MAX
+ /// Modifier applied to pain that this part receives
+ var/bodypart_pain_modifier = 1
+ /// The last type of pain we received. Determines what type of pain we're recieving.
+ var/last_received_pain_type = BRUTE
+
+// Adds pain to check-self.
+/obj/item/bodypart/check_for_injuries(mob/living/carbon/human/examiner, list/check_list)
+ . = ..()
+ if(owner != examiner || !owner.can_feel_pain()) // haha you thought
+ return
+
+ switch((get_modified_pain() / soft_max_pain) * 100)
+ if(10 to 40)
+ check_list += "\t [span_danger("Your [name] is experiencing mild pain \
+ and [last_received_pain_type == BURN ? "burns" : "hurts"] to the touch.")]"
+
+ if(40 to 70)
+ check_list += "\t [span_warning("Your [name] is experiencing moderate pain \
+ and [last_received_pain_type == BURN ? "burns" : "hurts"] to the touch!")]"
+
+ if(70 to INFINITY)
+ check_list += "\t [span_boldwarning("Your [name] is experiencing severe pain \
+ and [last_received_pain_type == BURN ? "burns" : "hurts"] to the touch!")]"
+
+/**
+ * Gets our bodypart's effective pain (pain * pain modifiers).
+ *
+ * Returns our effective pain.
+ */
+/obj/item/bodypart/proc/get_modified_pain()
+ if(owner?.pain_controller)
+ return pain * bodypart_pain_modifier * owner.pain_controller.pain_modifier
+ else
+ return pain * bodypart_pain_modifier
+
+/**
+ * Effects on this bodypart has when pain is gained.
+ *
+ * amount - amount of pain gained
+ */
+/obj/item/bodypart/proc/on_gain_pain_effects(amount)
+ if(!owner)
+ return FALSE
+
+ if(get_modified_pain() >= 65 && can_be_disabled && !HAS_TRAIT_FROM(src, TRAIT_PARALYSIS, PAIN_LIMB_PARALYSIS))
+ owner.pain_message(
+ span_userdanger("Your [plaintext_zone] goes numb from the pain!"),
+ span_danger("You can't move your [plaintext_zone]!")
+ )
+ ADD_TRAIT(src, TRAIT_PARALYSIS, PAIN_LIMB_PARALYSIS)
+ update_disabled()
+
+ return TRUE
+
+/**
+ * Effects on this bodypart has when pain is lost and some time passes without any pain gain.
+ *
+ * amount - amount of pain lost
+ */
+/obj/item/bodypart/proc/on_lose_pain_effects(amount)
+ if(!owner)
+ return FALSE
+
+ if(get_modified_pain() < 65 && HAS_TRAIT_FROM(src, TRAIT_PARALYSIS, PAIN_LIMB_PARALYSIS))
+ owner.pain_message(
+ span_green("You can feel your [plaintext_zone] again!"),
+ span_green("You can move your [plaintext_zone] again!")
+ )
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, PAIN_LIMB_PARALYSIS)
+ update_disabled()
+
+ return TRUE
+
+/**
+ * Feedback messages from this limb when it is sustaining pain.
+ *
+ * healing_pain - if TRUE, the bodypart has gone some time without recieving pain, and is healing.
+ */
+/obj/item/bodypart/proc/pain_feedback(seconds_per_tick, healing_pain)
+ var/list/feedback_phrases = list()
+ var/static/list/healing_phrases = list(
+ "but is improving",
+ "but is starting to dull",
+ "but the stinging is stopping",
+ "but feels faint",
+ )
+
+ switch(pain)
+ if(10 to 25)
+ owner.flash_pain_overlay(1)
+ feedback_phrases += list("aches", "feels sore", "stings slightly", "tingles", "twinges")
+ if(25 to 50)
+ owner.flash_pain_overlay(1)
+ feedback_phrases += list("hurts", "feels sore", "stings", "throbs", "pangs", "cramps", "feels wrong", "feels loose")
+ if(last_received_pain_type == BURN)
+ feedback_phrases += list("stings to the touch", "burns")
+ if(50 to 65)
+ if(SPT_PROB(4, seconds_per_tick))
+ owner.pain_emote()
+ owner.flash_pain_overlay(2)
+ feedback_phrases += list("really hurts", "is losing feeling", "throbs painfully", "is in agony", "anguishes", "feels broken", "feels terrible")
+ if(last_received_pain_type == BURN)
+ feedback_phrases += list("burns to the touch", "burns", "singes")
+ if(65 to INFINITY)
+ if(SPT_PROB(8, seconds_per_tick))
+ var/bonus_emote = pick(PAIN_EMOTES)
+ owner.pain_emote(pick("groan", "scream", bonus_emote))
+ owner.flash_pain_overlay(2, 2 SECONDS)
+ feedback_phrases += list("is numb from the pain")
+
+ if(feedback_phrases.len)
+ owner.pain_message(span_danger("Your [plaintext_zone] [pick(feedback_phrases)][healing_pain ? ", [pick(healing_phrases)]." : "!"]"))
+ return TRUE
+
+// --- Chest ---
+/obj/item/bodypart/chest
+ soft_max_pain = PAIN_CHEST_MAX
+
+/obj/item/bodypart/chest/robot
+ // Augmented limbs start with maximum pain as a trade-off for becoming almost immune to it
+ // The idea being that the roboticist installing augments should take care of their patient
+ // following the period after they're augmented - anesthetic, rest, painkillers (from medbay)
+ pain = PAIN_CHEST_MAX
+ // As a trade off for starting with maximum pain,
+ // augmented limbs lose pain very rapidly and take very little in the way of pain.
+ // Why not a 0 modifier? I feel like it'll be unfun if they can just completely ignore the system.
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/chest/pain_feedback(seconds_per_tick, healing_pain)
+ var/list/feedback_phrases = list()
+ var/list/side_feedback = list()
+ var/static/list/healing_phrases = list(
+ "but is improving",
+ "but is starting to dull",
+ "but the stinging is stopping",
+ "but feels faint",
+ "but is settling",
+ "but it subsides",
+ )
+
+ switch(pain)
+ if(10 to 40)
+ owner.flash_pain_overlay(1)
+ feedback_phrases += list("aches", "feels sore", "stings slightly", "tingles", "twinges")
+ if(40 to 75)
+ owner.flash_pain_overlay(1, 2 SECONDS)
+ feedback_phrases += list("hurts", "feels sore", "stings", "throbs", "pangs", "cramps", "feels tight")
+ side_feedback += list("Your side hurts", "Your side pangs", "Your ribs hurt", "Your ribs pang", "Your neck stiffs")
+ if(75 to 110)
+ if(SPT_PROB(8, seconds_per_tick))
+ owner.pain_emote()
+ owner.flash_pain_overlay(2, 2 SECONDS)
+ feedback_phrases += list("really hurts", "is losing feeling", "throbs painfully", "stings to the touch", "is in agony", "anguishes", "feels broken", "feels tight")
+ side_feedback += list("You feel a sharp pain in your side", "Your ribs feel broken")
+ if(110 to INFINITY)
+ if(SPT_PROB(12, seconds_per_tick))
+ var/bonus_emote = pick(PAIN_EMOTES)
+ owner.pain_emote(pick("groan", "scream", bonus_emote))
+ owner.flash_pain_overlay(2, 3 SECONDS)
+ feedback_phrases += list("hurts madly", "is in agony", "is anguishing", "burns to the touch", "feels terrible", "feels constricted")
+ side_feedback += list("You feel your ribs jostle in your [plaintext_zone]")
+
+ if(side_feedback.len && last_received_pain_type == BRUTE && SPT_PROB(50, seconds_per_tick))
+ owner.pain_message(span_danger("[pick(side_feedback)][healing_pain ? ", [pick(healing_phrases)]." : "!"]"))
+ else if(feedback_phrases.len)
+ owner.pain_message(span_danger("Your [plaintext_zone] [pick(feedback_phrases)][healing_pain ? ", [pick(healing_phrases)]." : "!"]"))
+
+ return TRUE
+
+// --- Head ---
+/obj/item/bodypart/head
+ soft_max_pain = PAIN_HEAD_MAX
+
+/obj/item/bodypart/head/robot
+ pain = PAIN_HEAD_MAX
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/head/on_gain_pain_effects(amount)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(amount >= 10)
+ // Large amounts of head pain causes minor brain damage
+ owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, min(pain / 5, 10), 50)
+
+ return TRUE
+
+/obj/item/bodypart/head/pain_feedback(seconds_per_tick, healing_pain)
+ var/list/feedback_phrases = list()
+ var/list/side_feedback = list()
+ var/static/list/healing_phrases = list(
+ "but is improving",
+ "but is starting to dull",
+ "but the stinging is stopping",
+ "but the tension is stopping",
+ "but is settling",
+ "but it subsides",
+ "but the pressure fades",
+ )
+
+ switch(pain)
+ if(10 to 30)
+ owner.flash_pain_overlay(1)
+ feedback_phrases += list("aches", "feels sore", "stings slightly", "tingles", "twinges")
+ side_feedback += list("Your neck feels sore", "Your eyes feel tired")
+ if(30 to 60)
+ owner.flash_pain_overlay(1)
+ feedback_phrases += list("hurts", "feels sore", "stings", "throbs", "pangs")
+ side_feedback += list("Your neck aches badly", "Your eyes hurt", "You feel a migrane coming on", "You feel a splitting headache")
+ if(60 to 90)
+ owner.flash_pain_overlay(2)
+ feedback_phrases += list("really hurts", "is losing feeling", "throbs painfully", "is in agony", "anguishes", "feels broken", "feels terrible")
+ side_feedback += list("Your neck stiffs", "You feel pressure in your [plaintext_zone]", "The back of your eyes begin hurt", "You feel a terrible migrane")
+ if(90 to INFINITY)
+ var/bonus_emote = pick(PAIN_EMOTES)
+ owner.pain_emote(pick("groan", bonus_emote))
+ owner.flash_pain_overlay(2, 2 SECONDS)
+ feedback_phrases += list("hurts madly", "is in agony", "is anguishing", "feels terrible", "is in agony", "feels tense")
+ side_feedback += list("You feel a splitting migrane", "Pressure floods your [plaintext_zone]", "Your [plaintext_zone] feels as if it's being squeezed", "Your eyes hurt to keep open")
+
+ if(side_feedback.len && last_received_pain_type == BRUTE && SPT_PROB(50, seconds_per_tick))
+ owner.pain_message(span_danger("[pick(side_feedback)][healing_pain ? ", [pick(healing_phrases)]." : "!"]"))
+ else if(feedback_phrases.len)
+ owner.pain_message(span_danger("Your [plaintext_zone] [pick(feedback_phrases)][healing_pain ? ", [pick(healing_phrases)]." : "!"]"))
+
+ return TRUE
+
+// --- Legs ---
+/obj/item/bodypart/leg/on_gain_pain_effects(amount)
+ . = ..()
+ if(!.)
+ return
+
+ if(get_modified_pain() < 40)
+ return
+ if(amount < 5) // only big bursts of pain will cause a limp
+ return
+ owner.apply_status_effect(/datum/status_effect/limp/pain, src)
+
+// --- Right Leg ---
+/obj/item/bodypart/leg/right/robot
+ pain = PAIN_LIMB_MAX * 0.5
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/leg/right/robot/surplus
+ pain = 0
+ bodypart_pain_modifier = 0.8
+
+// --- Left Leg ---
+/obj/item/bodypart/leg/left/robot
+ pain = PAIN_LIMB_MAX * 0.5
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/leg/left/robot/surplus
+ pain = 0
+ bodypart_pain_modifier = 0.8
+
+
+// --- Right Arm ---
+/obj/item/bodypart/arm/right/robot
+ pain = PAIN_LIMB_MAX * 0.5
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/arm/right/robot/surplus
+ pain = 0
+ bodypart_pain_modifier = 0.8
+
+// --- Left Arm ---
+/obj/item/bodypart/arm/right/robot
+ pain = PAIN_LIMB_MAX * 0.5
+ bodypart_pain_modifier = 0.2
+
+/obj/item/bodypart/arm/left/robot/surplus
+ pain = 0
+ bodypart_pain_modifier = 0.8
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/generic.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/generic.dm
new file mode 100644
index 000000000000..ce7d020df001
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/generic.dm
@@ -0,0 +1,55 @@
+// -- Causes of pain, from non-modular actions --
+/datum/brain_trauma/mild/concussion/on_life(seconds_per_tick, times_fired)
+ . = ..()
+ if(SPT_PROB(1, seconds_per_tick))
+ owner.cause_pain(BODY_ZONE_HEAD, 10)
+
+// Shocks
+/mob/living/carbon/human/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
+ . = ..()
+ if(!.)
+ return
+
+ sharp_pain(BODY_ZONES_ALL, min((. / 2), 25), BURN)
+ set_timed_pain_mod(PAIN_MOD_RECENT_SHOCK, 0.5, 30 SECONDS)
+
+// Fleshmend of course heals pain.
+/datum/status_effect/fleshmend/tick()
+ . = ..()
+ if(iscarbon(owner) && !owner.on_fire)
+ var/mob/living/carbon/carbon_owner = owner
+ carbon_owner.cause_pain(BODY_ZONES_ALL, -2)
+
+// Regen cores.
+/datum/status_effect/regenerative_core/on_apply()
+ . = ..()
+ var/mob/living/carbon/human/human_owner = owner
+ if(istype(human_owner) && human_owner.pain_controller)
+ human_owner.cause_pain(BODY_ZONES_LIMBS, -25)
+ human_owner.cause_pain(BODY_ZONE_CHEST, -30)
+ human_owner.cause_pain(BODY_ZONE_HEAD, -15) // heals 90 pain total
+
+// Flight potion's flavor says "it hurts a shit ton bro", so it should cause decent pain
+/datum/reagent/flightpotion/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE)
+ var/has_wings_before = exposed_mob.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
+ . = ..()
+ if(iscarbon(exposed_mob) && exposed_mob.stat != DEAD)
+ var/mob/living/carbon/exposed_carbon = exposed_mob
+ if(reac_volume < 5 || !(ishumanbasic(exposed_carbon) || islizard(exposed_carbon) || ismoth(exposed_carbon)))
+ return
+ if(has_wings_before)
+ exposed_carbon.cause_pain(BODY_ZONE_HEAD, 10)
+ exposed_carbon.cause_pain(BODY_ZONE_CHEST, 45)
+ exposed_carbon.cause_pain(list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM), 18)
+ else
+ exposed_carbon.cause_pain(BODY_ZONE_HEAD, 16)
+ exposed_carbon.cause_pain(BODY_ZONE_CHEST, 75)
+ exposed_carbon.cause_pain(list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM), 30)
+
+/datum/wound/blunt/bone/moderate/chiropractice(mob/living/carbon/human/user)
+ . = ..()
+ user.cause_pain(limb.body_zone, 25)
+
+/datum/wound/blunt/bone/moderate/malpractice(mob/living/carbon/human/user)
+ . = ..()
+ user.cause_pain(limb.body_zone, 40)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/opiods.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/opiods.dm
new file mode 100644
index 000000000000..fdbb8969da43
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/opiods.dm
@@ -0,0 +1,27 @@
+/datum/addiction/opioids
+ withdrawal_stage_messages = list(
+ "My body aches all over...",
+ "I need some pain relief...",
+ "It hurts all over...I need some opioids!",
+ )
+
+/datum/addiction/opioids/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick)
+ . = ..()
+ if(!affected_carbon.pain_controller)
+ return
+ if(affected_carbon.pain_controller.get_average_pain() <= 10 && SPT_PROB(8, seconds_per_tick))
+ affected_carbon.cause_pain(BODY_ZONES_ALL, 0.5 * seconds_per_tick)
+
+/datum/addiction/opioids/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick)
+ . = ..()
+ if(!affected_carbon.pain_controller)
+ return
+ if(affected_carbon.pain_controller.get_average_pain() <= 20 && SPT_PROB(8, seconds_per_tick))
+ affected_carbon.cause_pain(BODY_ZONES_ALL, 1 * seconds_per_tick)
+
+/datum/addiction/opioids/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick)
+ . = ..()
+ if(!affected_carbon.pain_controller)
+ return
+ if(affected_carbon.pain_controller.get_average_pain() <= 30 && SPT_PROB(8, seconds_per_tick))
+ affected_carbon.cause_pain(BODY_ZONES_ALL, 1.5 * seconds_per_tick)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/surgery.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/surgery.dm
new file mode 100644
index 000000000000..be9a8769490b
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/causes/surgery.dm
@@ -0,0 +1,236 @@
+/datum/surgery_step
+ /// Moodlet given if a surgery is done without anesthetics
+ var/surgery_moodlet = /datum/mood_event/surgery
+ /// Pain overlay flashed if a surgery is done without anesthetics
+ var/pain_overlay_severity = 1
+ /// How much pain this gives (given out in display_pain, so this might be given out twice)
+ var/pain_amount = 0
+ /// What type of pain this gives
+ var/pain_type = BRUTE
+
+// Regex for updating existing display pain calls:
+// display_pain\((.+)\) -> display_pain($1, target_zone = target_zone) // NON-MODULE CHANGE
+/datum/surgery_step/display_pain(mob/living/carbon/target, pain_message, mechanical_surgery = FALSE, target_zone)
+ // Only feels pain if we feels pain
+ if(pain_amount <= 0 || isnull(target_zone) || !target.can_feel_pain())
+ return FALSE
+
+ // No pain from mechanics but still show the message (usually)
+ if(mechanical_surgery)
+ if(prob(70))
+ target.pain_message(span_userdanger(pain_message))
+ return FALSE
+
+ target.cause_pain(target_zone, pain_amount, pain_type)
+
+ if(target.IsSleeping() || target.stat >= UNCONSCIOUS)
+ if(target.has_status_effect(/datum/status_effect/grouped/anesthetic))
+ target.add_mood_event("surgery", /datum/mood_event/anesthetic)
+ return FALSE
+ if(ispath(surgery_moodlet))
+ target.add_mood_event("surgery", surgery_moodlet)
+ if(isnum(pain_overlay_severity))
+ target.flash_pain_overlay(pain_overlay_severity)
+ // No message if the pain emote fails
+ if(!target.pain_emote())
+ return FALSE
+ if(!target.pain_message(span_userdanger(pain_message)))
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/brainwash/sleeper_agent
+ pain_amount = 36
+
+/datum/surgery_step/sever_limb
+ pain_amount = 16 // Losing a limb also applies pain to chest
+
+/datum/surgery_step/repair_bone_hairline
+ pain_amount = 16
+
+/datum/surgery_step/reset_compound_fracture
+ pain_amount = 24
+
+/datum/surgery_step/fix_brain
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 24
+
+/datum/surgery_step/debride
+ pain_amount = 12
+ pain_type = BURN
+
+/datum/surgery_step/handle_cavity
+ pain_amount = 16
+
+/datum/surgery_step/incise_heart
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ // It is extremely unlikely this surgery is done on alive people to feel (most) of this
+ pain_amount = 60
+
+/datum/surgery_step/coronary_bypass
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 30
+
+/datum/surgery_step/coronary_bypass/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ . = ..()
+ // Reduces pain from surgery a bit on success
+ target.cause_pain(target_zone, pain_amount * -0.5, pain_type)
+
+/datum/surgery_step/coronary_bypass/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery)
+ . = ..()
+ // Double pain from surgery
+ target.cause_pain(target_zone, pain_amount, pain_type)
+
+/datum/surgery_step/fix_eyes
+ pain_amount = 9
+
+/datum/surgery_step/gastrectomy
+ pain_amount = 20
+
+/datum/surgery_step/gastrectomy/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ . = ..()
+ // Reduces pain from surgery a bit on success
+ target.cause_pain(target_zone, pain_amount * -1.25, pain_type)
+
+/datum/surgery_step/gastrectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery)
+ . = ..()
+ // Double pain from surgery
+ target.cause_pain(target_zone, pain_amount, pain_type)
+
+/datum/surgery_step/heal
+ pain_amount = 9
+
+/datum/surgery_step/hepatectomy
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 20
+
+/datum/surgery_step/hepatectomy/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ . = ..()
+ // Reduces pain from surgery a bit on success
+ target.cause_pain(target_zone, pain_amount * -1.25, pain_type)
+
+/datum/surgery_step/hepatectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery)
+ . = ..()
+ // Double pain from surgery
+ target.cause_pain(target_zone, pain_amount, pain_type)
+
+/datum/surgery_step/extract_implant
+ pain_amount = 24
+
+/datum/surgery_step/cut_fat
+ pain_amount = 16
+
+/datum/surgery_step/lobectomy
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 20
+
+/datum/surgery_step/incise
+ pain_amount = 12
+
+/datum/surgery_step/incise/nobleed
+ pain_amount = 3
+
+/datum/surgery_step/clamp_bleeders
+ pain_amount = 3
+
+/datum/surgery_step/retract_skin
+ pain_amount = 12
+
+/datum/surgery_step/close
+ pain_amount = 12
+ pain_type = BURN
+
+/datum/surgery_step/saw
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ // no pain_amount here because it uses apply_damage, which causes pain
+
+/datum/surgery_step/drill
+ pain_amount = 24
+
+/datum/surgery_step/reshape_face
+ pain_amount = 16
+
+/datum/surgery_step/repair_innards
+ pain_amount = 16
+
+/datum/surgery_step/stomach_pump
+ pain_amount = 12
+
+/datum/surgery_step/brainwash
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/lobotomize
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/bionecrosis
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/pacify
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/viral_bond
+ pain_amount = 24
+ pain_type = BURN
+
+/datum/surgery_step/wing_reconstruction
+ pain_amount = 9
+ pain_type = BURN
+
+/datum/surgery_step/fold_cortex
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/imprint_cortex
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 40
+
+/datum/surgery_step/reshape_ligaments
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 10
+ pain_type = BURN
+
+/datum/surgery_step/reinforce_ligaments
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 10
+ pain_type = BURN
+
+/datum/surgery_step/muscled_veins
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 15
+ pain_type = BURN
+
+/datum/surgery_step/ground_nerves
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 15
+ pain_type = BURN
+
+/datum/surgery_step/splice_nerves
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 15
+ pain_type = BURN
+
+/datum/surgery_step/thread_veins
+ surgery_moodlet = /datum/mood_event/surgery/major
+ pain_overlay_severity = 2
+ pain_amount = 15
+ pain_type = BURN
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/effects.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/effects.dm
new file mode 100644
index 000000000000..91f06698b764
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/effects.dm
@@ -0,0 +1,109 @@
+// -- Pain effects - mood and modifiers. --
+
+/atom/movable/screen/fullscreen/pain
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/hud/screen_full.dmi'
+ icon_state = "painoverlay"
+ layer = UI_DAMAGE_LAYER
+
+/mob/living/proc/flash_pain_overlay(severity = 1, time = 1 SECONDS)
+ if(client?.prefs)
+ if(client.prefs.read_preference(/datum/preference/toggle/pain_flashes))
+ clear_fullscreen("pain", time)
+ return
+ overlay_fullscreen("pain", /atom/movable/screen/fullscreen/pain, severity)
+ clear_fullscreen("pain", time)
+
+/datum/movespeed_modifier/pain
+ id = MOVESPEED_ID_PAIN
+ movetypes = GROUND
+
+// >= 100 total pain
+/datum/movespeed_modifier/pain/light
+ multiplicative_slowdown = 0.1
+
+// >= 200 total pain
+/datum/movespeed_modifier/pain/medium
+ multiplicative_slowdown = 0.2
+
+// >= 300 total pain
+/datum/movespeed_modifier/pain/heavy
+ multiplicative_slowdown = 0.35
+
+// >= 400 total pain
+/datum/movespeed_modifier/pain/crippling
+ multiplicative_slowdown = 0.5
+
+/datum/actionspeed_modifier/pain
+ id = ACTIONSPEED_ID_PAIN
+
+// >= 100 total pain
+/datum/actionspeed_modifier/pain/light
+ multiplicative_slowdown = 0.2
+
+// >= 200 total pain
+/datum/actionspeed_modifier/pain/medium
+ multiplicative_slowdown = 0.2
+
+// >= 300 total pain
+/datum/actionspeed_modifier/pain/heavy
+ multiplicative_slowdown = 0.35
+
+// >= 400 total pain
+/datum/actionspeed_modifier/pain/crippling
+ multiplicative_slowdown = 0.5
+
+/datum/mood_event/light_pain
+ description = "Everything aches."
+ mood_change = -3
+
+/datum/mood_event/med_pain
+ description = "Everything feels sore."
+ mood_change = -6
+
+/datum/mood_event/heavy_pain
+ description = "Everything hurts!"
+ mood_change = -10
+
+/datum/mood_event/crippling_pain
+ description = "STOP THE PAIN!"
+ mood_change = -15
+
+// Applied when you go under the knife with anesthesia
+/datum/mood_event/anesthetic
+ description = "Thank science for modern medicine."
+ mood_change = 2
+ timeout = 6 MINUTES
+
+// Applied by most surgeries if you get operated on without anesthetics
+/datum/mood_event/surgery
+ description = "They're operating on me while I'm awake!"
+ mood_change = -6
+ timeout = 3 MINUTES
+
+// Applied by some surgeries that are especially bad without anesthetics
+/datum/mood_event/surgery/major
+ description = "THEY'RE CUTTING ME OPEN!!"
+ mood_change = -10
+ timeout = 6 MINUTES
+
+/atom/movable/screen/alert/numbed
+ name = "Numbed"
+ desc = "Your body is numb, painless. You're under the effect of some kind of painkiller."
+ icon_state = "drugged"
+
+/datum/mood_event/narcotic_light
+ description = "I feel numb."
+ mood_change = 4
+ timeout = 3 MINUTES
+
+/datum/emote/living/carbon/human/scream
+
+/datum/emote/living/carbon/human/scream/can_run_emote(mob/living/carbon/human/user, status_check, intentional)
+ if(intentional)
+ return ..()
+
+ // Cut unintentional screems if they can't feel pain at the moment
+ if(!user.can_feel_pain())
+ return FALSE
+
+ return ..()
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/helpers.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/helpers.dm
new file mode 100644
index 000000000000..4444c2f5b763
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/helpers.dm
@@ -0,0 +1,154 @@
+// -- Helper procs and hooks for pain. --
+/mob/living
+ /// The pain controller datum - tracks, processes, and handles pain.
+ /// Only intialized on humans (currently), here for ease of access / future compatibillity?
+ var/datum/pain/pain_controller
+
+/mob/living/Destroy()
+ QDEL_NULL(pain_controller)
+ return ..()
+
+/mob/living/carbon/human/Initialize(mapload)
+ . = ..()
+ var/datum/pain/new_pain_controller = new(src)
+ if(!QDELETED(new_pain_controller))
+ pain_controller = new_pain_controller
+
+/**
+ * Causes pain to this mob.
+ *
+ * Note that most damage causes pain regardless, but this is still useful for direct pain damage
+ *
+ * * target_zone - required, which zone or zones to afflict pain to
+ * * amount - how much pain to inflict
+ * * dam_type - the type of pain to inflict. Only [BRUTE] and [BURN] really matters.
+ */
+/mob/living/proc/cause_pain(target_zone, amount, dam_type = BRUTE)
+ ASSERT(!isnull(target_zone))
+ ASSERT(isnum(amount))
+ return pain_controller?.adjust_bodypart_pain(target_zone, amount, dam_type)
+
+/**
+ * Runs an emote on the pain emote cooldown
+ * Emote supplied does NOT need to be a pain emote
+ *
+ * If no emote is supplied, randomly picks from all pain-related emotes
+ *
+ * * emote - what emote key to run
+ * * cooldown - applies cooldown on doing similar pain related emotes
+ */
+/mob/living/proc/pain_emote(emote, cooldown)
+ return pain_controller?.do_pain_emote(emote, cooldown)
+
+/**
+ * Runs a pain message on the pain message cooldown
+ *
+ * * message - the message to send
+ * * painless_message - optional, the message to send if the mob does not feel pain
+ * * cooldown - applies cooldown on doing similar pain messages
+ */
+/mob/living/proc/pain_message(message, painless_message, cooldown)
+ return pain_controller?.do_pain_message(message, painless_message, cooldown)
+
+/**
+ * Adjust the minimum pain the target zone can experience for a time
+ *
+ * This means that the target zone will not be able to go below the specified pain amount
+ *
+ * * target_zone - required, which zone to afflict pain to
+ * * amount - how much min pain to increase
+ * * time - how long to incease the min pain to
+ */
+/mob/living/proc/apply_min_pain(target_zone, amount, time)
+ ASSERT(!isnull(target_zone))
+ ASSERT(isnum(amount))
+ ASSERT(isnum(time))
+ return apply_status_effect(/datum/status_effect/minimum_bodypart_pain, target_zone, amount, time)
+
+/**
+ * Sets the pain modifier of [id] to [amount].
+ */
+/mob/living/proc/set_pain_mod(id, amount)
+ ASSERT(isnum(amount))
+ ASSERT(istext(id) || ispath(id))
+ return pain_controller?.set_pain_modifier(id, amount)
+
+/**
+ * Unsets the pain mod at the supplied [id].
+ */
+/mob/living/proc/unset_pain_mod(id)
+ ASSERT(istext(id) || ispath(id))
+ return pain_controller?.unset_pain_modifier(id)
+
+/**
+ * Checks if this mob can feel pain.
+ *
+ * By default mobs cannot feel pain if they have a pain modifier of 0.5 or less.
+ */
+/mob/living/proc/can_feel_pain()
+ return pain_controller?.pain_modifier > 0.5 && !HAS_TRAIT(src, TRAIT_NO_PAIN_EFFECTS)
+
+/**
+ * Adjusts the progress of pain shock on the current mob.
+ *
+ * * amount - the number of ticks of progress to remove. Note that one tick = two seconds for pain.
+ * * down_to - the minimum amount of pain shock the mob can have. Defaults to -30, giving the mob a buffer against shock.
+ */
+/mob/living/proc/adjust_pain_shock(amount, down_to = -30)
+ if(isnull(pain_controller))
+ return
+ if(amount > 0 && HAS_TRAIT(src, TRAIT_NO_SHOCK_BUILDUP))
+ return
+
+ ASSERT(isnum(amount))
+ pain_controller.shock_buildup = max(pain_controller.shock_buildup + amount, down_to)
+
+/**
+ * Cause [amount] of [dam_type] sharp pain to [target_zones].
+ * Sharp pain is for sudden spikes of pain that go away after [duration] deciseconds.
+ *
+ * * target_zones - requried, one or multiple target zones to apply sharp pain to
+ * * amount - how much sharp pain to inflict
+ * * dam_type - the type of sharp pain to inflict. Only [BRUTE] and [BURN] really matters.
+ * * duration - how long the sharp pain lasts for
+ */
+/mob/living/proc/sharp_pain(target_zones, amount, dam_type = BRUTE, duration = 1 MINUTES)
+ if(isnull(pain_controller))
+ return
+ ASSERT(!isnull(target_zones))
+ ASSERT(isnum(amount))
+
+ if(!islist(target_zones))
+ target_zones = list(target_zones)
+ for(var/zone in target_zones)
+ apply_status_effect(/datum/status_effect/sharp_pain, zone, amount, dam_type, duration)
+
+/**
+ * Set [id] pain modifier to [amount], and
+ * unsets it after [time] deciseconds have elapsed.
+ */
+/mob/living/proc/set_timed_pain_mod(id, amount, time)
+ if(isnull(pain_controller))
+ return
+ ASSERT(isnum(amount))
+ ASSERT(isnum(time))
+ ASSERT(istext(id) || ispath(id))
+ if(time <= 0)
+ // no-op rather than stack trace or anything, so code with variable time can ignore it
+ return
+
+ set_pain_mod(id, amount)
+ addtimer(CALLBACK(pain_controller, TYPE_PROC_REF(/datum/pain, unset_pain_modifier), id), time)
+
+/**
+ * Returns the bodypart pain of [zone].
+ * If [get_modified] is TRUE, returns the bodypart's pain multiplied by any modifiers affecting it.
+ */
+/mob/living/proc/get_bodypart_pain(target_zone, get_modified = FALSE)
+ ASSERT(!isnull(target_zone))
+
+ var/obj/item/bodypart/checked_bodypart = pain_controller?.body_zones[target_zone]
+ if(isnull(checked_bodypart))
+ return 0
+
+ return get_modified ? checked_bodypart.get_modified_pain() : checked_bodypart.pain
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/item_helpers.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/item_helpers.dm
new file mode 100644
index 000000000000..b4c18b0a59de
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/item_helpers.dm
@@ -0,0 +1,3 @@
+/obj/item
+ ///the pain damage we do
+ var/pain_damage
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/modifiers.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/modifiers.dm
new file mode 100644
index 000000000000..3d30c8f8348b
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/modifiers.dm
@@ -0,0 +1,125 @@
+// -- Pain modifiers. --
+// Species pain modifiers.
+/datum/species/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
+ . = ..()
+ if(isnum(species_pain_mod) && species_pain_mod != 1)
+ C.set_pain_mod(PAIN_MOD_SPECIES, species_pain_mod)
+
+/datum/species/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
+ . = ..()
+ C.unset_pain_mod(PAIN_MOD_SPECIES)
+
+// Eternal youth gives a small bonus pain mod.
+/datum/symptom/youth/Activate(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ switch(A.stage)
+ if(5)
+ A.affected_mob.set_pain_mod(name, 0.9)
+
+/datum/symptom/youth/End(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ A.affected_mob.unset_pain_mod(name)
+
+// Some Traumas
+
+/datum/brain_trauma/special/tenacity/on_gain()
+ . = ..()
+ owner.set_pain_mod(name, 0)
+
+/datum/brain_trauma/special/tenacity/on_lose()
+ owner.unset_pain_mod(name)
+ return ..()
+
+// Near death experience
+/mob/living/carbon/human/set_health(new_value)
+ . = ..()
+ if(HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, CRIT_HEALTH_TRAIT))
+ src.add_mood_event("near-death", /datum/mood_event/deaths_door)
+ set_pain_mod(PAIN_MOD_NEAR_DEATH, 0.1)
+ else
+ src.clear_mood_event("near-death")
+ unset_pain_mod(PAIN_MOD_NEAR_DEATH)
+
+// Stasis gives you a pain modifier and stops pain decay
+//
+// This is kind of a cop-out, I admit:
+// Loigcally, you shouldn't feel any pain on stasis, since all of your body systems are frozen
+// However, for balance this kneecaps surgery by making it a no-brainer to use stasis
+//
+// As a result, I'm opting to add just a "decent" pain modifier instead
+/datum/status_effect/grouped/stasis/on_apply()
+ . = ..()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.set_pain_mod(id, 0.5)
+
+/datum/status_effect/grouped/stasis/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.unset_pain_mod(id)
+ return ..()
+
+// Determination gives a hefty pain modifier
+/datum/status_effect/determined/on_apply()
+ . = ..()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.set_pain_mod(id, 0.625)
+ ADD_TRAIT(owner, TRAIT_NO_PAIN_EFFECTS, TRAIT_STATUS_EFFECT(id))
+ ADD_TRAIT(owner, TRAIT_NO_SHOCK_BUILDUP, TRAIT_STATUS_EFFECT(id))
+
+/datum/status_effect/determined/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.unset_pain_mod(id)
+ REMOVE_TRAIT(owner, TRAIT_NO_PAIN_EFFECTS, TRAIT_STATUS_EFFECT(id))
+ REMOVE_TRAIT(owner, TRAIT_NO_SHOCK_BUILDUP, TRAIT_STATUS_EFFECT(id))
+ return ..()
+
+// Fake healthy is supposed to mimic feeling no pain
+/datum/status_effect/grouped/screwy_hud/fake_healthy/on_apply()
+ . = ..()
+ ADD_TRAIT(owner, TRAIT_NO_PAIN_EFFECTS, TRAIT_STATUS_EFFECT(id))
+
+/datum/status_effect/grouped/screwy_hud/fake_healthy/on_remove()
+ . = ..()
+ REMOVE_TRAIT(owner, TRAIT_NO_PAIN_EFFECTS, TRAIT_STATUS_EFFECT(id))
+
+// Being drunk gives a slight one, note the actual reagent gives one based on its strength
+/datum/status_effect/inebriated/drunk/on_apply()
+ . = ..()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.set_pain_mod(id, 0.9)
+
+/datum/status_effect/inebriated/drunk/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.unset_pain_mod(id)
+ return ..()
+
+// Being drowsy gives a very slight one
+/datum/status_effect/drowsiness/on_apply()
+ . = ..()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.set_pain_mod(id, 0.95)
+
+/datum/status_effect/drowsiness/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.unset_pain_mod(id)
+ return ..()
+
+// Reacting to all cases of gaining knocked out rather than just sleeping
+/mob/living/on_knockedout_trait_gain(datum/source)
+ . = ..()
+ set_pain_mod(PAIN_MOD_KOD, 0.8)
+
+/mob/living/on_knockedout_trait_loss(datum/source)
+ . = ..()
+ unset_pain_mod(PAIN_MOD_KOD)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_assistance_tools.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_assistance_tools.dm
new file mode 100644
index 000000000000..57d8200e5b9c
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_assistance_tools.dm
@@ -0,0 +1,559 @@
+// -- Implements and equipment to help reduce pain. --
+// Temperature pack stuff - things you can press to people to help reduce pain.
+/// Heal rate and modifier for generic items that are frozen.
+#define FROZEN_ITEM_PAIN_RATE 1
+#define FROZEN_ITEM_PAIN_MODIFIER 0.5
+#define FROZEN_ITEM_TEMPERATURE_CHANGE -5
+
+// Holding a beer to your busted arm, now that's classic
+/obj/item/reagent_containers/cup/glass/bottle/beer/Initialize(mapload)
+ . = ..()
+ if(reagents.get_reagent_amount(/datum/reagent/consumable/ethanol/beer) > 1)
+ AddElement(/datum/element/temperature_pack, \
+ pain_heal_rate = 0.3, \
+ pain_modifier_on_limb = 0.9, \
+ temperature_change = -2)
+
+// Frozen items become usable temperature packs.
+/datum/element/frozen/Attach(datum/target)
+ . = ..()
+ if(. == ELEMENT_INCOMPATIBLE)
+ return
+ if(!isitem(target))
+ return
+
+ target.AddElement(/datum/element/temperature_pack, FROZEN_ITEM_PAIN_RATE, FROZEN_ITEM_PAIN_MODIFIER, FROZEN_ITEM_TEMPERATURE_CHANGE)
+
+/datum/element/frozen/Detach(datum/source, ...)
+ . = ..()
+ if(!isitem(source))
+ return
+
+ source.RemoveElement(/datum/element/temperature_pack, FROZEN_ITEM_PAIN_RATE, FROZEN_ITEM_PAIN_MODIFIER, FROZEN_ITEM_TEMPERATURE_CHANGE)
+
+/// Temperature packs (heat packs, cold packs). Apply to hurt limb to un-hurty.
+/obj/item/temperature_pack
+ name = "temperature pack"
+ desc = "A temperature pack, to soothe pain."
+ w_class = WEIGHT_CLASS_SMALL
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/pain_items.dmi'
+ lefthand_file = 'monkestation/code/modules/can_spessmen_feel_pain/icons/mob/inhands/pain_items_lhand.dmi'
+ righthand_file = 'monkestation/code/modules/can_spessmen_feel_pain/icons/mob/inhands/pain_items_rhand.dmi'
+ icon_state = "cold_pack"
+ throwforce = 0
+ throw_speed = 2
+ throw_range = 5
+ attack_verb_continuous = list("pads")
+ attack_verb_simple = list("pads")
+ /// Whether our pack has been used.
+ var/used = FALSE
+ /// Whether our pack is active.
+ var/active = FALSE
+ /// The amount of pain that our pack heals when used.
+ var/pain_heal_amount = 0
+ /// The modifier put onto the limb when used.
+ var/pain_limb_modifier = 1
+ /// The change in temperature applied to the user while our pack is in use.
+ var/temperature_change = 0
+
+/obj/item/temperature_pack/Initialize(mapload)
+ . = ..()
+ update_appearance()
+
+/obj/item/temperature_pack/attack_self(mob/user, modifiers)
+ . = ..()
+ if(.)
+ return
+
+ if(used)
+ return
+
+ used = TRUE
+ activate_pack(user)
+ return TRUE
+
+/obj/item/temperature_pack/examine(mob/user)
+ . = ..()
+ if(used)
+ if(active)
+ . += span_notice("It's used, but emanating [temperature_change > 0 ? "heat" : "a chill"].")
+ else
+ . += span_notice("It's used up and empty.")
+ else
+ . += span_notice("Use it in hand to activate the pack, [temperature_change > 0 ? "heating it up" : "cooling it down"].")
+
+/obj/item/temperature_pack/update_overlays()
+ . = ..()
+ if(!used || active)
+ if(temperature_change > 0)
+ . += "heat_overlay"
+ if(active)
+ . += "active_heat_overlay"
+ else
+ . += "cold_overlay"
+ if(active)
+ . += "active_cold_overlay"
+
+/**
+ * Activate [src] from [user], making it into a temperature pack that can be used, that expires in 5 minutes.
+ */
+/obj/item/temperature_pack/proc/activate_pack(mob/user)
+ addtimer(CALLBACK(src, PROC_REF(deactivate_pack)), 5 MINUTES)
+ to_chat(user, span_notice("You crack [src], [temperature_change > 0 ? "heating it up" : "cooling it down"]."))
+ AddElement(/datum/element/temperature_pack, pain_heal_amount, pain_limb_modifier, temperature_change)
+ active = TRUE
+ update_appearance()
+
+/**
+ * Deactivate [src], making it unusable, and sending signal [COMSIG_TEMPERATURE_PACK_EXPIRED].
+ */
+/obj/item/temperature_pack/proc/deactivate_pack()
+ SEND_SIGNAL(src, COMSIG_TEMPERATURE_PACK_EXPIRED)
+ visible_message(span_notice("[src] fizzles as the last of its [temperature_change > 0 ? "heat" : "chill"] runs out."))
+ RemoveElement(/datum/element/temperature_pack, pain_heal_amount, pain_limb_modifier, temperature_change)
+ active = FALSE
+ name = "used [name]"
+ desc = "A used up [name]. It's no use to anyone anymore."
+ update_appearance()
+
+// Head packs have a stronger modifier, but heals less.
+/obj/item/temperature_pack/heat
+ name = "heat pack"
+ desc = "A heat pack. Crack it to turn it on and apply it to an aching limb to reduce joint stress and moderate pain."
+ temperature_change = 5
+ pain_heal_amount = 3.6
+ pain_limb_modifier = 0.5
+
+// Cold packs heal more, but have a weaker modifier.
+/obj/item/temperature_pack/cold
+ name = "cold pack"
+ desc = "A cold pack. Crack it on and apply it to a hurt limb to abate sharp pain."
+ temperature_change = -5
+ pain_heal_amount = 6
+ pain_limb_modifier = 0.75
+
+/obj/item/reagent_containers/pill/aspirin
+ name = "aspirin pill"
+ desc = "Used to treat moderate pain and fever. Metabolizes slowly. Best at treating chest pain."
+ icon_state = "pill7"
+ list_reagents = list(/datum/reagent/medicine/painkiller/aspirin = 10) // Lasts ~4 minutes, heals ~20 pain in chest (lower in other parts)
+ rename_with_volume = TRUE
+
+/obj/item/reagent_containers/syringe/aspirin
+ name = "syringe (aspirin)"
+ desc = "Contains fiteen units of aspirin. Used to treat chest pain and fever. Metabolizes slowly."
+ list_reagents = list(/datum/reagent/medicine/painkiller/aspirin = 15)
+
+/obj/item/reagent_containers/pill/ibuprofen
+ name = "ibuprofen pill"
+ desc = "Used to treat mild pain, headaches, and fever. Metabolizes slowly. Best at treating head pain."
+ icon_state = "pill8"
+ list_reagents = list(/datum/reagent/medicine/painkiller/ibuprofen = 10) // Lasts ~4 minutes, heals ~20 pain in head (lower in other parts)
+ rename_with_volume = TRUE
+
+/obj/item/reagent_containers/syringe/ibuprofen
+ name = "syringe (ibuprofen)"
+ desc = "Contains fiteen units of ibuprofen. Used to treat head pain headaches, and fever. Metabolizes slowly."
+ list_reagents = list(/datum/reagent/medicine/painkiller/ibuprofen = 15)
+
+/obj/item/reagent_containers/pill/paracetamol
+ name = "paracetamol pill"
+ desc = "Used to treat moderate pain and headaches. Metabolizes slowly. Good as a general painkiller."
+ icon_state = "pill9"
+ list_reagents = list(/datum/reagent/medicine/painkiller/paracetamol = 10) // Lasts ~4 minutes, heals ~15 pain per bodypart
+ rename_with_volume = TRUE
+
+/obj/item/reagent_containers/syringe/paracetamol
+ name = "syringe (paracetamol)"
+ desc = "Contains fiteen units of Paracetamol. Used to treat general pain. Metabolizes slowly."
+ list_reagents = list(/datum/reagent/medicine/painkiller/paracetamol = 15)
+
+/obj/item/reagent_containers/pill/morphine/diluted
+ desc = "Used to treat major to severe pain. Causes moderate drowsiness. Mildly addictive."
+ icon_state = "pill11"
+ list_reagents = list(/datum/reagent/medicine/painkiller/morphine = 5) // Lasts ~1 minute, heals ~10 pain per bodypart (~100 pain) // NON-MODULE CHANGE
+ rename_with_volume = TRUE
+
+/obj/item/reagent_containers/syringe/morphine
+ name = "syringe (morphine)"
+ desc = "Contains three injections of Morphine. Used to treat major to severe pain. Causes moderate drowsiness. Mildly addictive."
+ list_reagents = list(/datum/reagent/medicine/painkiller/morphine = 15) // NON-MODULE CHANGE
+
+/obj/item/reagent_containers/pill/oxycodone
+ name = "oxycodone pill"
+ desc = "Used to treat severe to extreme pain. Rapid acting, may cause delirium. Very addictive."
+ icon_state = "pill12"
+ list_reagents = list(/datum/reagent/medicine/painkiller/oxycodone = 5) // Lasts ~1 minute, heals ~20 pain per bodypart (~200 pain)
+ rename_with_volume = TRUE
+
+/obj/item/reagent_containers/syringe/oxycodone
+ name = "syringe (oxycodone)"
+ desc = "Contains three injections of Oxycodone. Used to treat severe to extreme pain. Rapid acting, may cause delirium. Very addictive."
+ list_reagents = list(/datum/reagent/medicine/painkiller/oxycodone = 15)
+
+/obj/item/reagent_containers/pill/aspirin_para_coffee
+ name = "aspirin/paracetamol/caffeine pill"
+ desc = "A mix of Aspirin, Paracetamol and Coffee to produce an effective, but short lasting painkiller with little to no side effects. Do not take multiple at once."
+ list_reagents = list(/datum/reagent/medicine/painkiller/aspirin_para_coffee = 10)
+
+/obj/item/storage/pill_bottle/prescription
+ name = "prescription pill bottle"
+ desc = "Contains prescription pills."
+ /// Typepath of pill type to spawn
+ var/obj/item/reagent_containers/pill/pill_type = null
+ /// Number of pills to spawn
+ var/num_pills = 0
+
+/obj/item/storage/pill_bottle/prescription/Initialize(mapload)
+ . = ..()
+ if(pill_type)
+ name = "[initial(pill_type.name)] bottle"
+ if(num_pills)
+ atom_storage.max_slots = num_pills
+ atom_storage.max_total_storage = num_pills
+
+/obj/item/storage/pill_bottle/prescription/PopulateContents()
+ if(num_pills && pill_type)
+ for(var/i in 1 to num_pills)
+ new pill_type(src)
+
+/obj/item/storage/pill_bottle/painkillers
+ name = "bottle of painkillers"
+ desc = "Contains multiple pills used to treat anywhere from mild to extreme pain. CAUTION: Do not take in conjunction with alcohol."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/chemical.dmi'
+ custom_price = PAYCHECK_CREW * 3
+ custom_premium_price = PAYCHECK_CREW * 3
+
+/obj/item/storage/pill_bottle/painkillers/Initialize(mapload)
+ . = ..()
+ atom_storage.max_slots = 14
+ atom_storage.max_total_storage = 14
+
+/obj/item/storage/pill_bottle/painkillers/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/aspirin(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/ibuprofen(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/paracetamol(src)
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/pill/morphine/diluted(src)
+ for(var/i in 1 to 2)
+ new /obj/item/reagent_containers/pill/oxycodone(src)
+
+/obj/item/reagent_containers/hypospray/medipen/morphine
+ name = "morphine medipen"
+ desc = "A medipen that contains a dosage of painkilling morphine. \
+ WARNING: Do not use in combination with alcohol. Can cause drowsiness and addiction."
+ icon_state = "morphen"
+ inhand_icon_state = "morphen"
+ base_icon_state = "morphen"
+ list_reagents = list(/datum/reagent/medicine/painkiller/morphine = 10) // Heals ~20 pain (per limb)
+
+/// Miner pen. Heals about 30 pain to all limbs, causes ~150 addiction points
+/obj/item/reagent_containers/hypospray/medipen/survival/painkiller
+ name = "survival painkiller medipen"
+ desc = "A medipen that contains a dosage of painkilling chemicals. \
+ WARNING: Do not use in combination with alcohol. Can cause drowsiness."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/syringe.dmi'
+ icon_state = "painkiller_stimpen"
+ base_icon_state = "painkiller_stimpen"
+ volume = 30
+ amount_per_transfer_from_this = 30
+ list_reagents = list(
+ /datum/reagent/medicine/painkiller/paracetamol = 10, // Heals ~10 pain (per limb)
+ /datum/reagent/medicine/painkiller/aspirin_para_coffee = 5, // Heals ~7.5 pain (per limb)
+ /datum/reagent/medicine/painkiller/morphine = 5, // Heals ~10 pain (per limb), causes drowsy
+ /datum/reagent/medicine/synaptizine = 10, // Cures drowsy from morphine
+ )
+
+/// Medkit pen. Heals about 35 pain to all limbs, causes ~450 addiction points
+/obj/item/reagent_containers/hypospray/medipen/emergency_painkiller
+ name = "emergency painkiller medipen"
+ desc = "A medipen that contains a dosage of heavy painkilling chemicals. \
+ WARNING: Do not use in combination with alcohol. Can cause drowsiness and addiction."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/syringe.dmi'
+ icon_state = "painkiller"
+ base_icon_state = "painkiller"
+ volume = 25
+ amount_per_transfer_from_this = 25
+ list_reagents = list(
+ /datum/reagent/medicine/painkiller/oxycodone = 7.5, // Heals ~25 pain (per limb)
+ /datum/reagent/medicine/painkiller/morphine = 5, // Heals ~10 pain (per limb), causes drowsy
+ /datum/reagent/medicine/synaptizine = 10, // Cures drowsyness from morphine
+ )
+
+/obj/item/reagent_containers/hypospray/medipen/brute_painkiller
+ name = "ibaltifen painkiller medipen"
+ desc = "An autoinjector containing ibaltifen, used to treat pain caused by bruises and broken limbs. WARNING: Do not use in combination with alcohol."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/syringe.dmi'
+ icon_state = "burn_painkiller_pen"
+ base_icon_state = "burn_painkiller_pen"
+ inhand_icon_state = "salacid"
+ list_reagents = list(/datum/reagent/medicine/painkiller/specialized/ibaltifen = 10) // ~20-25 pain healing (if brute pain, per limb)
+
+/obj/item/reagent_containers/hypospray/medipen/burn_painkiller
+ name = "anurifen painkiller medipen"
+ desc = "An autoinjector containing anurifen, used to treat pain caused by bruises and broken limbs. WARNING: Do not use in combination with alcohol."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/syringe.dmi'
+ icon_state = "brute_painkiller_pen"
+ base_icon_state = "brute_painkiller_pen"
+ inhand_icon_state = "oxapen"
+ list_reagents = list(/datum/reagent/medicine/painkiller/specialized/anurifen = 10) // ~20-25 pain healing (if burn pain, per limb)
+
+/datum/armor/shock_blanket
+ laser = 20
+ energy = 20
+ bomb = 20
+ bio = 10
+ fire = 100
+ acid = 50
+
+/**
+ * Shock blanket item. Hit someone to cover them with the blanket.
+ * If they lie down and stay still, it will regulate their body temperature.
+ */
+/obj/item/shock_blanket
+ name = "shock blanket"
+ desc = "A metallic looking plastic blanket specifically designed to well insulate anyone seeking comfort underneath."
+ icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/obj/pain_items.dmi'
+ worn_icon = 'monkestation/code/modules/can_spessmen_feel_pain/icons/mob/pain_items.dmi'
+ lefthand_file = 'monkestation/code/modules/can_spessmen_feel_pain/icons/mob/inhands/pain_items_lhand.dmi'
+ righthand_file = 'monkestation/code/modules/can_spessmen_feel_pain/icons/mob/inhands/pain_items_rhand.dmi'
+ icon_state = "shockblanket"
+ base_icon_state = "shockblanket"
+ worn_icon_state = "shockblanket"
+ drop_sound = 'sound/items/handling/cloth_drop.ogg'
+ pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
+ w_class = WEIGHT_CLASS_SMALL
+ slot_flags = ITEM_SLOT_OCLOTHING
+ body_parts_covered = CHEST
+ resistance_flags = FIRE_PROOF
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ armor_type = /datum/armor/shock_blanket
+ equip_delay_self = 3 SECONDS
+ equip_delay_other = 2 SECONDS
+ slowdown = 1.5
+ throwforce = 0
+ throw_speed = 1
+ throw_range = 2
+ custom_price = PAYCHECK_CREW * 2
+
+/obj/item/shock_blanket/Initialize(mapload)
+ . = ..()
+ if(prob(5))
+ name = pick("space blanket", "safety blanket")
+
+ AddElement(/datum/element/bed_tuckable, 0, 0, 0)
+ AddElement(/datum/element/attack_equip)
+
+/obj/item/shock_blanket/examine(mob/user)
+ . = ..()
+ . += span_notice("To use: Apply to a patient experiencing shock or loss of body temperature. Keep patient still and lying down for maximum effect.")
+
+/obj/item/shock_blanket/attack_self(mob/user, modifiers)
+ . = ..()
+ if(.)
+ return
+ if(!user.dropItemToGround(src))
+ return
+
+ var/obj/structure/bed/bed_below = locate(/obj/structure/bed) in loc
+ to_chat(user, span_notice("You lay out [src] on [bed_below ? "[bed_below]" : "the floor"]."))
+ icon_state = "[initial(icon_state)]_dropped"
+ layer = MOB_LAYER
+
+/obj/item/shock_blanket/equipped(mob/user, slot)
+ . = ..()
+ if(!isliving(user))
+ return
+
+ if(slot_flags & slot)
+ RegisterSignal(user, list(COMSIG_LIVING_SET_BODY_POSITION, COMSIG_LIVING_SET_BUCKLED), PROC_REF(check_protection))
+ RegisterSignal(user, list(COMSIG_QDELETING, COMSIG_MOVABLE_PRE_MOVE), PROC_REF(disable_protection))
+ try_enable(user)
+
+/obj/item/shock_blanket/dropped(mob/user, silent)
+ . = ..()
+ disable_protection(user)
+ UnregisterSignal(user, list(COMSIG_LIVING_SET_BODY_POSITION, COMSIG_LIVING_SET_BUCKLED, COMSIG_QDELETING, COMSIG_MOVABLE_PRE_MOVE))
+
+ if(locate(/obj/structure/bed) in loc)
+ icon_state = "[base_icon_state]_dropped"
+ layer = MOB_LAYER
+
+/obj/item/shock_blanket/pickup(mob/user)
+ . = ..()
+ icon_state = base_icon_state
+ layer = initial(layer)
+
+/// If we can enable protection, does so. Returns true on success.
+/obj/item/shock_blanket/proc/try_enable(mob/living/source)
+ if(source.body_position == LYING_DOWN || source.buckled)
+ enable_protection(source)
+ return TRUE
+ return FALSE
+
+/**
+ * Check if we should be recieving temperature protection.
+ * We only give protection if we're lying down or buckled - if we're moving, we don't get anything.
+ */
+/obj/item/shock_blanket/proc/check_protection(mob/living/source)
+ SIGNAL_HANDLER
+
+ if(try_enable(source))
+ return
+
+ disable_protection(source)
+
+/**
+ * Enable the temperature protection.
+ */
+/obj/item/shock_blanket/proc/enable_protection(mob/living/source)
+ if(istype(source) && !(datum_flags & DF_ISPROCESSING))
+ var/temp_change = "warmer"
+ if(source.bodytemperature > source.get_body_temp_normal(apply_change = FALSE))
+ temp_change = "colder"
+
+ to_chat(source, span_notice("You feel [temp_change] as [src] begins regulating your body temperature."))
+ START_PROCESSING(SSobj, src)
+
+/**
+ * Disable the temperature protection.
+ */
+/obj/item/shock_blanket/proc/disable_protection(mob/living/source)
+ SIGNAL_HANDLER
+
+ if(istype(source) && (datum_flags & DF_ISPROCESSING))
+ var/temp_change = "freezing"
+ if(source.bodytemperature > source.get_body_temp_normal(apply_change = FALSE))
+ temp_change = "hotter"
+
+ to_chat(source, span_notice("You feel [temp_change] again as [src] stops regulating your body temperature."))
+
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/shock_blanket/process(seconds_per_tick)
+ var/mob/living/carbon/wearer = loc
+ if(!istype(wearer))
+ disable_protection()
+ return
+
+ var/target_temp = wearer.get_body_temp_normal(apply_change = FALSE)
+ if(wearer.bodytemperature > target_temp)
+ wearer.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, target_temp)
+ else if(wearer.bodytemperature < (target_temp + 1))
+ wearer.adjust_bodytemperature(8 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, target_temp)
+ if(ishuman(wearer))
+ var/mob/living/carbon/human/human_wearer = wearer
+ if(human_wearer.coretemperature > target_temp)
+ human_wearer.adjust_coretemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, target_temp)
+ else if(human_wearer.coretemperature < (target_temp + 1))
+ human_wearer.adjust_coretemperature(8 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, target_temp)
+
+/obj/item/shock_blanket/emergency
+ desc = "An emergency variant shock blanket intended to be placed in medkits for field treatment. Faster to apply to patients, but more restrictive to movement."
+ slowdown = 2.5
+ equip_delay_self = 1.2 SECONDS
+ equip_delay_other = 1.2 SECONDS
+
+/obj/item/shock_blanket/emergency/Initialize(mapload)
+ . = ..()
+ name = "emergency [name]"
+
+// Change the contents of first-aid kids.
+/obj/item/storage/medkit/emergency/Initialize(mapload)
+ . = ..()
+ atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
+ atom_storage.max_slots = 12
+ atom_storage.max_total_storage = 16
+
+/obj/item/storage/medkit/emergency/PopulateContents()
+ if(empty)
+ return
+ var/static/list/items_inside = list(
+ /obj/item/healthanalyzer/simple = 1,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/stack/medical/suture/emergency = 1,
+ /obj/item/stack/medical/ointment = 1,
+ /obj/item/reagent_containers/hypospray/medipen/ekit = 2,
+ /obj/item/reagent_containers/hypospray/medipen/emergency_painkiller = 2,
+ /obj/item/storage/pill_bottle/iron = 1,
+ /obj/item/shock_blanket/emergency = 1,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/medkit/regular/PopulateContents()
+ if(empty)
+ return
+ var/static/list/items_inside = list(
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/stack/medical/suture = 2,
+ /obj/item/stack/medical/mesh = 2,
+ /obj/item/reagent_containers/hypospray/medipen = 1,
+ /obj/item/reagent_containers/hypospray/medipen/morphine = 1,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/medkit/brute/PopulateContents()
+ if(empty)
+ return
+ var/static/list/items_inside = list(
+ /obj/item/reagent_containers/pill/patch/libital = 3,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/storage/pill_bottle/probital = 1,
+ /obj/item/reagent_containers/hypospray/medipen/salacid = 1,
+ /obj/item/reagent_containers/hypospray/medipen/brute_painkiller = 1,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/medkit/fire/PopulateContents()
+ if(empty)
+ return
+ var/static/list/items_inside = list(
+ /obj/item/reagent_containers/pill/patch/aiuri = 3,
+ /obj/item/reagent_containers/spray/hercuri = 1,
+ /obj/item/stack/medical/ointment = 1,
+ /obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
+ /obj/item/reagent_containers/hypospray/medipen/burn_painkiller = 1,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/medkit/advanced/PopulateContents()
+ if(empty)
+ return
+ var/static/list/items_inside = list(
+ /obj/item/reagent_containers/pill/patch/synthflesh = 3,
+ /obj/item/storage/pill_bottle/prescription/aspirin_para_coffee = 1,
+ /obj/item/reagent_containers/hypospray/medipen/atropine = 2,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/storage/pill_bottle/penacid = 1
+ )
+ generate_items_inside(items_inside, src)
+
+// Pain implements added to various vendors.
+/obj/machinery/vending/drugs
+ products_monke = list(
+ /obj/item/storage/pill_bottle/painkillers = 2,
+ )
+
+/obj/machinery/vending/medical
+ products_monke = list(
+ /obj/item/shock_blanket/emergency = 3,
+ /obj/item/temperature_pack/cold = 2,
+ /obj/item/temperature_pack/heat = 2,
+ )
+
+/obj/machinery/vending/wallmed
+ products_monke = list(
+ /obj/item/shock_blanket/emergency = 2,
+ /obj/item/temperature_pack/cold = 1,
+ /obj/item/temperature_pack/heat = 1,
+ )
+
+#undef FROZEN_ITEM_PAIN_RATE
+#undef FROZEN_ITEM_PAIN_MODIFIER
+#undef FROZEN_ITEM_TEMPERATURE_CHANGE
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_goodies.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_goodies.dm
new file mode 100644
index 000000000000..8a37b388760d
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/pain_goodies.dm
@@ -0,0 +1,3 @@
+/obj/item/storage/pill_bottle/prescription/aspirin_para_coffee
+ pill_type = /obj/item/reagent_containers/pill/aspirin_para_coffee
+ num_pills = 3
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/preferences.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/preferences.dm
new file mode 100644
index 000000000000..5e5d3ff76e12
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/preferences.dm
@@ -0,0 +1,13 @@
+/datum/preference/toggle/pain_flashes
+ category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+ savefile_key = "pain_flashes"
+ savefile_identifier = PREFERENCE_PLAYER
+
+ default_value = FALSE
+
+/datum/preference/toggle/pain_messages
+ category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+ savefile_key = "pain_messages"
+ savefile_identifier = PREFERENCE_PLAYER
+
+ default_value = FALSE
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/modified_reagents.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/modified_reagents.dm
new file mode 100644
index 000000000000..fa0289905d61
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/modified_reagents.dm
@@ -0,0 +1,175 @@
+// -- Reagents that modify pain. --
+/datum/reagent
+ /// Modifier applied by this reagent to the mob's pain.
+ /// This is both a multiplicative modifier to their overall received pain,
+ /// and an additive modifier to their per tick pain decay rate.
+ var/pain_modifier = null
+
+/datum/reagent/on_mob_metabolize(mob/living/carbon/user)
+ . = ..()
+ // hi melbert, this should have SHOULD_CALL_PARENT(TRUE)
+ if(isnull(pain_modifier) || !istype(user))
+ return
+
+ if(user.set_pain_mod("[PAIN_MOD_CHEMS]-[name]", pain_modifier) && !user.can_feel_pain())
+ // If the painkiller's strong enough give them an alert
+ user.throw_alert("numbed", /atom/movable/screen/alert/numbed)
+
+/datum/reagent/on_mob_end_metabolize(mob/living/carbon/user)
+ . = ..()
+ if(isnull(pain_modifier) || !istype(user))
+ return
+ user.unset_pain_mod("[PAIN_MOD_CHEMS]-[name]")
+
+/datum/reagent/on_mob_delete(mob/living/L)
+ . = ..()
+ if(!isnull(pain_modifier) && L.can_feel_pain())
+ L.clear_alert("numbed")
+
+// Muscle stimulant is functionally morphine without downsides (it's rare)
+/datum/reagent/medicine/muscle_stimulant
+ pain_modifier = 0.5
+
+// Epinephrine helps pain very very slightly and helps against shock
+/datum/reagent/medicine/epinephrine
+ pain_modifier = 0.9
+
+/datum/reagent/medicine/epinephrine/on_mob_metabolize(mob/living/carbon/M)
+ ..()
+ ADD_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+
+/datum/reagent/medicine/epinephrine/on_mob_end_metabolize(mob/living/carbon/M)
+ REMOVE_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+ ..()
+
+/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
+ . = ..()
+ affected_mob.adjust_pain_shock(-1)
+
+// Atropine fills a simliar niche to epinephrine
+/datum/reagent/medicine/atropine
+ pain_modifier = 0.8
+
+/datum/reagent/medicine/atropine/on_mob_metabolize(mob/living/carbon/M)
+ ..()
+ ADD_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+
+/datum/reagent/medicine/atropine/on_mob_end_metabolize(mob/living/carbon/M)
+ REMOVE_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+ ..()
+
+/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
+ . = ..()
+ affected_mob.adjust_pain_shock(-2)
+
+// Miner's salve is described as a good painkiller
+/datum/reagent/medicine/mine_salve
+ pain_modifier = 0.66
+
+// Determined = fight or flight mode = should have less pain
+/datum/reagent/determination
+ pain_modifier = 0.8
+
+// Drugs reduce pain
+/datum/reagent/drug/space_drugs
+ pain_modifier = 0.8
+
+/datum/reagent/toxin/fentanyl
+ pain_modifier = 0.5
+
+/datum/reagent/drug/cocaine
+ pain_modifier = 0.4
+
+//Alcohol reduces pain based on boozepwr
+/datum/reagent/consumable/ethanol/New()
+ if(boozepwr && isnull(pain_modifier))
+ var/new_pain_modifier = 12 / (boozepwr * 0.2)
+ if(new_pain_modifier < 1)
+ pain_modifier = new_pain_modifier
+ return ..()
+
+/datum/reagent/consumable/ethanol/painkiller
+ pain_modifier = 0.75
+
+// Abductor chem sets pain mod to 0 so abductors can do their surgeries
+/datum/reagent/medicine/cordiolis_hepatico
+ pain_modifier = 0
+
+// Healium functions as an anesthetic
+/datum/reagent/healium
+ pain_modifier = 0.75
+
+/datum/reagent/healium/on_mob_metabolize(mob/living/L)
+ . = ..()
+ L.apply_status_effect(/datum/status_effect/grouped/anesthetic, name)
+
+/datum/reagent/healium/on_mob_end_metabolize(mob/living/L)
+ . = ..()
+ L.remove_status_effect(/datum/status_effect/grouped/anesthetic, name)
+
+// Nitrous Oxide can apply some anesthetic, like the gas
+/datum/reagent/nitrous_oxide
+ pain_modifier = 0.75
+
+/datum/reagent/nitrous_oxide/on_mob_metabolize(mob/living/carbon/user)
+ . = ..()
+ RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), PROC_REF(apply_anesthetic))
+ RegisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), PROC_REF(remove_anesthetic))
+ if(HAS_TRAIT(user, TRAIT_KNOCKEDOUT))
+ apply_anesthetic(user)
+
+/datum/reagent/nitrous_oxide/on_mob_end_metabolize(mob/living/carbon/user)
+ . = ..()
+ UnregisterSignal(user, list(SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT)))
+ remove_anesthetic(user)
+
+/datum/reagent/nitrous_oxide/proc/apply_anesthetic(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ source.apply_status_effect(/datum/status_effect/grouped/anesthetic, type)
+
+/datum/reagent/nitrous_oxide/proc/remove_anesthetic(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ source.remove_status_effect(/datum/status_effect/grouped/anesthetic, type)
+
+// Cryoxadone slowly heals pain, like wounds.
+// It also helps against shock, sort of.
+/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
+ . = ..()
+ if(!.)
+ return
+ var/power = -0.00003 * (affected_mob.bodytemperature ** 2) + 3
+
+ ADD_TRAIT(affected_mob, TRAIT_ABATES_SHOCK, type) // To negate the fact that being cold is bad for shock
+ affected_mob.set_pain_mod(type, 0.5) // Heal pain faster
+ affected_mob.cause_pain(BODY_ZONES_ALL, -0.5 * power * REM * seconds_per_tick)
+ affected_mob.adjust_pain_shock(-power * REM * seconds_per_tick)
+
+/datum/reagent/medicine/cryoxadone/on_mob_end_metabolize(mob/living/carbon/user)
+ . = ..()
+ user.unset_pain_mod(type)
+ REMOVE_TRAIT(user, TRAIT_ABATES_SHOCK, type)
+
+// Saline glucose helps shock
+/datum/reagent/medicine/salglu_solution/on_mob_metabolize(mob/living/carbon/M)
+ . = ..()
+ ADD_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+
+/datum/reagent/medicine/salglu_solution/on_mob_end_metabolize(mob/living/carbon/M)
+ REMOVE_TRAIT(M, TRAIT_ABATES_SHOCK, type)
+ return ..()
+
+// Combat stimulants help against pain
+/datum/reagent/medicine/stimulants
+ pain_modifier = 0.5
+
+/datum/reagent/medicine/changelingadrenaline
+ pain_modifier = 0.5
+
+// Diphenhydrame helps against disgust slightly
+/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+ M.adjust_disgust(-3 * REM * seconds_per_tick )
+
+/datum/reagent/consumable/laughter/on_mob_metabolize(mob/living/carbon/user)
+ pain_modifier = pick(0.8, 1, 1, 1, 1, 1.2)
+ return ..()
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkiller_related.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkiller_related.dm
new file mode 100644
index 000000000000..5a763b6da3b7
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkiller_related.dm
@@ -0,0 +1,50 @@
+// These chems are related to painkillers tangentially
+
+// Component in ibuprofen.
+/datum/reagent/propionic_acid
+ name = "Propionic Acid"
+ description = "A pungent liquid that's often used in preservatives and synthesizing of other chemicals."
+ reagent_state = LIQUID
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ color = "#c7a9c9"
+ ph = 7
+
+// Diphenhydramine can be upgraded into Dimenhydrinate, less good against allergens but better against nausea
+/datum/reagent/medicine/dimenhydrinate
+ name = "Dimenhydrinate"
+ description = "Helps combat nausea and motion sickness."
+ reagent_state = LIQUID
+ color = "#98ffee"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ ph = 10.6
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/medicine/dimenhydrinate/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+ M.adjust_disgust(-8 * REM * seconds_per_tick)
+ if(M.nutrition > NUTRITION_LEVEL_FULL - 25) // Boosts hunger to a bit, assuming you've been vomiting
+ M.adjust_nutrition(2 * HUNGER_FACTOR * REM * seconds_per_tick)
+
+/datum/chemical_reaction/medicine/dimenhydrinate
+ results = list(/datum/reagent/medicine/dimenhydrinate = 3)
+ required_reagents = list(/datum/reagent/medicine/diphenhydramine = 1, /datum/reagent/nitrogen = 1, /datum/reagent/chlorine = 1)
+ optimal_ph_max = 12.5
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+// Good against nausea, easier to make than Dimenhydrinate
+/datum/reagent/medicine/ondansetron
+ name = "Ondansetron"
+ description = "Prevents nausea and vomiting."
+ reagent_state = LIQUID
+ color = "#74d3ff"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ ph = 10.6
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/medicine/ondansetron/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+ if(SPT_PROB(8, seconds_per_tick))
+ M.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
+ if(SPT_PROB(15, seconds_per_tick) && M.get_bodypart_pain(BODY_ZONE_HEAD) <= PAIN_HEAD_MAX / 4)
+ M.cause_pain(BODY_ZONE_HEAD, 4)
+ M.adjust_disgust(-10 * REM * seconds_per_tick)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkillers.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkillers.dm
new file mode 100644
index 000000000000..a217837a0e06
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/reagents/painkillers.dm
@@ -0,0 +1,481 @@
+
+/datum/chemical_reaction/medicine/ondansetron
+ results = list(/datum/reagent/medicine/ondansetron = 3)
+ required_reagents = list(/datum/reagent/fuel/oil = 1, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 1)
+ required_catalysts = list(/datum/reagent/consumable/ethanol = 3)
+ optimal_ph_max = 11
+ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/medicine/aspirin
+ results = list(/datum/reagent/medicine/painkiller/aspirin = 3)
+ required_reagents = list(/datum/reagent/medicine/sal_acid = 1, /datum/reagent/acetone = 1, /datum/reagent/oxygen = 1)
+ required_catalysts = list(/datum/reagent/toxin/acid = 1)
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/medicine/paracetamol
+ results = list(/datum/reagent/medicine/painkiller/paracetamol = 5)
+ required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid/nitracid = 1)
+ optimal_temp = 480
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/medicine/ibuprofen
+ results = list(/datum/reagent/medicine/painkiller/ibuprofen = 5)
+ required_reagents = list(/datum/reagent/propionic_acid = 1, /datum/reagent/phenol = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1)
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/propionic_acid
+ results = list(/datum/reagent/propionic_acid = 3)
+ required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1)
+ required_catalysts = list(/datum/reagent/toxin/acid = 1)
+ is_cold_recipe = TRUE
+ required_temp = 250
+ optimal_temp = 200
+ overheat_temp = 50
+ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL
+
+/datum/chemical_reaction/medicine/aspirin_para_coffee
+ results = list(/datum/reagent/medicine/painkiller/aspirin_para_coffee = 3)
+ required_reagents = list(/datum/reagent/medicine/painkiller/aspirin = 1, /datum/reagent/medicine/painkiller/paracetamol = 1, /datum/reagent/consumable/coffee = 1)
+ optimal_ph_min = 2
+ optimal_ph_max = 12
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/medicine/ibaltifen
+ results = list(/datum/reagent/medicine/painkiller/specialized/ibaltifen = 3)
+ required_reagents = list(/datum/reagent/propionic_acid = 1, /datum/reagent/chlorine = 1, /datum/reagent/copper = 1)
+ required_catalysts = list(/datum/reagent/medicine/c2/libital = 1)
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+/datum/chemical_reaction/medicine/anurifen
+ results = list(/datum/reagent/medicine/painkiller/specialized/anurifen = 3)
+ required_reagents = list(/datum/reagent/propionic_acid= 1, /datum/reagent/fluorine = 1, /datum/reagent/phosphorus = 1)
+ required_catalysts = list(/datum/reagent/medicine/c2/aiuri = 1)
+ reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_HEALING | REACTION_TAG_OTHER | REACTION_TAG_DRUG
+
+// Not really reactions, but I'm leaving these here
+// Gain oxycodone from juicing poppies
+/obj/item/food/grown/poppy
+ juice_results = list(/datum/reagent/medicine/painkiller/oxycodone = 0)
+
+/obj/item/food/grown/poppy/geranium
+ juice_results = list()
+
+/obj/item/food/grown/poppy/lily
+ juice_results = list()
+
+// Painkillers! They help with pain.
+/datum/reagent/medicine/painkiller
+ name = "prescription painkiller"
+
+/datum/reagent/medicine/painkiller/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+
+ // Painkillers make you numb.
+ if(current_cycle >= 5)
+ switch(pain_modifier)
+ if(0 to 0.45)
+ M.add_mood_event("numb", /datum/mood_event/narcotic_heavy, name)
+ if(0.45 to 0.55)
+ M.add_mood_event("numb", /datum/mood_event/narcotic_medium, name)
+ else
+ M.add_mood_event("numb", /datum/mood_event/narcotic_light, name)
+
+ // However, drinking with painkillers is toxic.
+ var/highest_boozepwr = 0
+ for(var/datum/reagent/consumable/ethanol/alcohol in M.reagents.reagent_list)
+ if(alcohol.boozepwr > highest_boozepwr)
+ highest_boozepwr = alcohol.boozepwr
+
+ if(highest_boozepwr > 0)
+ M.apply_damage(round(highest_boozepwr / 33, 0.5) * REM * seconds_per_tick, TOX)
+ . = TRUE
+
+// Morphine is the well known existing painkiller.
+// It's very strong but makes you sleepy. Also addictive.
+/datum/reagent/medicine/painkiller/morphine
+ name = "Morphine"
+ description = "A painkiller that allows the patient to move at full speed even when injured. \
+ Causes drowsiness and eventually unconsciousness in high doses. \
+ Overdose causes minor dizziness and jitteriness."
+ reagent_state = LIQUID
+ color = "#A9FBFB"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM // 0.1 units per second
+ overdose_threshold = 30
+ ph = 8.96
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ addiction_types = list(/datum/addiction/opioids = 30) //5u = 100 progress, 25-30u = addiction
+ // Morphine is THE painkiller
+ pain_modifier = 0.4
+
+/datum/reagent/medicine/painkiller/morphine/on_mob_metabolize(mob/living/L)
+ . = ..()
+ L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+
+/datum/reagent/medicine/painkiller/morphine/on_mob_end_metabolize(mob/living/L)
+ L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+ return ..()
+
+/datum/reagent/medicine/painkiller/morphine/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // Morphine heals a very tiny bit
+ M.adjustBruteLoss(-0.2 * REM * seconds_per_tick, FALSE)
+ M.adjustFireLoss(-0.1 * REM * seconds_per_tick, FALSE)
+ // Morphine heals pain, dur
+ M.cause_pain(BODY_ZONES_ALL, -2.5)
+ // Morphine causes a bit of disgust
+ if(M.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(50 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(2 * REM * seconds_per_tick)
+
+ // The longer we're metabolzing it, the more we get sleepy
+ // for reference: (with 0.1 metabolism rate)
+ // ~2.5 units = 12 cycles = ~30 seconds
+ switch(current_cycle)
+ if(64) //~12
+ to_chat(M, span_warning("You start to feel tired..."))
+ M.adjust_eye_blur(2 SECONDS * REM * seconds_per_tick) // just a hint teehee
+ if(prob(50))
+ M.emote("yawn")
+
+ if(96 to 144) // 20 to 30u
+ if(SPT_PROB(33, seconds_per_tick))
+ M.adjust_drowsiness_up_to(1 * REM * seconds_per_tick, 6 SECONDS)
+
+ if(144 to 192) // 30u to 40u
+ if(SPT_PROB(66, seconds_per_tick))
+ M.adjust_drowsiness_up_to(1 * REM * seconds_per_tick, 12 SECONDS)
+
+ if(192 to INFINITY) //40u onward
+ M.adjust_drowsiness_up_to(1 * REM * seconds_per_tick, 20 SECONDS)
+ M.Sleeping(4 SECONDS * REM * seconds_per_tick)
+
+ ..()
+ return TRUE
+
+/datum/reagent/medicine/painkiller/morphine/overdose_process(mob/living/M, seconds_per_tick, times_fired)
+ ..()
+ if(SPT_PROB(18, seconds_per_tick))
+ M.drop_all_held_items()
+ M.set_dizzy_if_lower(4 SECONDS)
+ M.set_jitter_if_lower(4 SECONDS)
+
+// Aspirin. Bad at headaches, good at everything else, okay at fevers.
+// Use healing chest and limb pain primarily.
+/datum/reagent/medicine/painkiller/aspirin
+ name = "Aspirin"
+ description = "A medication that combats pain and fever. Can cause mild nausea. Overdosing is toxic, and causes high body temperature, sickness, hallucinations, dizziness, and confusion."
+ reagent_state = LIQUID
+ color = "#9c46ff"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 25
+ ph = 6.4
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ pain_modifier = 0.6
+
+/datum/reagent/medicine/painkiller/aspirin/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // Not good at headaches, but very good at treating everything else.
+ M.adjustBruteLoss(-0.1 * REM * seconds_per_tick, FALSE)
+ M.adjustFireLoss(-0.05 * REM * seconds_per_tick, FALSE)
+ // Numbers seem low, but our metabolism is very slow
+ M.cause_pain(BODY_ZONE_HEAD, -0.08 * REM * seconds_per_tick)
+ M.cause_pain(BODY_ZONES_LIMBS, -0.16 * REM * seconds_per_tick)
+ M.cause_pain(BODY_ZONE_CHEST, -0.32 * REM * seconds_per_tick)
+ // Okay at fevers.
+ M.adjust_bodytemperature(-15 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, M.get_body_temp_normal())
+ if(M.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(66 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(1.5 * REM * seconds_per_tick)
+
+ ..()
+ return TRUE
+
+/datum/reagent/medicine/painkiller/aspirin/overdose_process(mob/living/carbon/M, seconds_per_tick, times_fired)
+ if(!istype(M))
+ return
+
+ // On overdose, heat up the body...
+ M.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick)
+ // Causes sickness...
+ M.apply_damage(1 * REM * seconds_per_tick, TOX)
+ if(M.disgust < 100 && SPT_PROB(100 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(3 * REM * seconds_per_tick)
+ // ...Hallucinations after a while...
+ if(current_cycle >= 15 && SPT_PROB(75 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_hallucinations_up_to(6 SECONDS * REM * seconds_per_tick, 40 SECONDS)
+ // ...Dizziness after a longer while...
+ if(current_cycle >= 20 && SPT_PROB(50 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_dizzy_up_to(2 SECONDS * REM * seconds_per_tick, 10 SECONDS)
+ // ...And finally, confusion
+ if(current_cycle >= 25 && SPT_PROB(30 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_confusion_up_to(4 SECONDS, 12 SECONDS)
+ ..()
+ return TRUE
+
+// Paracetamol. Okay at headaches, okay at everything else, bad at fevers, less disgust.
+// Use for general healing every type of pain.
+/datum/reagent/medicine/painkiller/paracetamol // Also known as Acetaminophen, or Tylenol
+ name = "Paracetamol"
+ description = "A painkiller that combats mind to moderate pain, headaches, and low fever. Causes mild nausea. Overdosing causes liver damage, sickness, and can be lethal."
+ reagent_state = LIQUID
+ color = "#fcaeff"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 25
+ ph = 4.7
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ pain_modifier = 0.6
+
+/datum/reagent/medicine/painkiller/paracetamol/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // Good general painkiller.
+ // Numbers seem lowish, but our metabolism is very slow
+ M.adjustBruteLoss(-0.05 * REM * seconds_per_tick, FALSE)
+ M.adjustFireLoss(-0.05 * REM * seconds_per_tick, FALSE)
+ M.adjustToxLoss(-0.05 * REM * seconds_per_tick, FALSE)
+ M.cause_pain(BODY_ZONES_ALL, -0.2 * REM * seconds_per_tick)
+ // Not very good at treating fevers.
+ M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, M.get_body_temp_normal())
+ // Causes liver damage - higher dosages causes more liver damage.
+ M.adjustOrganLoss(ORGAN_SLOT_LIVER, volume / 30 * REM * seconds_per_tick)
+ if(M.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(66 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(1.2 * REM * seconds_per_tick)
+
+ ..()
+ return TRUE
+
+/datum/reagent/medicine/painkiller/paracetamol/overdose_process(mob/living/carbon/M, seconds_per_tick, times_fired)
+ if(!istype(M))
+ return
+
+ // On overdose, cause sickness and liver damage.
+ M.adjustOrganLoss(ORGAN_SLOT_LIVER, 2 * REM * seconds_per_tick)
+ if(M.disgust < 100 && SPT_PROB(100 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(3 * REM * seconds_per_tick)
+
+ return ..()
+
+// Ibuprofen. Best at headaches, best at fevers, less good at everything else.
+// Use for treating head pain primarily.
+/datum/reagent/medicine/painkiller/ibuprofen // Also known as Advil
+ name = "Ibuprofen"
+ description = "A medication that combats mild pain, headaches, and fever. Causes mild nausea and dizziness in higher dosages. Overdosing causes sickness, drowsiness, dizziness, and mild pain."
+ reagent_state = LIQUID
+ color = "#e695ff"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+ ph = 5.6
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ pain_modifier = 0.6
+
+/datum/reagent/medicine/painkiller/ibuprofen/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // Really good at treating headaches.
+ M.adjustBruteLoss(-0.05 * REM * seconds_per_tick, FALSE)
+ M.adjustToxLoss(-0.1 * REM * seconds_per_tick, FALSE)
+ // Heals pain, numbers seem low but our metabolism is very slow
+ M.cause_pain(BODY_ZONE_HEAD, -0.32 * REM * seconds_per_tick)
+ M.cause_pain(BODY_ZONE_CHEST, -0.16 * REM * seconds_per_tick)
+ M.cause_pain(BODY_ZONES_LIMBS, -0.08 * REM * seconds_per_tick)
+ // Causes flat liver damage.
+ M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.25 * REM * seconds_per_tick)
+ // Really good at treating fevers.
+ M.adjust_bodytemperature(-25 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, M.get_body_temp_normal())
+ // Causes more disgust the longer it's in someone...
+ if(M.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(66 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(min(current_cycle * 0.02, 2.4) * REM * seconds_per_tick)
+ // ...and dizziness.
+ if(current_cycle >= 25 && SPT_PROB(30 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_dizzy_up_to(2 SECONDS * REM * seconds_per_tick, 10 SECONDS)
+
+ ..()
+ return TRUE
+
+/datum/reagent/medicine/painkiller/ibuprofen/overdose_process(mob/living/carbon/M, seconds_per_tick, times_fired)
+ if(!istype(M))
+ return
+
+ // On overdose, causes liver damage and chest pain...
+ M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick)
+ M.cause_pain(BODY_ZONE_CHEST, 0.24 * REM * seconds_per_tick)
+ // Sickness...
+ if(M.disgust < 100 && SPT_PROB(100 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_disgust(3 * REM * seconds_per_tick)
+ // ...Drowsyness...
+ if(SPT_PROB(75 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
+ // ...And dizziness
+ if(SPT_PROB(85 * max(1 - creation_purity, 0.5), seconds_per_tick))
+ M.adjust_dizzy(4 SECONDS * REM * seconds_per_tick)
+
+ return ..()
+
+// Combination drug of other painkillers. It's a real thing. Less side effects, heals pain generally, mildly toxic in high doses.
+// Upgrade to paracetamol and aspirin if you go through the effort to get coffee.
+/datum/reagent/medicine/painkiller/aspirin_para_coffee
+ name = "aspirin/paracetamol/caffeine"
+ description = "A combination drug that effectively treats moderate pain with low side effects when used in low dosage. Toxic in higher dosages."
+ reagent_state = LIQUID
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ color = "#e695ff"
+ metabolization_rate = REAGENTS_METABOLISM
+ pain_modifier = 0.75
+
+/datum/reagent/medicine/painkiller/aspirin_para_coffee/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // Heals all pain a bit if in low dosage.
+ if(volume <= 10)
+ // Number looks high, compared to other painkillers,
+ // but we have a comparatively much higher metabolism than them.
+ M.cause_pain(BODY_ZONES_ALL, -2.8 * REM * seconds_per_tick)
+ // Mildly toxic in higher dosages.
+ else if(SPT_PROB(volume * 3, seconds_per_tick))
+ M.apply_damage(3 * REM * seconds_per_tick, TOX)
+ . = TRUE
+
+ ..()
+
+// Oxycodone. Very addictive, heals pain very fast, also a drug.
+/datum/reagent/medicine/painkiller/oxycodone
+ name = "Oxycodone"
+ description = "A drug that rapidly treats major to extreme pain. Highly addictive. Overdose can cause heart attacks."
+ reagent_state = LIQUID
+ color = "#ffcb86"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+ ph = 5.6
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ addiction_types = list(/datum/addiction/opioids = 45) //5u = 150 progress, 15-20u = addiction
+ pain_modifier = 0.35
+
+/datum/reagent/medicine/painkiller/oxycodone/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ M.adjustBruteLoss(-0.3 * REM * seconds_per_tick, FALSE)
+ M.adjustFireLoss(-0.2 * REM * seconds_per_tick, FALSE)
+ M.cause_pain(BODY_ZONES_ALL, -3.4 * REM * seconds_per_tick)
+ M.set_drugginess(20 SECONDS * REM * seconds_per_tick)
+ if(M.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(40, seconds_per_tick))
+ M.adjust_disgust(2 * REM * seconds_per_tick)
+ if(SPT_PROB(33, seconds_per_tick))
+ M.adjust_dizzy_up_to(2 SECONDS * REM * seconds_per_tick, 10 SECONDS)
+
+ ..()
+ return TRUE
+
+/datum/reagent/medicine/painkiller/oxycodone/overdose_process(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+ if(!ishuman(M))
+ return
+
+ var/mob/living/carbon/human/human_mob = M
+ if(SPT_PROB(12, seconds_per_tick))
+ var/can_heart_fail = (!human_mob.undergoing_cardiac_arrest() && human_mob.can_heartattack())
+ var/picked_option = rand(1, (can_heart_fail ? 6 : 3))
+ switch(picked_option)
+ if(1)
+ to_chat(human_mob, span_danger("Your legs don't want to move."))
+ human_mob.Paralyze(6 SECONDS * REM * seconds_per_tick)
+ if(2)
+ to_chat(human_mob, span_danger("Your breathing starts to shallow."))
+ human_mob.losebreath = clamp(human_mob.losebreath + 3 * REM * seconds_per_tick, 0, 12)
+ human_mob.apply_damage((15 / creation_purity), OXY)
+ if(3)
+ human_mob.drop_all_held_items()
+ if(4)
+ to_chat(human_mob, span_danger("You feel your heart skip a beat."))
+ human_mob.set_jitter_if_lower(6 SECONDS * REM * seconds_per_tick)
+ if(5)
+ to_chat(human_mob, span_danger("You feel the world spin."))
+ human_mob.set_dizzy_if_lower(6 SECONDS * REM * seconds_per_tick)
+ if(6)
+ to_chat(human_mob, span_userdanger("You feel your heart seize and stop completely!"))
+ if(human_mob.stat == CONSCIOUS)
+ human_mob.visible_message(span_userdanger("[human_mob] clutches at [human_mob.p_their()] chest as if [human_mob.p_their()] heart stopped!"), ignored_mobs = human_mob)
+ human_mob.emote("scream")
+ human_mob.set_heartattack(TRUE)
+ metabolization_rate *= 4
+ return TRUE
+
+/datum/reagent/medicine/painkiller/hydromorphone
+ name = "Hydromorphone"
+ description = "Pretty sure you wouldn't be able to feel anything"
+ reagent_state = LIQUID
+ color = "#ffcb86"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ pain_modifier = 0.1
+
+/datum/reagent/medicine/painkiller/hydromorphone/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ M.cause_pain(BODY_ZONES_ALL, -12 * REM * seconds_per_tick)
+ ..()
+
+// Future painkiller ideas:
+// - Real world stuff
+// Tramadol
+// Fentanyl (Rework) (Also a potential anesthetic)
+// Hydrocodone (And its combination drugs)
+// Dihydromorphine
+// Pethidine
+// - Space stuff (Suffix: -fen)
+
+// A subtype of painkillers that will heal pain better
+// depending on what type of pain the part's feeling
+/datum/reagent/medicine/painkiller/specialized
+ name = "specialized painkiller"
+ addiction_types = list(/datum/addiction/opioids = 15) //5u = 50 progress, 60u = addiction
+
+ /// How much pain we restore on life ticks, modified by modifiers (yeah?)
+ var/pain_heal_amount = 2.4
+ /// What type of pain are we looking for? If we aren't experiencing this type, it will be 10x less effective
+ var/pain_type_to_look_for
+ /// What type of wound are we looking for? If our bodypart has this wound, it will be 1.5x more effective
+ var/wound_type_to_look_for
+
+/datum/reagent/medicine/painkiller/specialized/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ . = ..()
+ if(!M.pain_controller)
+ return
+
+ for(var/obj/item/bodypart/part as anything in M.bodyparts)
+ if(!IS_ORGANIC_LIMB(part))
+ continue
+
+ var/final_pain_heal_amount = -1 * pain_heal_amount * REM * seconds_per_tick
+ if(pain_type_to_look_for && (part.last_received_pain_type != pain_type_to_look_for))
+ final_pain_heal_amount *= 0.1
+ if(wound_type_to_look_for && (locate(wound_type_to_look_for) in part.wounds))
+ final_pain_heal_amount *= 1.5
+
+ M.cause_pain(part.body_zone, final_pain_heal_amount)
+
+// Libital, but helps pain: ib-alti-fen
+// Heals lots of pain for bruise pain, otherwise lower
+/datum/reagent/medicine/painkiller/specialized/ibaltifen
+ name = "Ibaltifen"
+ description = "A painkiller designed to combat pain caused by broken limbs and bruises."
+ reagent_state = LIQUID
+ color = "#feffae"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ ph = 7.9
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ pain_modifier = 0.75
+ pain_type_to_look_for = BRUTE
+ wound_type_to_look_for = /datum/wound/blunt
+
+/datum/reagent/medicine/painkiller/specialized/ibaltifen/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // a bit of libital influence
+ M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.5 * REM * seconds_per_tick)
+ M.adjustBruteLoss(-0.5 * REM * normalise_creation_purity() * seconds_per_tick)
+ ..()
+ return TRUE
+
+// Aiuri, but helps pain: an-uri-fen
+// Heals lots of pain for burn pain, otherwise lower
+/datum/reagent/medicine/painkiller/specialized/anurifen
+ name = "Anurifen"
+ description = "A painkiller designed to combat pain caused by burns."
+ reagent_state = LIQUID
+ color = "#c4aeff"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ ph = 3.6
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ pain_modifier = 0.75
+ pain_type_to_look_for = BURN
+ wound_type_to_look_for = /datum/wound/burn
+
+/datum/reagent/medicine/painkiller/specialized/anurifen/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired)
+ // a bit of aiuri influence
+ M.adjustOrganLoss(ORGAN_SLOT_EYES, 0.4 * REM * seconds_per_tick)
+ M.adjustFireLoss(-0.5 * REM * normalise_creation_purity() * seconds_per_tick)
+ ..()
+ return TRUE
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/shock.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/shock.dm
new file mode 100644
index 000000000000..279d14a9262b
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/shock.dm
@@ -0,0 +1,207 @@
+// -- Shock from too much pain. --
+/datum/disease/advanced/premade/shock
+ form = "Condition"
+ name = "Shock"
+ spread_text = "Neurogenic" // Only model pain shock
+ category = DISEASE_SHOCK
+ max_stages = 3
+ stage_prob = 1
+ cure_text = "Keep the patient still and lying down, maintain a high body temperature, stop blood loss, \
+ and provide pain relievers while monitoring closely. Epinephrine and Saline-Glucose can also help."
+ agent = "Pain"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ desc = "Occurs when a subject enters a state of shock due to high pain, blood loss, heart difficulties, and other injuries. \
+ If left untreated, the subject may experience cardiac arrest."
+ severity = DISEASE_SEVERITY_DANGEROUS
+ disease_flags = NONE
+ spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
+ visibility_flags = HIDDEN_PANDEMIC
+ bypasses_immunity = TRUE
+ /// How many conditions do we require to get cured?
+ var/conditions_required_to_cure = 4
+ /// How many conditions do we need to not get a heart attack?
+ var/conditions_required_to_maintain = 3
+
+/datum/disease/advanced/premade/shock/after_add()
+ affected_mob.apply_status_effect(/datum/status_effect/low_blood_pressure)
+ affected_mob.set_pain_mod(type, 1.2)
+ antigen = null
+
+/**
+ * Checks which cure conditions we fulfill.
+ *
+ * returns the total number of conditions we fulfill.
+ */
+/datum/disease/advanced/premade/shock/proc/check_cure_conditions()
+ if(!ishuman(affected_mob))
+ return TRUE
+ var/mob/living/carbon/human = affected_mob
+ if(human.undergoing_cardiac_arrest())
+ return FALSE
+ if(affected_mob.stat == DEAD)
+ return FALSE
+
+ // We require [conditions_required_to_cure] of these to be fulfilled to be cured
+ var/conditions_fulfilled = 0
+
+ // Good: Body temperature is stable (not freezing, we don't care about heat)
+ if(affected_mob.bodytemperature > affected_mob.get_body_temp_cold_damage_limit())
+ conditions_fulfilled += 1
+ // Good: Sleeping (or unconscious I guess)
+ if(affected_mob.IsSleeping() || affected_mob.IsUnconscious())
+ conditions_fulfilled += 1
+ // Good: Having this trait (from salgu or epinephrine)
+ if(HAS_TRAIT(affected_mob, TRAIT_ABATES_SHOCK))
+ conditions_fulfilled += 1
+ // Good: Having lower pain
+ switch(affected_mob.pain_controller.get_average_pain())
+ if(-INFINITY to 10)
+ // Almost guarantees you fulfill enough conditions if you get this low, assuming you have no major detractors
+ // Why? It might confuse some people if the person's like, not experiencing any pain at all
+ // but for some reason is still in shock, because they haven't done one of the other conditions arbitrarily
+ conditions_fulfilled += (conditions_required_to_cure + 1)
+ if(10 to 30)
+ conditions_fulfilled += 3
+ if(30 to 40)
+ conditions_fulfilled += 2
+ if(40 to 50)
+ conditions_fulfilled += 1
+
+ // Good: Painkillers (while conscious / in soft crit)
+ if(affected_mob.stat <= SOFT_CRIT && !affected_mob.can_feel_pain())
+ conditions_fulfilled += 1
+
+ // Bad: Bleeding
+ if(human.is_bleeding())
+ conditions_fulfilled -= 1
+ // Very bad: Wounds
+ conditions_fulfilled -= min(LAZYLEN(human.all_wounds), 4)
+ // Somewhat bad: Standing up
+ if(affected_mob.body_position == STANDING_UP)
+ conditions_fulfilled -= 2
+ // Bad: In deepcrit (dying)
+ if(affected_mob.stat > SOFT_CRIT)
+ conditions_fulfilled -= 1
+
+ return conditions_fulfilled
+
+/datum/disease/advanced/premade/shock/cure(add_resistance, mob/living/carbon/target)
+ affected_mob.remove_status_effect(/datum/status_effect/low_blood_pressure)
+ affected_mob.unset_pain_mod(type)
+ return ..()
+
+/datum/disease/advanced/premade/shock/activate(seconds_per_tick, times_fired)
+ . = ..()
+ if(!ishuman(affected_mob))
+ return
+
+ if(check_cure_conditions() >= conditions_required_to_cure)
+ cure()
+ return
+ var/mob/living/carbon/human = affected_mob
+ if(!.)
+ return
+
+ if(isnull(affected_mob.pain_controller))
+ cure()
+ return FALSE
+
+ if(affected_mob.stat == DEAD)
+ cure()
+ return FALSE
+
+ var/cure_level = check_cure_conditions()
+ testing("[affected_mob] undergoing shock: [cure_level] cure conditions achieved.")
+
+ // Having a few cure conditions present ([conditions_required_to_maintain]) will keep us below stage 3
+ if(stage > 2 && cure_level >= conditions_required_to_maintain)
+ update_stage(2)
+
+ // If we have enough conditions present to cure us, roll for a cure
+ if(stage <= 2 && has_cure(cure_level) && SPT_PROB(cure_level, seconds_per_tick))
+ to_chat(affected_mob, span_bold(span_green("Your body feels awake and active again!")))
+ cure()
+ return FALSE
+
+ switch(stage)
+ // compensated (or nonprogressive) - still able to sustain themselves
+ // - agitation, anxiety
+ // - nausea or vomiting
+ // - chills
+ if(1)
+ cure_text = "Subject is in stage one of shock. \
+ Provide immediate pain relief and stop blood loss to prevent worsening condition. \
+ Keep the patient still and lying down, and be sure to moderate their temprature. \
+ Supply epinephrine and saline-glucose if condition worsens."
+ if(SPT_PROB(0.5, seconds_per_tick))
+ to_chat(affected_mob, span_danger("Your chest feels uncomfortable."))
+ affected_mob.pain_emote(pick("mumble", "grumble"))
+ affected_mob.flash_pain_overlay(1)
+ if(SPT_PROB(1, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You feel nauseous."))
+ if(prob(50))
+ affected_mob.vomit(35)
+ if(SPT_PROB(2, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You feel anxious."))
+ affected_mob.adjust_jitter(rand(12 SECONDS, 16 SECONDS))
+ if(SPT_PROB(6, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You feel cold."))
+ affected_mob.pain_emote("shiver", 3 SECONDS)
+ affected_mob.adjust_bodytemperature(-5 * seconds_per_tick, affected_mob.get_body_temp_cold_damage_limit() + 5) // Not lethal
+
+ // decompensated (or progressive) - unable to maintain themselves
+ // - mental issues
+ // - difficulty breathing / high heart rate
+ // - decrease in body temperature
+ if(2)
+ cure_text = "Subject is in stage one of shock. \
+ Provide immediate pain relief and stop blood loss to prevent cardiac arrest. \
+ Keep the patient still and lying down, and be sure to moderate their temprature. \
+ Supply epinephrine and saline-glucose if condition worsens."
+
+ if(SPT_PROB(10, seconds_per_tick))
+ affected_mob.adjust_stutter_up_to(10 SECONDS, 120 SECONDS)
+ if(SPT_PROB(1, seconds_per_tick))
+ to_chat(affected_mob, span_danger("Your chest feels wrong!"))
+ affected_mob.pain_emote(pick("mumble", "grumble"))
+ affected_mob.flash_pain_overlay(2)
+ if(SPT_PROB(2, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You can't focus on anything!"))
+ affected_mob.adjust_confusion(rand(4 SECONDS, 8 SECONDS))
+ if(SPT_PROB(2, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You're having difficulties breathing!"))
+ affected_mob.losebreath = clamp(affected_mob.losebreath + 4, 0, 12)
+ if(SPT_PROB(2, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You skip a breath!"))
+ affected_mob.pain_emote("gasp", 3 SECONDS)
+ affected_mob.apply_damage(rand(5, 15), OXY)
+ if(SPT_PROB(1, seconds_per_tick))
+ affected_mob.emote("faint")
+ if(SPT_PROB(8, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You feel freezing!"))
+ affected_mob.pain_emote("shiver", 3 SECONDS)
+ affected_mob.adjust_bodytemperature(-10 * seconds_per_tick, affected_mob.get_body_temp_cold_damage_limit() - 5) // uh oh
+
+ // irreversible - point of no return, system failure
+ // cardiac arrest
+ if(3)
+ cure_text = "Subject is in stage three of shock. Cardiac arrest is imminent - urgent action is needed. \
+ Prepare a defibrillator on standby and moderate their body temperature."
+ if(SPT_PROB(10, seconds_per_tick))
+ affected_mob.adjust_stutter_up_to(10 SECONDS, 120 SECONDS)
+ if(SPT_PROB(8, seconds_per_tick))
+ affected_mob.adjust_slurring_up_to(10 SECONDS, 36 SECONDS)
+ if(SPT_PROB(2, seconds_per_tick))
+ affected_mob.emote("faint")
+ if(SPT_PROB(33, seconds_per_tick))
+ if(human.can_heartattack())
+ to_chat(affected_mob, span_userdanger("Your heart stops!"))
+ affected_mob.visible_message(span_danger("[affected_mob] grabs at their chest and collapses!"), ignored_mobs = affected_mob)
+ human.set_heartattack(TRUE)
+ cure()
+ return FALSE
+ else
+ affected_mob.losebreath += 10
+ else if(SPT_PROB(10, seconds_per_tick))
+ to_chat(affected_mob, span_userdanger(pick("You feel your heart skip a beat...", "You feel your body shutting down...", "You feel your heart beat irregularly...")))
+ affected_mob.adjust_bodytemperature(-10 * seconds_per_tick, affected_mob.get_body_temp_cold_damage_limit() - 20) // welp
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/species.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/species.dm
new file mode 100644
index 000000000000..9a1c06ef3bbb
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/species.dm
@@ -0,0 +1,4 @@
+/// -- Extensions of species and species procs. --
+/datum/species
+ /// Pain modifier that this species receives.
+ var/species_pain_mod = 1
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/anesthetics.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/anesthetics.dm
new file mode 100644
index 000000000000..03f24a52b8a0
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/anesthetics.dm
@@ -0,0 +1,42 @@
+/// Anesthetics, for use in surgery - to stop pain.
+/datum/status_effect/grouped/anesthetic
+ id = "anesthetics"
+ alert_type = /atom/movable/screen/alert/status_effect/anesthetics
+
+/datum/status_effect/grouped/anesthetic/on_creation(mob/living/new_owner, source)
+ if(!istype(get_area(new_owner), /area/station/medical))
+ // if we're NOT in medical, give no alert. N2O floods or whatever.
+ alert_type = null
+
+ return ..()
+
+/datum/status_effect/grouped/anesthetic/on_apply()
+ . = ..()
+ RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), PROC_REF(try_removal))
+
+/datum/status_effect/grouped/anesthetic/on_remove()
+ . = ..()
+ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT))
+
+/datum/status_effect/grouped/anesthetic/get_examine_text()
+ return span_warning("[owner.p_Theyre()] out cold.")
+
+/datum/status_effect/grouped/anesthetic/proc/try_removal(datum/source)
+ SIGNAL_HANDLER
+
+ if(HAS_TRAIT(owner, TRAIT_KNOCKEDOUT))
+ return
+
+ qdel(src)
+
+/atom/movable/screen/alert/status_effect/anesthetics
+ name = "Anesthetic"
+ desc = "Everything's woozy... The world goes dark... You're on anesthetics. \
+ Good luck in surgery! If it's actually surgery, that is."
+ icon_state = "paralysis"
+
+// Extend "too much N2O" so we can apply anesthesia if it knocks the guy out
+/obj/item/organ/internal/lungs/too_much_n2o(mob/living/carbon/breather, datum/gas_mixture/breath, n2o_pp, old_n2o_pp)
+ . = ..()
+ if(HAS_TRAIT(breather, TRAIT_KNOCKEDOUT))
+ breather.apply_status_effect(/datum/status_effect/grouped/anesthetic, /datum/gas/nitrous_oxide)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/fire_pain.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/fire_pain.dm
new file mode 100644
index 000000000000..b359a5a477b6
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/fire_pain.dm
@@ -0,0 +1,42 @@
+/// Handler for pain from fire. Goes up the longer you're on fire, largely goes away when extinguished
+/datum/status_effect/pain_from_fire
+ id = "sharp_pain_from_fire"
+ status_type = STATUS_EFFECT_REFRESH
+ alert_type = null
+ remove_on_fullheal = TRUE
+ heal_flag_necessary = HEAL_ADMIN|HEAL_WOUNDS|HEAL_STATUS
+
+ /// Amount of pain being given
+ var/pain_amount = 0
+
+/datum/status_effect/pain_from_fire/on_creation(mob/living/new_owner, pain_amount = 0)
+ src.pain_amount = pain_amount
+ return ..()
+
+/datum/status_effect/pain_from_fire/refresh(mob/living/new_owner, added_pain_amount = 0)
+ if(added_pain_amount <= 0)
+ return
+ pain_amount += added_pain_amount
+ owner.cause_pain(BODY_ZONES_ALL, added_pain_amount, BURN)
+
+/datum/status_effect/pain_from_fire/on_apply()
+ if(isnull(owner.pain_controller) || pain_amount <= 0)
+ return FALSE
+
+ RegisterSignal(owner, COMSIG_LIVING_EXTINGUISHED, PROC_REF(remove_on_signal))
+ owner.cause_pain(BODY_ZONES_ALL, pain_amount, BURN)
+ return TRUE
+
+/datum/status_effect/pain_from_fire/on_remove()
+ if(QDELING(owner))
+ return
+ UnregisterSignal(owner, COMSIG_LIVING_EXTINGUISHED)
+ owner.cause_pain(BODY_ZONES_ALL, -3 * pain_amount, BURN)
+
+/// When signalled, terminate.
+/datum/status_effect/pain_from_fire/proc/remove_on_signal(datum/source)
+ SIGNAL_HANDLER
+
+ if(QDELING(owner) || QDELING(src))
+ return
+ qdel(src)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/low_blood_pressure.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/low_blood_pressure.dm
new file mode 100644
index 000000000000..30b1d0f40592
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/low_blood_pressure.dm
@@ -0,0 +1,21 @@
+/datum/status_effect/low_blood_pressure
+ id = "low_blood_pressure"
+ tick_interval = -1
+ status_type = STATUS_EFFECT_UNIQUE
+ alert_type = /atom/movable/screen/alert/status_effect/low_blood_pressure
+
+/datum/status_effect/low_blood_pressure/on_apply()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.physiology.bleed_mod *= 0.75
+ return TRUE
+
+/datum/status_effect/low_blood_pressure/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_owner = owner
+ human_owner.physiology.bleed_mod /= 0.75
+
+/atom/movable/screen/alert/status_effect/low_blood_pressure
+ name = "Low blood pressure"
+ desc = "Your blood pressure is low right now. Your organs aren't getting enough blood."
+ icon_state = "highbloodpressure"
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/min_pain.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/min_pain.dm
new file mode 100644
index 000000000000..27fd47b70c97
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/min_pain.dm
@@ -0,0 +1,50 @@
+/// A handler for temporarily increasing the minimum amount of pain a bodypart can be in.
+/datum/status_effect/minimum_bodypart_pain
+ id = "min_bodypart_pain"
+ status_type = STATUS_EFFECT_MULTIPLE
+ alert_type = null
+ remove_on_fullheal = TRUE
+ heal_flag_necessary = HEAL_ADMIN|HEAL_WOUNDS|HEAL_STATUS
+
+ /// The min pain we're setting the bodypart to
+ var/min_amount = 0
+ /// The zone we're afflicting
+ var/targeted_zone = BODY_ZONE_CHEST
+
+/datum/status_effect/minimum_bodypart_pain/on_creation(
+ mob/living/carbon/human/new_owner,
+ targeted_zone,
+ min_amount = 0,
+ duration = 0,
+)
+
+ src.duration = duration
+ src.targeted_zone = targeted_zone
+ src.min_amount = min_amount
+ return ..()
+
+/datum/status_effect/minimum_bodypart_pain/on_apply()
+ if(!ishuman(owner))
+ return FALSE
+
+ var/mob/living/carbon/human/human_owner = owner
+ if(!human_owner.pain_controller)
+ return FALSE
+
+ if(!targeted_zone || min_amount == 0)
+ return FALSE
+
+ var/obj/item/bodypart/afflicted_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ if(!afflicted_bodypart)
+ return FALSE
+
+ human_owner.pain_controller.adjust_bodypart_min_pain(targeted_zone, min_amount)
+ return TRUE
+
+/datum/status_effect/minimum_bodypart_pain/on_remove()
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/afflicted_bodypart = human_owner.pain_controller?.body_zones[targeted_zone]
+ if(!afflicted_bodypart)
+ return
+
+ human_owner.pain_controller.adjust_bodypart_min_pain(targeted_zone, -min_amount)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm
new file mode 100644
index 000000000000..fb2110254ccb
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm
@@ -0,0 +1,68 @@
+/// Limping from extreme pain in the legs.
+/datum/status_effect/limp/pain
+ id = "limp_pain"
+ status_type = STATUS_EFFECT_UNIQUE
+ alert_type = /atom/movable/screen/alert/status_effect/limp/pain
+ remove_on_fullheal = TRUE
+ heal_flag_necessary = HEAL_ADMIN|HEAL_WOUNDS|HEAL_STATUS
+
+/datum/status_effect/limp/pain/on_creation(mob/living/new_owner, obj/item/bodypart/next_leg)
+ src.next_leg = next_leg
+ return ..()
+
+/datum/status_effect/limp/pain/on_apply()
+ . = ..()
+ if(!.)
+ return
+
+ var/mob/living/carbon/human/owner_human = owner
+ if(!owner_human)
+ return FALSE
+ if(!istype(owner_human) || isnull(owner_human?.pain_controller))
+ return FALSE
+
+ RegisterSignals(owner, list(COMSIG_CARBON_PAIN_GAINED, COMSIG_CARBON_PAIN_LOST), PROC_REF(update_limp))
+ owner.pain_message(
+ span_danger("Your [next_leg?.plaintext_zone || "leg"] hurts to walk on!"),
+ span_danger("You struggle to walk on your [next_leg?.plaintext_zone || "leg"]!"),
+ )
+
+/datum/status_effect/limp/pain/get_examine_text()
+ return span_warning("[owner.p_Theyre()] limping with every move.")
+
+/datum/status_effect/limp/pain/on_remove()
+ . = ..()
+ UnregisterSignal(owner, list(COMSIG_CARBON_PAIN_GAINED, COMSIG_CARBON_PAIN_LOST))
+ if(!QDELING(owner))
+ owner.pain_message(
+ span_green("Your pained limp stops!"),
+ span_green("It becomes easier to walk again."),
+ )
+
+/datum/status_effect/limp/pain/update_limp()
+ var/mob/living/carbon/human/limping_human = owner
+
+ left = limping_human.pain_controller.body_zones[BODY_ZONE_L_LEG]
+ right = limping_human.pain_controller.body_zones[BODY_ZONE_R_LEG]
+
+ if(!left && !right)
+ qdel(src)
+ return
+
+ slowdown_left = 0
+ slowdown_right = 0
+
+ if(left?.get_modified_pain() >= 30)
+ slowdown_left = left.get_modified_pain() / 10
+
+ if(right?.get_modified_pain() >= 30)
+ slowdown_right = right.get_modified_pain() / 10
+
+ // this handles losing your leg with the limp and the other one being in good shape as well
+ if(slowdown_left < 3 && slowdown_right < 3)
+ qdel(src)
+ return
+
+/atom/movable/screen/alert/status_effect/limp/pain
+ name = "Pained Limping"
+ desc = "The pain in your legs is unbearable, forcing you to limp!"
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/sharp_pain.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/sharp_pain.dm
new file mode 100644
index 000000000000..d9dfb9c8023c
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/sharp_pain.dm
@@ -0,0 +1,61 @@
+/// Sharp pain. Used for a lot of pain at once, as a little of it is healed after the effect runs out.
+/datum/status_effect/sharp_pain
+ id = "sharp_pain"
+ status_type = STATUS_EFFECT_MULTIPLE
+ alert_type = null
+ remove_on_fullheal = TRUE
+ heal_flag_necessary = HEAL_ADMIN|HEAL_WOUNDS|HEAL_STATUS
+
+ /// Amount of pain being given
+ var/pain_amount = 0
+ /// Type of pain being given
+ var/pain_type
+ /// The amount of pain we had before recieving the sharp pain
+ var/initial_pain_amount = 0
+ /// The zone we're afflicting
+ var/targeted_zone
+
+/datum/status_effect/sharp_pain/on_creation(
+ mob/living/carbon/human/new_owner,
+ targeted_zone,
+ pain_amount = 0,
+ pain_type = BRUTE,
+ duration = 0,
+)
+
+ src.duration = duration
+ src.targeted_zone = targeted_zone
+ src.pain_amount = pain_amount
+ src.pain_type = pain_type
+ return ..()
+
+/datum/status_effect/sharp_pain/on_apply()
+ if(!ishuman(owner))
+ return FALSE
+
+ var/mob/living/carbon/human/human_owner = owner
+ if(!human_owner.pain_controller)
+ return FALSE
+
+ if(!targeted_zone || pain_amount == 0)
+ return FALSE
+
+ var/obj/item/bodypart/afflicted_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ if(!afflicted_bodypart)
+ return FALSE
+
+ initial_pain_amount = afflicted_bodypart.pain
+ human_owner.pain_controller.adjust_bodypart_pain(targeted_zone, pain_amount, pain_type)
+ return TRUE
+
+/datum/status_effect/sharp_pain/on_remove()
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/afflicted_bodypart = human_owner.pain_controller?.body_zones[targeted_zone]
+ if(!afflicted_bodypart)
+ return
+
+ var/healed_amount = pain_amount * -0.33
+ if((afflicted_bodypart.pain + healed_amount) < initial_pain_amount)
+ healed_amount = initial_pain_amount - afflicted_bodypart.pain
+
+ human_owner.pain_controller.adjust_bodypart_pain(targeted_zone, healed_amount, pain_type)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/temp_pack.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/temp_pack.dm
new file mode 100644
index 000000000000..bc5f230aff60
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/temp_pack.dm
@@ -0,0 +1,171 @@
+/// Status effects applied when pressing a hot or cold item onto a bodypart, to soothe pain.
+/datum/status_effect/temperature_pack
+ id = "temp_pack"
+ status_type = STATUS_EFFECT_MULTIPLE
+ on_remove_on_mob_delete = TRUE
+ tick_interval = 5 SECONDS
+ processing_speed = STATUS_EFFECT_NORMAL_PROCESS
+ alert_type = null
+ /// The item we're using to heal pain.
+ var/obj/item/pressed_item
+ /// The mob holding the [pressed_item] to [owner]. Can be [owner].
+ var/mob/living/holder
+ /// The zone we're healing.
+ var/targeted_zone = BODY_ZONE_CHEST
+ /// The amount we heal per tick. Positive number.
+ var/pain_heal_amount = 0
+ /// The pain modifier placed on the limb.
+ var/pain_modifier = 1
+ /// The change in temperature while applied.
+ var/temperature_change = 0
+
+/datum/status_effect/temperature_pack/on_creation(
+ mob/living/new_owner,
+ mob/living/holder,
+ obj/item/pressed_item,
+ targeted_zone = BODY_ZONE_CHEST,
+ pain_heal_amount = 0,
+ pain_modifier = 1,
+ temperature_change = 0,
+)
+
+ src.holder = holder
+ src.pressed_item = pressed_item
+ src.targeted_zone = targeted_zone
+ src.pain_heal_amount = pain_heal_amount
+ src.pain_modifier = pain_modifier
+ src.temperature_change = temperature_change
+ return ..()
+
+/datum/status_effect/temperature_pack/on_apply()
+ if(!ishuman(owner))
+ return FALSE
+
+ var/mob/living/carbon/human/human_owner = owner
+ if(!human_owner.pain_controller || human_owner.stat == DEAD)
+ return FALSE
+
+ if(QDELETED(pressed_item))
+ return FALSE
+
+ if(QDELETED(holder))
+ return FALSE
+
+ for(var/datum/status_effect/temperature_pack/pre_existing_effect in owner.status_effects)
+ if(pre_existing_effect == src)
+ continue
+ if(pre_existing_effect.targeted_zone == targeted_zone)
+ return FALSE
+
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ if(!held_bodypart)
+ return FALSE
+
+ held_bodypart.bodypart_pain_modifier *= pain_modifier
+ pressed_item.AddComponent(/datum/component/make_item_slow)
+ RegisterSignal(pressed_item, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED, COMSIG_TEMPERATURE_PACK_EXPIRED), PROC_REF(stop_effects))
+ if(holder != owner)
+ RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(check_adjacency))
+ return TRUE
+
+/datum/status_effect/temperature_pack/tick()
+ if(QDELETED(holder) || QDELETED(pressed_item) || owner.stat == DEAD || !holder.is_holding(pressed_item))
+ stop_effects(silent = TRUE)
+ return
+
+ var/mob/living/carbon/human/human_owner = owner
+ if(!human_owner.get_bodypart_pain(targeted_zone, TRUE))
+ stop_effects(silent = FALSE)
+ return
+
+ if(temperature_change)
+ owner.adjust_bodytemperature(temperature_change, human_owner.get_body_temp_cold_damage_limit() + 5, human_owner.get_body_temp_heat_damage_limit() - 5)
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ if(held_bodypart && prob(66))
+ human_owner.cause_pain(targeted_zone, -pain_heal_amount)
+ if(prob(10))
+ to_chat(human_owner, span_italics(span_notice("[pressed_item] dulls the pain in your [held_bodypart.name] a little.")))
+
+/**
+ * Check on move whether [holder] is still adjacent to [owner].
+ */
+/datum/status_effect/temperature_pack/proc/check_adjacency(datum/source)
+ SIGNAL_HANDLER
+
+ if(!in_range(holder, owner))
+ stop_effects(silent = FALSE)
+
+/**
+ * Stop the effects of this status effect, deleting it, and sending a message if [silent] is TRUE.
+ */
+/datum/status_effect/temperature_pack/proc/stop_effects(datum/source, silent = FALSE)
+ SIGNAL_HANDLER
+
+ if(!silent && !QDELETED(holder) && !QDELETED(pressed_item))
+ to_chat(holder, span_notice("You stop pressing [pressed_item] against [owner == holder ? "yourself":"[owner]"]."))
+ qdel(src)
+
+/datum/status_effect/temperature_pack/on_remove()
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller?.body_zones[targeted_zone]
+ held_bodypart?.bodypart_pain_modifier /= pain_modifier
+ qdel(pressed_item.GetComponent(/datum/component/make_item_slow))
+ UnregisterSignal(pressed_item, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED, COMSIG_TEMPERATURE_PACK_EXPIRED))
+ UnregisterSignal(holder, COMSIG_MOVABLE_MOVED)
+
+ pressed_item = null
+ holder = null
+
+/// Cold stuff needs to stay cold.
+/datum/status_effect/temperature_pack/cold
+ id = "cold_pack"
+ temperature_change = -2
+
+/datum/status_effect/temperature_pack/cold/on_apply()
+ . = ..()
+ if(!.)
+ return
+
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ to_chat(human_owner, span_green("You wince as [owner == holder ? "you press" : "[holder] presses"] [pressed_item] against your [parse_zone(held_bodypart.body_zone)], but eventually the chill starts to dull the pain."))
+ human_owner.pain_emote("wince", 3 SECONDS)
+
+/datum/status_effect/temperature_pack/cold/get_examine_text()
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ return span_danger("[holder == owner ? "[owner.p_Theyre()]" : "[holder] is"] pressing a cold [pressed_item.name] against [owner.p_their()] [parse_zone(held_bodypart.body_zone)].")
+
+/datum/status_effect/temperature_pack/cold/tick()
+ if(pressed_item.resistance_flags & ON_FIRE)
+ stop_effects(silent = TRUE)
+ return
+
+ return ..()
+
+/// And warm stuff needs to stay warm.
+/datum/status_effect/temperature_pack/heat
+ id = "heat_pack"
+ temperature_change = 2
+
+/datum/status_effect/temperature_pack/heat/on_apply()
+ . = ..()
+ if(!.)
+ return
+
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ to_chat(human_owner, span_green("You gasp as [owner == holder ? "you press" : "[holder] presses"] [pressed_item] against your [held_bodypart.name], but eventually the warmth starts to dull the pain."))
+ human_owner.pain_emote("gasp", 3 SECONDS)
+
+/datum/status_effect/temperature_pack/head/get_examine_text()
+ var/mob/living/carbon/human/human_owner = owner
+ var/obj/item/bodypart/held_bodypart = human_owner.pain_controller.body_zones[targeted_zone]
+ return span_danger("[holder == owner ? "[owner.p_Theyre()]" : "[holder] is"] pressing a warm [pressed_item.name] against [owner.p_their()] [held_bodypart.name].")
+
+/datum/status_effect/temperature_pack/heat/tick()
+ if(HAS_TRAIT(pressed_item, TRAIT_FROZEN))
+ stop_effects(silent = TRUE)
+ return
+
+ return ..()
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/traits.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/traits.dm
new file mode 100644
index 000000000000..065b51865734
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/traits.dm
@@ -0,0 +1,101 @@
+// Less vulnerable to pain (lower pain modifier)
+/datum/quirk/pain_resistance
+ name = "Hypoalgesia"
+ desc = "You're more resistant to pain - Your pain naturally decreases faster and you receive less overall."
+ icon = FA_ICON_FIST_RAISED
+ value = 8
+ gain_text = "You feel duller."
+ lose_text = "You feel sharper."
+ medical_record_text = "Patient has Hypoalgesia, and is less susceptible to pain stimuli than most."
+ mail_goodies = list(/obj/item/temperature_pack/heat)
+
+/datum/quirk/pain_resistance/add()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.set_pain_mod(PAIN_MOD_QUIRK, 0.9)
+
+/datum/quirk/pain_resistance/remove()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.unset_pain_mod(PAIN_MOD_QUIRK)
+
+// More vulnerabile to pain (increased pain modifier)
+/datum/quirk/pain_vulnerability
+ name = "Hyperalgesia"
+ desc = "You're less resistant to pain - Your pain naturally decreases slower and you receive more overall."
+ icon = FA_ICON_USER_INJURED
+ value = -6
+ gain_text = span_danger("You feel sharper.")
+ lose_text = span_notice("You feel duller.")
+ medical_record_text = "Patient has Hyperalgesia, and is more susceptible to pain stimuli than most."
+ mail_goodies = list(/obj/item/temperature_pack/cold)
+
+/datum/quirk/pain_vulnerability/add()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.set_pain_mod(PAIN_MOD_QUIRK, 1.15)
+
+/datum/quirk/pain_vulnerability/remove()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.unset_pain_mod(PAIN_MOD_QUIRK)
+
+
+// More vulnerable to pain + get pain from more actions (Glass bones and paper skin)
+/datum/quirk/allodynia
+ name = "Allodynia"
+ desc = "Your nerves are extremely sensitive - you may receive pain from things that wouldn't normally be painful, such as hugs."
+ icon = FA_ICON_TIRED
+ value = -10
+ gain_text = span_danger("You feel fragile.")
+ lose_text = span_notice("You feel less delicate.")
+ medical_record_text = "Patient has Allodynia, and is extremely sensitive to touch, pain, and similar stimuli."
+ mail_goodies = list(/obj/item/temperature_pack/cold, /obj/item/temperature_pack/heat)
+ COOLDOWN_DECLARE(time_since_last_touch)
+
+/datum/quirk/allodynia/add()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.set_pain_mod(PAIN_MOD_QUIRK, 1.2)
+ RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), PROC_REF(cause_body_pain))
+
+/datum/quirk/allodynia/remove()
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(istype(carbon_holder))
+ carbon_holder.unset_pain_mod(PAIN_MOD_QUIRK)
+ UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT))
+
+/**
+ * Causes pain to arm zones if they're targeted, and the chest zone otherwise.
+ *
+ * source - quirk_holder / the mob being touched
+ * toucher - the mob that's interacting with source (pulls, hugs, etc)
+ */
+/datum/quirk/allodynia/proc/cause_body_pain(datum/source, mob/living/toucher)
+ SIGNAL_HANDLER
+
+ if(!COOLDOWN_FINISHED(src, time_since_last_touch))
+ return
+
+ if(quirk_holder.stat != CONSCIOUS)
+ return
+
+ to_chat(quirk_holder, span_danger("[toucher] touches you, causing a wave of sharp pain throughout your [parse_zone(toucher.zone_selected)]!"))
+ actually_hurt(toucher.zone_selected, 9)
+
+/**
+ * Actually cause the pain to the target limb, causing a visual effect, emote, and a negative moodlet.
+ *
+ * zone - the body zone being affected
+ * amount - the amount of pain being added
+ */
+/datum/quirk/allodynia/proc/actually_hurt(zone, amount)
+ var/mob/living/carbon/carbon_holder = quirk_holder
+ if(!istype(carbon_holder))
+ return
+
+ new /obj/effect/temp_visual/annoyed(quirk_holder.loc)
+ carbon_holder.cause_pain(zone, amount)
+ INVOKE_ASYNC(quirk_holder, TYPE_PROC_REF(/mob/living, pain_emote))
+ quirk_holder.add_mood_event("bad_touch", /datum/mood_event/very_bad_touch)
+ COOLDOWN_START(src, time_since_last_touch, 30 SECONDS)
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/readme.md b/monkestation/code/modules/can_spessmen_feel_pain/readme.md
new file mode 100644
index 000000000000..18513d949f33
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/readme.md
@@ -0,0 +1,21 @@
+## Title:
+
+
+MODULE ID: SPESSMAN_PAIN
+
+### Description:
+
+This pr adds a "lite" version of baymed pain to the game.
+
+
+### Included files that are not contained in this module:
+ - defines/monkestation/pain.dm
+
+
+
+### Credits:
+
+
+
+Made by MrMelbert (https://github.com/MrMelbert/MapleStationCode/pull/17)
+Ported and Adapted by Dwasint
diff --git a/monkestation/code/modules/can_spessmen_feel_pain/subsystem.dm b/monkestation/code/modules/can_spessmen_feel_pain/subsystem.dm
new file mode 100644
index 000000000000..690da8aa97f1
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/subsystem.dm
@@ -0,0 +1,5 @@
+PROCESSING_SUBSYSTEM_DEF(pain)
+ name = "Pain"
+ flags = SS_NO_INIT | SS_BACKGROUND
+ priority = 20
+ wait = 2 SECONDS
diff --git a/monkestation/code/modules/cassettes/machines/media/HTML5_player.dm b/monkestation/code/modules/cassettes/machines/media/HTML5_player.dm
index 58c6cd2233da..8e262c8fe272 100644
--- a/monkestation/code/modules/cassettes/machines/media/HTML5_player.dm
+++ b/monkestation/code/modules/cassettes/machines/media/HTML5_player.dm
@@ -18,6 +18,11 @@ function SetMusic(url, time, volume, balance) {
if(url != "") player.addEventListener("canplay", setTime, false);
player.src = url;
}
+function SetVolume(volume, balance) {
+ var player = document.getElementById('player');
+ player.volume = +volume;
+}
+
diff --git a/monkestation/code/modules/cassettes/machines/media/media_manager.dm b/monkestation/code/modules/cassettes/machines/media/media_manager.dm
index 8e0bf91cf616..0d7a15e4d5a5 100644
--- a/monkestation/code/modules/cassettes/machines/media/media_manager.dm
+++ b/monkestation/code/modules/cassettes/machines/media/media_manager.dm
@@ -111,9 +111,10 @@
var/client/owner // Client this is actually running in
var/forced=0 // If true, current url overrides area media sources
var/playerstyle // Choice of which player plugin to use
- var/const/WINDOW_ID = "statwindow.mediapanel" // Which elem in skin.dmf to use
+ var/const/WINDOW_ID = "outputwindow.mediapanel" // Which elem in skin.dmf to use
var/balance=0 // do you know what insanity is? Value from -100 to 100 where -100 is left and 100 is right
var/signal_synced = 0 //used to check if we have our signal created
+ var/lobby_music = FALSE
/datum/media_manager/New(var/client/C)
ASSERT(istype(C))
@@ -130,8 +131,9 @@
/datum/media_manager/proc/send_update()
if(!(owner.prefs))
return
- if(owner.prefs.channel_volume["[CHANNEL_JUKEBOX]"])
- volume *= (owner.prefs.channel_volume["[CHANNEL_JUKEBOX]"] * 0.01)
+ if(!lobby_music)
+ if(owner.prefs.channel_volume["[CHANNEL_JUKEBOX]"])
+ volume = (owner.prefs.channel_volume["[CHANNEL_JUKEBOX]"])
if(!owner.prefs.read_preference(/datum/preference/toggle/hear_music))
owner << output(list2params(list("", (world.time - 0) / 10, volume * 1, 0)), "[WINDOW_ID]:SetMusic")
diff --git a/monkestation/code/modules/cybernetics/augments/_base_changes.dm b/monkestation/code/modules/cybernetics/augments/_base_changes.dm
index 1872722458b7..823287cffc33 100644
--- a/monkestation/code/modules/cybernetics/augments/_base_changes.dm
+++ b/monkestation/code/modules/cybernetics/augments/_base_changes.dm
@@ -88,7 +88,7 @@
bodypart_overlay = new bodypart_overlay_path
bodypart_overlay.unique_properties(src)
ownerlimb.add_bodypart_overlay(bodypart_overlay)
- owner.update_body_parts()
+ owner?.update_body_parts()
return ..()
/obj/item/organ/internal/cyberimp/remove_from_limb()
diff --git a/monkestation/code/modules/cybernetics/minigame/airlock_hacking_datum.dm b/monkestation/code/modules/cybernetics/minigame/airlock_hacking_datum.dm
index b178c5a89ccc..2f7658387e56 100644
--- a/monkestation/code/modules/cybernetics/minigame/airlock_hacking_datum.dm
+++ b/monkestation/code/modules/cybernetics/minigame/airlock_hacking_datum.dm
@@ -44,4 +44,4 @@
* Generates the airlock's hacking datum.
*/
/obj/machinery/door/airlock/proc/set_hacking()
- return new /datum/hacking/airlock(src)
+ //return new /datum/hacking/airlock(src)
diff --git a/monkestation/code/modules/cybernetics/minigame/general_hacking.dm b/monkestation/code/modules/cybernetics/minigame/general_hacking.dm
index 0d81da8bdbc2..4ecdfb84cddd 100644
--- a/monkestation/code/modules/cybernetics/minigame/general_hacking.dm
+++ b/monkestation/code/modules/cybernetics/minigame/general_hacking.dm
@@ -7,12 +7,11 @@ PROCESSING_SUBSYSTEM_DEF(hacking)
/atom
/// Some atoms can be hacked so awesome
- var/datum/hacking/hacking = null
+ var/datum/hacking/hacking
/atom/Destroy(force)
. = ..()
- if(hacking)
- QDEL_NULL(hacking)
+ QDEL_NULL(hacking)
/// Attempts to open the hacking interface
/atom/proc/attempt_hacking_interaction(mob/user)
diff --git a/monkestation/code/modules/factory_type_beat/ai_behaviours/latch_onto.dm b/monkestation/code/modules/factory_type_beat/ai_behaviours/latch_onto.dm
new file mode 100644
index 000000000000..6cb5258f0768
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/ai_behaviours/latch_onto.dm
@@ -0,0 +1,16 @@
+
+/datum/ai_behavior/hunt_target/latch_onto
+
+/datum/ai_behavior/hunt_target/latch_onto/setup(datum/ai_controller/controller, hunting_target_key, hunting_cooldown_key)
+ . = ..()
+ var/mob/living/living_pawn = controller.pawn
+ if(living_pawn.buckled)
+ return FALSE
+
+/datum/ai_behavior/hunt_target/latch_onto/target_caught(mob/living/hunter, obj/hunted)
+ if(hunter.buckled)
+ return FALSE
+ if(!hunted.buckle_mob(hunter, force = TRUE))
+ return FALSE
+ hunted.visible_message(span_notice("[hunted] has been latched onto by [hunter]!"))
+ return TRUE
diff --git a/monkestation/code/modules/factory_type_beat/boulder.dm b/monkestation/code/modules/factory_type_beat/boulder.dm
new file mode 100644
index 000000000000..ce203ade508f
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/boulder.dm
@@ -0,0 +1,284 @@
+/**
+ * The objects that ore vents produce, which is refined into minerals.
+ */
+/obj/item/boulder
+ name = "boulder"
+ desc = "This rocks."
+ icon_state = "ore"
+ icon = 'monkestation/code/modules/factory_type_beat/icons/ore.dmi'
+ item_flags = NO_MAT_REDEMPTION
+ throw_range = 2
+ throw_speed = 0.5
+ drag_slowdown = 1.5 // It's still a big rock.
+ ///When a refinery machine is working on this boulder, we'll set this. Re reset when the process is finished, but the boulder may still be refined/operated on further.
+ var/obj/machinery/bouldertech/processed_by = null
+ /// How many steps of refinement this boulder has gone through. Starts at 5-8, goes down one each machine process.
+ var/durability = 5
+ /// What was the size of the boulder when it was spawned? This is used for inheiriting the icon_state.
+ var/boulder_size = BOULDER_SIZE_SMALL
+ /// Used in inheriting the icon_state from our parent vent in update_icon.
+ var/boulder_string = "boulder"
+ /// Cooldown used to prevents boulders from getting processed back into a machine immediately after being processed.
+ COOLDOWN_DECLARE(processing_cooldown)
+
+ /// Static list of all minerals to populate gulag boulders with.
+ var/list/static/gulag_minerals = list(
+ /datum/material/diamond = 1,
+ /datum/material/gold = 8,
+ /datum/material/iron = 95,
+ /datum/material/plasma = 30,
+ /datum/material/silver = 20,
+ /datum/material/titanium = 8,
+ /datum/material/uranium = 3,
+ )
+ /// Static list of all minerals to populate gulag boulders with, but with bluespace added where safe.
+ var/list/static/expanded_gulag_minerals = list(
+ /datum/material/bluespace = 1,
+ /datum/material/diamond = 1,
+ /datum/material/gold = 8,
+ /datum/material/iron = 94,
+ /datum/material/plasma = 30,
+ /datum/material/silver = 20,
+ /datum/material/titanium = 8,
+ /datum/material/uranium = 3,
+ )
+
+/obj/item/boulder/Initialize(mapload)
+ . = ..()
+ register_context()
+ AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_unwielded = 0, force_wielded = 5) //Heavy as all hell, it's a boulder, dude.
+
+/obj/item/boulder/Destroy(force)
+ SSore_generation.available_boulders -= src
+ processed_by = null
+ return ..()
+
+/obj/item/boulder/examine(mob/user)
+ . = ..()
+ . += span_notice("This boulder would take [durability] more steps to refine or break.")
+
+/obj/item/boulder/examine_more(mob/user)
+ . = ..()
+ . += span_notice("[span_bold("Boulders")] can either be cracked open by [span_bold("mining tools")], or processed into sheets with [span_bold("refineries or smelters")]. Undisturbed boulders can be collected by the [span_bold("BRM")].")
+
+/obj/item/boulder/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+ if(held_item?.tool_behaviour == TOOL_MINING || HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ context[SCREENTIP_CONTEXT_RMB] = "Crush boulder into ore"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/item/boulder/attack_self(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+ if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER)
+ return
+
+/obj/item/boulder/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/item/boulder/CanAllowThrough(atom/movable/mover, border_dir)
+ . = ..()
+ if(istype(mover, /obj/item/boulder)) //This way, boulders can only go one at a time on conveyor belts, but everyone else can go through.
+ return FALSE
+
+/obj/item/boulder/attackby_secondary(obj/item/weapon, mob/user, params)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER) || HAS_TRAIT(weapon, TRAIT_BOULDER_BREAKER))
+ manual_process(weapon, user, INATE_BOULDER_SPEED_MULTIPLIER)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(weapon.tool_behaviour == TOOL_MINING)
+ manual_process(weapon, user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ return ..()
+
+/obj/item/boulder/attack_basic_mob(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+ if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER) //A little hacky but it works around the speed of the blackboard task selection process for now.
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/item/boulder/update_icon_state()
+ . = ..()
+ switch(boulder_size)
+ if(BOULDER_SIZE_SMALL)
+ icon_state = "[boulder_string]_small"
+ if(BOULDER_SIZE_MEDIUM)
+ icon_state = "[boulder_string]_medium"
+ if(BOULDER_SIZE_LARGE)
+ icon_state = "[boulder_string]_large"
+ else
+ icon_state = "[boulder_string]_small"
+
+/**
+ * This is called when a boulder is processed by a mob or tool, and reduces the durability of the boulder.
+ * @param obj/item/weapon The weapon that is being used to process the boulder, that we pull toolspeed from. If null, we use the override_speed_multiplier instead.
+ * @param mob/living/user The mob that is processing the boulder.
+ * @param override_speed_multiplier The speed multiplier to use if weapon is null. The do_after will take 2 * this value seconds to complete.
+ * @param continued Whether or not this is a continued process, or the first one. If true, we don't play the "You swing at the boulder" message.
+ */
+/obj/item/boulder/proc/manual_process(obj/item/weapon, mob/living/user, override_speed_multiplier, continued = FALSE)
+ var/process_speed = 0
+ //Handle weapon conditions.
+ if(weapon)
+ if(HAS_TRAIT(weapon, TRAIT_INSTANTLY_PROCESSES_BOULDERS))
+ durability = 0
+ process_speed = weapon.toolspeed
+ weapon.play_tool_sound(src, 50)
+ if(!continued)
+ to_chat(user, span_notice("You swing at \the [src]..."))
+
+ // Handle user conditions/override conditions.
+ else if (override_speed_multiplier || HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ if(user)
+ if(HAS_TRAIT(user, TRAIT_INSTANTLY_PROCESSES_BOULDERS))
+ durability = 0
+ else if(override_speed_multiplier)
+ process_speed = override_speed_multiplier
+ else
+ process_speed = INATE_BOULDER_SPEED_MULTIPLIER
+ playsound(src, 'sound/effects/rocktap1.ogg', 50)
+ if(!continued)
+ to_chat(user, span_notice("You scrape away at \the [src]... speed is [process_speed]."))
+ else
+ CRASH("No weapon, acceptable user, or override speed multiplier passed to manual_process()")
+ if(durability > 0)
+ if(!do_after(user, (2 * process_speed SECONDS), target = src))
+ return
+ if(!user.Adjacent(src))
+ return
+ durability--
+ user.apply_damage(4, STAMINA)
+ if(durability <= 0)
+ convert_to_ore()
+ to_chat(user, span_notice("You finish working on \the [src], and it crumbles into ore."))
+ playsound(src, 'sound/effects/rock_break.ogg', 50)
+ user.mind?.adjust_experience(/datum/skill/mining, MINING_SKILL_BOULDER_SIZE_XP * 0.2)
+ qdel(src)
+ return
+ var/msg = (durability == 1 ? "is crumbling!" : "looks weaker!")
+ to_chat(user, span_notice("\The [src] [msg]"))
+ manual_process(weapon, user, override_speed_multiplier, continued = TRUE)
+
+/**
+ * This function is called while breaking boulders manually, and drops ore based on the boulder's mineral content.
+ * Quantity of ore spawned here is 1 less than if the boulder was processed by a machine, but clamped at 10 maximum, 1 minimum.
+ */
+/obj/item/boulder/proc/convert_to_ore()
+ for(var/datum/material/picked in custom_materials)
+ var/obj/item/stack/ore/cracked_ore // Take the associated value and convert it into ore stacks...
+ var/quantity = clamp(round((custom_materials[picked] - SHEET_MATERIAL_AMOUNT)/SHEET_MATERIAL_AMOUNT), 1, 10) //but less resources than if they processed it by hand.
+
+ var/cracked_ore_type = picked.ore_type
+ if(isnull(cracked_ore_type))
+ stack_trace("boulder found containing material type [picked.type] with no set ore_type")
+ continue
+ cracked_ore = new cracked_ore_type (drop_location(), quantity)
+ SSblackbox.record_feedback("tally", "ore_mined", quantity, cracked_ore)
+
+/**
+ * Handles the boulder's processing cooldown to check if it's ready to be processed again.
+ */
+/obj/item/boulder/proc/can_get_processed()
+ return COOLDOWN_FINISHED(src, processing_cooldown)
+
+/**
+ * Starts the boulder's processing cooldown.
+ */
+/obj/item/boulder/proc/restart_processing_cooldown()
+ COOLDOWN_START(src, processing_cooldown, 2 SECONDS)
+
+/**
+ * Moves boulder contents to the drop location, and then deletes the boulder.
+ */
+/obj/item/boulder/proc/break_apart()
+ var/list/quips = list("Clang!", "Crack!", "Bang!", "Clunk!", "Clank!")
+ if(length(contents))
+ visible_message(span_notice("[pick(quips)] Something falls out of \the [src]!"))
+ playsound(loc, 'sound/effects/picaxe1.ogg', 60, FALSE)
+ for(var/obj/item/content as anything in contents)
+ content.forceMove(get_turf(src))
+ qdel(src)
+
+/**
+ * This is called when a boulder is spawned from a vent, and is used to set the boulder's icon as well as durability.
+ * We also set our boulder_size variable, which is used for inheiriting the icon_state later on if processed.
+ * @param obj/structure/ore_vent/parent_vent The vent that spawned this boulder to generate consistent boulder icons. If null, we use the default size.
+ * @param size The size of the boulder to spawn. If parent_vent is defined, this is ignored.
+ * @param is_artifact Whether or not this boulder is an artifact boulder. If true, we use the artifact boulder icon state regardless of size.
+ */
+/obj/item/boulder/proc/flavor_boulder(obj/structure/ore_vent/parent_vent, size = BOULDER_SIZE_SMALL, is_artifact = FALSE)
+ var/durability_min = size
+ var/durability_max = size + BOULDER_SIZE_SMALL
+ if(parent_vent)
+ durability_min = parent_vent.boulder_size
+ durability_max = parent_vent.boulder_size + BOULDER_SIZE_SMALL
+ durability = rand(durability_min, durability_max) //randomize durability a bit for some flavor.
+ boulder_size = size
+ if(parent_vent)
+ boulder_size = parent_vent.boulder_size
+ boulder_string = parent_vent.boulder_icon_state
+ update_appearance(UPDATE_ICON_STATE)
+
+/**
+ * Unique proc for gulag-style boulders, which adds a random amount of minerals to the boulder.
+ */
+/obj/item/boulder/proc/add_gulag_minerals()
+ var/datum/material/new_material = pick_weight(gulag_minerals)
+ var/list/new_mats = list()
+ new_mats[new_material] = SHEET_MATERIAL_AMOUNT * rand(1,3) //We only want a few sheets of material in the gulag boulders
+ set_custom_materials(new_mats)
+
+/obj/item/boulder/artifact
+ name = "artifact boulder"
+ desc = "This boulder is brimming with strange energy. Cracking it open could contain something unusual for science."
+ icon_state = "boulder_artifact"
+ /// References to the relic inside the boulder, if any.
+ var/obj/artifact_inside
+
+/obj/item/boulder/artifact/Initialize(mapload)
+ . = ..()
+ artifact_inside = spawn_artifact(src) /// This could be poggers for archaeology in the future.
+
+/obj/item/boulder/artifact/Destroy(force)
+ QDEL_NULL(artifact_inside)
+ return ..()
+
+/obj/item/boulder/artifact/convert_to_ore()
+ . = ..()
+ artifact_inside.forceMove(drop_location())
+ artifact_inside = null
+
+/obj/item/boulder/artifact/break_apart()
+ artifact_inside = null
+ return ..()
+
+
+/obj/item/boulder/gulag
+ name = "low-quality boulder"
+ desc = "This rocks. It's a low quality boulder, so it's probably not worth as much."
+
+/obj/item/boulder/gulag/Initialize(mapload)
+ . = ..()
+ add_gulag_minerals(gulag_minerals)
+
+/obj/item/boulder/gulag_expanded
+ name = "low-density boulder"
+ desc = "This rocks. It's not very well packed, and can't contain as many minerals."
+
+/obj/item/boulder/gulag_expanded/Initialize(mapload)
+ . = ..()
+ add_gulag_minerals(expanded_gulag_minerals)
+
+/obj/item/boulder/shabby
+ name = "shabby boulder"
+ desc = "A bizzare, twisted boulder. Wait, wait no, it's just a rock."
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.1, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.1)
+ durability = 1
diff --git a/monkestation/code/modules/factory_type_beat/circuits.dm b/monkestation/code/modules/factory_type_beat/circuits.dm
new file mode 100644
index 000000000000..61b0fdb7d352
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/circuits.dm
@@ -0,0 +1,46 @@
+/obj/item/circuitboard/machine/brm
+ name = "Boulder Retrieval Matrix"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/bouldertech/brm
+ req_components = list(
+ /datum/stock_part/capacitor = 1,
+ /datum/stock_part/scanning_module = 1,
+ /datum/stock_part/micro_laser = 1,
+ )
+
+/obj/item/circuitboard/machine/refinery
+ name = "Boulder Refinery"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/bouldertech/refinery
+ req_components = list(
+ /obj/item/reagent_containers/cup/beaker = 1,
+ /obj/item/assembly/igniter/condenser = 1,
+ /datum/stock_part/manipulator = 2,
+ /datum/stock_part/matter_bin = 1,
+ )
+
+/obj/item/circuitboard/machine/smelter
+ name = "Boulder Smelter"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/bouldertech/refinery/smelter
+ req_components = list(
+ /obj/item/assembly/igniter = 1,
+ /datum/stock_part/manipulator = 2,
+ /datum/stock_part/matter_bin = 2,
+ )
+
+/obj/item/circuitboard/machine/big_manipulator
+ name = "Big Manipulator"
+ greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+ build_path = /obj/machinery/big_manipulator
+ req_components = list(
+ /datum/stock_part/manipulator = 1,
+ )
+
+/obj/item/circuitboard/machine/assembler
+ name = "Assembler"
+ greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+ build_path = /obj/machinery/assembler
+ req_components = list(
+ /datum/stock_part/manipulator = 1,
+ )
diff --git a/monkestation/code/modules/factory_type_beat/debug.dm b/monkestation/code/modules/factory_type_beat/debug.dm
new file mode 100644
index 000000000000..7f38eebb1485
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/debug.dm
@@ -0,0 +1,49 @@
+/proc/count_lists()
+#ifndef OPENDREAM
+ var/list_count = 0
+ for(var/list/list)
+ list_count++
+
+ var/file = file("data/list_count/[GLOB.round_id].txt")
+
+ WRITE_FILE(file, list_count)
+#endif
+
+/proc/save_types()
+#ifndef OPENDREAM
+ var/datum/D
+ var/atom/A
+ var/list/counts = new
+ for(A) counts[A.type] = (counts[A.type]||0) + 1
+ for(D) counts[D.type] = (counts[D.type]||0) + 1
+
+ var/F = file("data/type_tracker/[GLOB.round_id]-stat_track.txt")
+ for(var/i in counts)
+ WRITE_FILE(F, "[i]\t[counts[i]]\n")
+#endif
+
+/proc/save_datums()
+#ifndef OPENDREAM
+ var/datum/D
+ var/list/counts = new
+ for(D) counts[D.type] = (counts[D.type]||0) + 1
+
+ var/F = file("data/type_tracker/[GLOB.round_id]-datums-[world.time].txt")
+ for(var/i in counts)
+ WRITE_FILE(F, "[i]\t[counts[i]]\n")
+#endif
+
+///these procs don't work on od
+SUBSYSTEM_DEF(memory_stats)
+ name = "Mem Stats"
+ init_order = INIT_ORDER_AIR
+ priority = FIRE_PRIORITY_AIR
+ wait = 5 MINUTES
+ flags = SS_NO_INIT | SS_BACKGROUND
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+/datum/controller/subsystem/memory_stats/fire(resumed)
+ if(world.system_type == MS_WINDOWS)
+ var/memory_summary = call_ext("memorystats", "get_memory_stats")()
+ if(memory_summary)
+ rustg_file_write(memory_summary, "data/mem_stat/[GLOB.round_id]-memstat.txt")
diff --git a/monkestation/code/modules/factory_type_beat/designs.dm b/monkestation/code/modules/factory_type_beat/designs.dm
new file mode 100644
index 000000000000..e8b790b565cb
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/designs.dm
@@ -0,0 +1,236 @@
+#define FABRICATOR_SUBCATEGORY_MATERIALS "/Materials"
+
+/datum/design/manipulator_filter
+ name = "Manipulator Filter"
+ desc = "This can be inserted into a manipulator to give it filters."
+ id = "manipulator_filter"
+ build_path = /obj/item/manipulator_filter
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO
+ )
+ materials = list(/datum/material/iron = 2000)
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/manipulator_filter_cargo
+ name = "Manipulator Filter (Department)"
+ desc = "This can be inserted into a manipulator to give it filters."
+ id = "manipulator_filter_cargo"
+ build_path = /obj/item/manipulator_filter/cargo
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO
+ )
+ materials = list(/datum/material/iron = 2000)
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/manipulator_filter_internal
+ name = "Manipulator Filter (Internal)"
+ desc = "This can be inserted into a manipulator to give it filters."
+ id = "manipulator_filter_internal"
+ build_path = /obj/item/manipulator_filter/internal_filter
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO
+ )
+ materials = list(/datum/material/iron = 2000)
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/board/big_manipulator
+ name = "Big Manipulator Board"
+ desc = "The circuit board for a big manipulator."
+ id = "big_manipulator"
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
+ build_path = /obj/item/circuitboard/machine/big_manipulator
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ENGINEERING
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/board/assembler
+ name = "Assembler Board"
+ desc = "The circuit board for an assembler."
+ id = "assembler"
+ build_path = /obj/item/circuitboard/machine/assembler
+ build_type = COLONY_FABRICATOR | IMPRINTER | AWAY_IMPRINTER
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ENGINEERING
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/dissolution_chamber
+ name = "Dissolution Chamber"
+ id = "dissolution_chamber"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/dissolution_chamber
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/chemical_washer
+ name = "Chemical Washer"
+ id = "chemical_washer"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/chemical_washer
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/chemical_injector
+ name = "Chemical Injector"
+ id = "chemical_injector"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/chemical_injector
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/crystalizer
+ name = "Crystalizer"
+ id = "crystalizer"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/crystalizer
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/crusher
+ name = "Crusher"
+ id = "crusher"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/crusher
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/enricher
+ name = "Enrichment Chamber"
+ id = "enricher"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/enricher
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/purification_chamber
+ name = "Purification Chamber"
+ id = "purification_chamber"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/purification_chamber
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 10 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/brine_chamber
+ name = "Brine Chamber Controller"
+ id = "brine_chamber"
+ build_type = COLONY_FABRICATOR | AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 15,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/ore_processing/brine_chamber
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 30 SECONDS
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO
+
+// Autolathe-able circuitboards for starting with boulder processing machines.
+/datum/design/board/smelter
+ name = "Boulder Smelter"
+ desc = "A circuitboard for a boulder smelter. Lowtech enough to be printed from the lathe."
+ id = "b_smelter"
+ build_type = AUTOLATHE | COLONY_FABRICATOR
+ materials = list(
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/circuitboard/machine/smelter
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_CARGO,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_CARGO
+
+/datum/design/board/refinery
+ name = "Boulder Refinery"
+ desc = "A circuitboard for a boulder refinery. Lowtech enough to be printed from the lathe."
+ id = "b_refinery"
+ build_type = AUTOLATHE | COLONY_FABRICATOR
+ materials = list(
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/circuitboard/machine/refinery
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_CARGO,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_CARGO
+
+
+/datum/design/board/brm
+ name = "Boulder Retrieval Matrix"
+ id = "brm"
+ materials = list(
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/circuitboard/machine/brm
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_TELEPORT,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_CARGO
+
+#undef FABRICATOR_SUBCATEGORY_MATERIALS
diff --git a/monkestation/code/modules/factory_type_beat/effects.dm b/monkestation/code/modules/factory_type_beat/effects.dm
new file mode 100644
index 000000000000..ef0d6fb0adda
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/effects.dm
@@ -0,0 +1,21 @@
+/obj/effect/temp_visual/mining_overlay/vent
+ icon = 'monkestation/code/modules/factory_type_beat/icons/vent_overlays.dmi'
+ icon_state = "unknown"
+ duration = 45
+ pixel_x = 0
+ pixel_y = 0
+ easing_style = CIRCULAR_EASING|EASE_IN
+
+/obj/effect/decal/cleanable/rubble
+ name = "rubble"
+ desc = "A pile of rubble."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/debris.dmi'
+ icon_state = "rubble"
+ mergeable_decal = FALSE
+ beauty = -10
+
+/obj/effect/decal/cleanable/rubble/Initialize(mapload)
+ . = ..()
+ flick("rubble_bounce", src)
+ icon_state = "rubble"
+ update_appearance(UPDATE_ICON_STATE)
diff --git a/monkestation/code/modules/factory_type_beat/flatpacks.dm b/monkestation/code/modules/factory_type_beat/flatpacks.dm
new file mode 100644
index 000000000000..2a08025476cc
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/flatpacks.dm
@@ -0,0 +1,35 @@
+/obj/item/flatpacked_machine/ore_processing
+ icon_state = "colony_lathe_packed"
+
+/obj/item/flatpacked_machine/ore_processing/dissolution_chamber
+ name = "flat-packed dissolution chamber"
+ type_to_deploy = /obj/machinery/bouldertech/dissolution_chamber
+
+/obj/item/flatpacked_machine/ore_processing/chemical_washer
+ name = "flat-packed chemical washer"
+ type_to_deploy = /obj/machinery/bouldertech/chemical_washer
+
+/obj/item/flatpacked_machine/ore_processing/chemical_injector
+ name = "flat-packed chemical injector"
+ type_to_deploy = /obj/machinery/bouldertech/chemical_injector
+
+/obj/item/flatpacked_machine/ore_processing/crystalizer
+ name = "flat-packed crystalizer"
+ type_to_deploy = /obj/machinery/bouldertech/crystalizer
+
+/obj/item/flatpacked_machine/ore_processing/crusher
+ name = "flat-packed crusher"
+ type_to_deploy = /obj/machinery/bouldertech/crusher
+
+/obj/item/flatpacked_machine/ore_processing/enricher
+ name = "flat-packed enrichment chamber"
+ type_to_deploy = /obj/machinery/bouldertech/enricher
+
+/obj/item/flatpacked_machine/ore_processing/purification_chamber
+ name = "flat-packed purification chamber"
+ type_to_deploy = /obj/machinery/bouldertech/purification_chamber
+
+/obj/item/flatpacked_machine/ore_processing/brine_chamber
+ name = "flat-packed brine chamber controller"
+ desc = "This is a massive deploy so clear space (5x5). This acts as the lower left corner"
+ type_to_deploy = /obj/structure/brine_chamber/controller
diff --git a/monkestation/code/modules/factory_type_beat/icons/big_manipulator.dmi b/monkestation/code/modules/factory_type_beat/icons/big_manipulator.dmi
new file mode 100644
index 000000000000..b6e878e18984
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/big_manipulator.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/big_manipulator_core.dmi b/monkestation/code/modules/factory_type_beat/icons/big_manipulator_core.dmi
new file mode 100644
index 000000000000..614b4d51cbbf
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/big_manipulator_core.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi b/monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi
new file mode 100644
index 000000000000..e165441e8052
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/debris.dmi b/monkestation/code/modules/factory_type_beat/icons/debris.dmi
new file mode 100644
index 000000000000..10b73560cbb1
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/debris.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/items.dmi b/monkestation/code/modules/factory_type_beat/icons/items.dmi
new file mode 100644
index 000000000000..9084cf3f8d28
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/items.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/mining.dmi b/monkestation/code/modules/factory_type_beat/icons/mining.dmi
new file mode 100644
index 000000000000..cdc886d85acd
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/mining.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi b/monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi
new file mode 100644
index 000000000000..1be820a1fe41
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/ore.dmi b/monkestation/code/modules/factory_type_beat/icons/ore.dmi
new file mode 100644
index 000000000000..7cc3b8820577
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/ore.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/processing.dmi b/monkestation/code/modules/factory_type_beat/icons/processing.dmi
new file mode 100644
index 000000000000..f154d3c13274
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/processing.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/terrain.dmi b/monkestation/code/modules/factory_type_beat/icons/terrain.dmi
new file mode 100644
index 000000000000..fd930fe709dc
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/terrain.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/icons/vent_overlays.dmi b/monkestation/code/modules/factory_type_beat/icons/vent_overlays.dmi
new file mode 100644
index 000000000000..54ac3d7a819b
Binary files /dev/null and b/monkestation/code/modules/factory_type_beat/icons/vent_overlays.dmi differ
diff --git a/monkestation/code/modules/factory_type_beat/machinery/assembler.dm b/monkestation/code/modules/factory_type_beat/machinery/assembler.dm
new file mode 100644
index 000000000000..65c31219c962
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/assembler.dm
@@ -0,0 +1,333 @@
+/obj/machinery/assembler
+ name = "assembler"
+ desc = "Produces a set recipe when given the materials, some say a small cargo technican is stuck inside making these things."
+ circuit = /obj/item/circuitboard/machine/assembler
+
+ var/speed_multiplier = 1
+ var/datum/crafting_recipe/chosen_recipe
+ var/crafting = FALSE
+
+ var/static/list/crafting_recipes = list()
+ var/list/crafting_inventory = list()
+
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "assembler"
+
+
+/obj/machinery/assembler/Initialize(mapload)
+ . = ..()
+
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+ AddComponent(/datum/component/hovering_information, /datum/hover_data/assembler)
+ register_context()
+
+ if(!length(crafting_recipes))
+ create_recipes()
+
+/obj/machinery/assembler/RefreshParts()
+ . = ..()
+ var/datum/stock_part/manipulator/locate_servo = locate() in component_parts
+ if(!locate_servo)
+ return
+ speed_multiplier = 1 / locate_servo.tier
+
+/obj/machinery/assembler/Destroy()
+ . = ..()
+ for(var/atom/movable/movable in crafting_inventory)
+ movable.forceMove(get_turf(src))
+ crafting_inventory -= movable
+
+/obj/machinery/assembler/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ . = ..()
+ if(chosen_recipe)
+ var/processable = "Accepts: "
+ var/comma = FALSE
+ for(var/atom/atom as anything in chosen_recipe.reqs)
+ if(comma)
+ processable += ", "
+ processable += initial(atom.name)
+ comma = !comma
+ context[SCREENTIP_CONTEXT_MISC] = processable
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/machinery/assembler/examine(mob/user)
+ . = ..()
+ if(chosen_recipe)
+ . += span_notice(chosen_recipe.name)
+ for(var/atom/atom as anything in chosen_recipe.reqs)
+ . += span_notice("[initial(atom.name)]: [chosen_recipe.reqs[atom]]")
+
+/obj/machinery/assembler/proc/create_recipes()
+ for(var/datum/crafting_recipe/recipe as anything in subtypesof(/datum/crafting_recipe) - /datum/crafting_recipe/stack)
+ if(initial(recipe.non_craftable) || !initial(recipe.always_available))
+ continue
+ crafting_recipes += new recipe
+
+/obj/machinery/assembler/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ var/datum/crafting_recipe/choice = tgui_input_list(user, "Choose a recipe", name, crafting_recipes)
+ if(!choice)
+ return
+ chosen_recipe = choice
+ for(var/atom/movable/listed as anything in crafting_inventory)
+ listed.forceMove(get_turf(src))
+ crafting_inventory -= listed
+
+/obj/machinery/assembler/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(!chosen_recipe)
+ return FALSE
+ var/failed = TRUE
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(mover, movable))
+ failed = FALSE
+ break
+ if(failed)
+ return FALSE
+ if(!check_item(mover))
+ return FALSE
+ return ..()
+
+/obj/machinery/assembler/proc/on_entered(datum/source, atom/movable/atom_movable)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(accept_item), atom_movable)
+
+/obj/machinery/assembler/proc/accept_item(atom/movable/atom_movable)
+ if(!chosen_recipe)
+ return
+ if(isstack(atom_movable))
+ var/obj/item/stack/stack = atom_movable
+ if(!(stack.merge_type in chosen_recipe.reqs))
+ return FALSE
+ else
+ var/failed = TRUE
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(atom_movable, movable))
+ failed = FALSE
+ break
+ if(failed)
+ return FALSE
+
+ atom_movable.forceMove(src)
+ crafting_inventory += atom_movable
+ check_recipe_state()
+
+
+/obj/machinery/assembler/can_drop_off(atom/movable/target)
+ if(!check_item(target))
+ return FALSE
+ return TRUE
+
+
+/obj/machinery/assembler/proc/check_item(atom/movable/atom_movable)
+ if(!chosen_recipe)
+ return
+ if(isstack(atom_movable))
+ var/obj/item/stack/stack = atom_movable
+ if(!(stack.merge_type in chosen_recipe.reqs))
+ return FALSE
+
+ if(!isstack(atom_movable))
+ var/failed = TRUE
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(atom_movable, movable))
+ failed = FALSE
+ break
+ if(failed)
+ return FALSE
+
+ var/list/reqs = chosen_recipe.reqs.Copy()
+ for(var/atom/movable/listed in reqs)
+ reqs[listed] *= 10 // we can queue 10 crafts of everything
+
+ for(var/atom/movable/item in crafting_inventory)
+ if(isstack(item))
+ var/obj/item/stack/stack = item
+ if(item in reqs)
+ reqs[item.type] -= stack.amount
+ if(reqs[item.type] <= 0)
+ reqs -= item.type
+ else
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(item, movable))
+ reqs[movable]--
+ if(reqs[movable] <= 0)
+ reqs -= movable
+ if(!length(reqs))
+ return FALSE
+
+ var/passed = FALSE
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(atom_movable, movable))
+ passed = TRUE
+ break
+ if(passed)
+ return TRUE
+
+ if(isstack(atom_movable))
+ var/obj/item/stack/stack = atom_movable
+ if((stack.merge_type in reqs))
+ return TRUE
+
+ return FALSE
+
+
+/obj/machinery/assembler/proc/check_recipe_state()
+ if(!chosen_recipe)
+ return
+ var/list/reqs = chosen_recipe.reqs.Copy()
+ if(!length(reqs))
+ return
+
+ for(var/atom/movable/item in crafting_inventory)
+ if(isstack(item))
+ var/obj/item/stack/stack = item
+ if(stack.merge_type in reqs)
+ reqs[stack.merge_type] -= stack.amount
+ if(reqs[stack.merge_type] <= 0)
+ reqs -= stack.merge_type
+ else
+ for(var/atom/movable/movable as anything in chosen_recipe.reqs)
+ if(istype(item, movable))
+ reqs[movable]--
+ if(reqs[movable] <= 0)
+ reqs -= movable
+ if(!length(reqs))
+ start_craft()
+
+/obj/machinery/assembler/proc/start_craft()
+ if(crafting)
+ return
+ crafting = TRUE
+
+ if(!machine_do_after_visable(src, chosen_recipe.time * speed_multiplier * 3))
+ return
+
+ var/list/requirements = chosen_recipe.reqs
+ var/list/Deletion = list()
+ var/list/stored_parts = list()
+ var/data
+ var/amt
+ var/insanity = 500
+ main_loop:
+ insanity--
+ if(insanity <= 0)
+ return
+ for(var/path_key in requirements)
+ amt = chosen_recipe.reqs?[path_key]
+ if(!amt)//since machinery & structures can have 0 aka CRAFTING_MACHINERY_USE - i.e. use it, don't consume it!
+ continue main_loop
+ if(ispath(path_key, /obj/item/stack))
+ var/obj/item/stack/S
+ var/obj/item/stack/SD
+ while(amt > 0)
+ S = locate(path_key) in crafting_inventory
+ if(S.amount >= amt)
+ if(!locate(S.type) in Deletion)
+ SD = new S.type()
+ Deletion += SD
+ S.use(amt)
+ SD = locate(S.type) in Deletion
+ SD.amount += amt
+ continue main_loop
+ else
+ amt -= S.amount
+ if(!locate(S.type) in Deletion)
+ Deletion += S
+ else
+ data = S.amount
+ S = locate(S.type) in Deletion
+ S.add(data)
+ crafting_inventory -= S
+ else
+ var/atom/movable/I
+ while(amt > 0)
+ I = locate(path_key) in crafting_inventory
+ Deletion += I
+ crafting_inventory -= I
+ amt--
+ var/list/partlist = list(chosen_recipe.parts.len)
+ for(var/M in chosen_recipe.parts)
+ partlist[M] = chosen_recipe.parts[M]
+ for(var/part in chosen_recipe.parts)
+ if(isstack(part))
+ var/obj/item/stack/ST = locate(part) in Deletion
+ if(ST.amount > partlist[part])
+ ST.amount = partlist[part]
+ stored_parts += ST
+ Deletion -= ST
+ continue
+ else
+ while(partlist[part] > 0)
+ var/atom/movable/AM = locate(part) in Deletion
+ stored_parts += AM
+ Deletion -= AM
+ partlist[part] -= 1
+ while(Deletion.len)
+ var/DL = Deletion[Deletion.len]
+ Deletion.Cut(Deletion.len)
+ if(istype(DL, /obj/item/storage))
+ var/obj/item/storage/container = DL
+ container.emptyStorage()
+ else if(isstructure(DL))
+ var/obj/structure/structure = DL
+ structure.dump_contents(structure.drop_location())
+ qdel(DL)
+
+ var/atom/movable/I
+ if(ispath(chosen_recipe.result, /obj/item/stack))
+ I = new chosen_recipe.result(src, chosen_recipe.result_amount || 1)
+ I.forceMove(drop_location())
+ else
+ I = new chosen_recipe.result (src)
+ I.forceMove(drop_location())
+ if(I.atom_storage && chosen_recipe.delete_contents)
+ for(var/obj/item/thing in I)
+ qdel(thing)
+ I.CheckParts(stored_parts, chosen_recipe)
+ I.forceMove(drop_location())
+
+ crafting = FALSE
+ check_recipe_state()
+
+
+/datum/hover_data/assembler
+ var/obj/effect/overlay/hover/recipe_icon
+ var/last_type
+
+/datum/hover_data/assembler/New(datum/component/hovering_information, atom/parent)
+ . = ..()
+ recipe_icon = new(null)
+ recipe_icon.maptext_width = 64
+ recipe_icon.maptext_y = 32
+ recipe_icon.maptext_x = -4
+ recipe_icon.alpha = 125
+
+/datum/hover_data/assembler/setup_data(obj/machinery/assembler/source, mob/enterer)
+ . = ..()
+ if(!source.chosen_recipe)
+ return
+ if(last_type != source.chosen_recipe.result)
+ update_image(source)
+ var/image/new_image = new(source)
+ new_image.appearance = recipe_icon.appearance
+ SET_PLANE_EXPLICIT(new_image, new_image.plane, source)
+ if(!isturf(source.loc))
+ new_image.loc = source.loc
+ else
+ new_image.loc = source
+ add_client_image(new_image, enterer.client)
+
+/datum/hover_data/assembler/proc/update_image(obj/machinery/assembler/source)
+ if(!source.chosen_recipe)
+ return
+ last_type = source.chosen_recipe.result
+
+ var/atom/atom = source.chosen_recipe.result
+
+ recipe_icon.icon = initial(atom.icon)
+ recipe_icon.icon_state = initial(atom.icon_state)
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser.dm
new file mode 100644
index 000000000000..d34edeeed4d4
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser.dm
@@ -0,0 +1,129 @@
+/obj/machinery/atmospherics/components/unary/chemical_infuser
+ name = "chemical infuser"
+ desc = "An afront to both chemists and atmospheric technicans."
+
+ layer = BELOW_OBJ_LAYER
+
+ icon_state = "reaction_chamber"
+ icon = 'icons/obj/plumbing/plumbers.dmi'
+
+ initialize_directions = EAST
+
+ var/static/list/chemical_infuser_recipes = list()
+ var/datum/chemical_infuser_recipe/chosen_recipe
+ var/processing = FALSE
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/Initialize(mapload)
+ . = ..()
+ create_reagents(1000, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/chemical_infuser)
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/set_init_directions()
+ . = ..()
+ switch(dir)
+ if(SOUTH)
+ initialize_directions = EAST
+ if(NORTH)
+ initialize_directions = WEST
+ if(WEST)
+ initialize_directions = SOUTH
+ if(EAST)
+ initialize_directions = NORTH
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/ui_interact(mob/user, datum/tgui/ui)
+ if(!length(chemical_infuser_recipes))
+ create_recipes()
+ chosen_recipe = tgui_input_list(user, "Choose a recipe to focus on.", name, chemical_infuser_recipes)
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/proc/create_recipes()
+ for(var/datum/chemical_infuser_recipe/new_recipes as anything in subtypesof(/datum/chemical_infuser_recipe))
+ chemical_infuser_recipes += new new_recipes
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/examine(mob/user)
+ . = ..()
+ if(chosen_recipe)
+ . += "[chosen_recipe.name] requires:"
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ var/amount = reagents.get_reagent_amount(reagent)
+ . += "[reagent.name]: [amount] / [chosen_recipe.required_reagents[reagent]]"
+ for(var/datum/gas/gas as anything in chosen_recipe.required_gases)
+ var/datum/gas_mixture/mixture = airs[1]
+ mixture.assert_gas(gas)
+ var/gas_amount = mixture.gases[gas][MOLES]
+ . += "[gas.name]: [gas_amount] / [chosen_recipe.required_gases[gas]]"
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/process_atmos()
+ if(!chosen_recipe)
+ return
+
+ var/passes_all_gases = TRUE
+ for(var/datum/gas/gas as anything in chosen_recipe.required_gases)
+ var/datum/gas_mixture/mixture = airs[1]
+ mixture.assert_gas(gas)
+ var/gas_amount = mixture.gases[gas][MOLES]
+ if(gas_amount < chosen_recipe.required_gases[gas])
+ passes_all_gases = FALSE
+ break
+ if(!passes_all_gases)
+ return
+
+ var/passes_all_chemicals = TRUE
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ var/amount = reagents.get_reagent_amount(reagent)
+ if(amount < chosen_recipe.required_reagents[reagent])
+ passes_all_chemicals = FALSE
+ break
+ if(!passes_all_chemicals)
+ return
+
+ if(!processing)
+ playsound(get_turf(src), 'sound/effects/bubbles2.ogg', 25, TRUE)
+ var/list/seen = viewers(4, get_turf(src))
+ var/iconhtml = icon2html(src, seen)
+ audible_message(span_notice("[iconhtml] The solution bubbles fiercely!"))
+ addtimer(CALLBACK(src, PROC_REF(create_recipe)), 7 SECONDS)
+ processing = TRUE
+
+/obj/machinery/atmospherics/components/unary/chemical_infuser/proc/create_recipe()
+ processing = FALSE
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ reagents.remove_all_type(reagent, chosen_recipe.required_reagents[reagent])
+ var/datum/gas_mixture/mixture = airs[1]
+
+ for(var/datum/gas/gas as anything in chosen_recipe.required_gases)
+ mixture.remove_specific(gas, chosen_recipe.required_gases[gas])
+
+ for(var/datum/reagent/reagent as anything in chosen_recipe.outputs)
+ reagents.add_reagent(reagent, chosen_recipe.outputs[reagent])
+
+/datum/component/plumbing/chemical_infuser
+ demand_connects = NORTH
+ supply_connects = SOUTH
+
+/datum/component/plumbing/chemical_infuser/Initialize(start=TRUE, _ducting_layer, _turn_connects=TRUE, datum/reagents/custom_receiver)
+ . = ..()
+ if(!istype(parent, /obj/machinery/atmospherics/components/unary/chemical_infuser))
+ return COMPONENT_INCOMPATIBLE
+
+/datum/component/plumbing/chemical_infuser/can_give(amount, reagent, datum/ductnet/net)
+ . = ..()
+ var/obj/machinery/plumbing/reaction_chamber/reaction_chamber = parent
+ if(!. || !reaction_chamber.emptying || reagents.is_reacting == TRUE)
+ return FALSE
+
+/datum/component/plumbing/chemical_infuser/send_request(dir)
+ var/obj/machinery/atmospherics/components/unary/chemical_infuser/chamber = parent
+ if(!chamber.chosen_recipe)
+ return
+
+ for(var/required_reagent in chamber.chosen_recipe.required_reagents)
+ var/has_reagent = FALSE
+ for(var/datum/reagent/containg_reagent as anything in reagents.reagent_list)
+ if(required_reagent == containg_reagent.type)
+ has_reagent = TRUE
+ if(containg_reagent.volume + CHEMICAL_QUANTISATION_LEVEL < chamber.chosen_recipe.required_reagents[required_reagent])
+ process_request(min(chamber.chosen_recipe.required_reagents[required_reagent] - containg_reagent.volume, MACHINE_REAGENT_TRANSFER) , required_reagent, dir)
+ return
+ if(!has_reagent)
+ process_request(min(chamber.chosen_recipe.required_reagents[required_reagent], MACHINE_REAGENT_TRANSFER), required_reagent, dir)
+ return
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/_base.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/_base.dm
new file mode 100644
index 000000000000..d4cf68eb86cf
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/_base.dm
@@ -0,0 +1,5 @@
+/datum/chemical_infuser_recipe
+ var/name = "Test"
+ var/list/outputs = list()
+ var/list/required_gases = list()
+ var/list/required_reagents = list()
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/sulfur.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/sulfur.dm
new file mode 100644
index 000000000000..1dd00d6b4114
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/chemical_infuser_recipes/sulfur.dm
@@ -0,0 +1,26 @@
+/datum/chemical_infuser_recipe/sulfur
+ name = "Sulfur"
+ required_reagents = list(/datum/reagent/gunpowder = 5)
+ required_gases = list(/datum/gas/oxygen = 5)
+ outputs = list(/datum/reagent/sulfur = 50)
+
+/datum/chemical_infuser_recipe/sulfur_trioxide
+ name = "Sulfur Trioxide"
+
+ required_reagents = list(/datum/reagent/sulfur/dioxide = 5)
+ required_gases = list(/datum/gas/oxygen = 5)
+ outputs = list(/datum/reagent/sulfur/trioxide = 10)
+
+/datum/chemical_infuser_recipe/sulfuric_acid
+ name = "Sulfuric Acid"
+
+ required_gases = list(/datum/gas/oxygen = 5)
+ required_reagents = list(/datum/reagent/sulfur/trioxide = 5)
+ outputs = list(/datum/reagent/toxin/acid = 10)
+
+
+/datum/reagent/sulfur/dioxide
+ name = "Sulfur Dioxide"
+
+/datum/reagent/sulfur/trioxide
+ name = "sulfur Trioxide"
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/_base.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/_base.dm
new file mode 100644
index 000000000000..1823238c1ed7
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/_base.dm
@@ -0,0 +1,5 @@
+/datum/pressurized_reaction
+ var/name = "Test"
+ var/list/outputs = list()
+ var/required_pressure = 0
+ var/list/required_reagents = list()
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/sulfur.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/sulfur.dm
new file mode 100644
index 000000000000..df643cb43e2d
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurised_reactions/sulfur.dm
@@ -0,0 +1,5 @@
+/datum/pressurized_reaction/sulfur_dioxide
+ name = "Sulfur Dioxide"
+ required_pressure = 300
+ required_reagents = list(/datum/reagent/sulfur = 50)
+ outputs = list(/datum/reagent/sulfur/dioxide = 50)
diff --git a/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurized_reaction_chamber.dm b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurized_reaction_chamber.dm
new file mode 100644
index 000000000000..fca6dbfbe1b7
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/atmos_chem/pressurized_reaction_chamber.dm
@@ -0,0 +1,112 @@
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber
+ name = "pressurized reaction chamber"
+ desc = "An afront to both chemists and atmospheric technicans."
+
+ icon_state = "reaction_chamber"
+ icon = 'icons/obj/plumbing/plumbers.dmi'
+
+ initialize_directions = EAST
+
+ var/static/list/pressurized_reaction_recipes = list()
+ var/datum/pressurized_reaction/chosen_recipe
+ var/processing = FALSE
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/Initialize(mapload)
+ . = ..()
+ create_reagents(1000, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/pressurized_reaction_chamber)
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/set_init_directions()
+ . = ..()
+ switch(dir)
+ if(SOUTH)
+ initialize_directions = EAST
+ if(NORTH)
+ initialize_directions = WEST
+ if(WEST)
+ initialize_directions = SOUTH
+ if(EAST)
+ initialize_directions = NORTH
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/ui_interact(mob/user, datum/tgui/ui)
+ if(!length(pressurized_reaction_recipes))
+ create_recipes()
+ chosen_recipe = tgui_input_list(user, "Choose a recipe to focus on.", name, pressurized_reaction_recipes)
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/proc/create_recipes()
+ for(var/datum/pressurized_reaction/new_recipes as anything in subtypesof(/datum/pressurized_reaction))
+ pressurized_reaction_recipes += new new_recipes
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/examine(mob/user)
+ . = ..()
+ if(chosen_recipe)
+ . += "[chosen_recipe.name] requires:"
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ var/amount = reagents.get_reagent_amount(reagent)
+ . += "[reagent.name]: [amount] / [chosen_recipe.required_reagents[reagent]]"
+ . += "[chosen_recipe.required_pressure]kPa of pressure."
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/process_atmos()
+ if(!chosen_recipe)
+ return
+
+ var/passes_all_chemicals = TRUE
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ var/amount = reagents.get_reagent_amount(reagent)
+ if(amount < chosen_recipe.required_reagents[reagent])
+ passes_all_chemicals = FALSE
+ break
+ if(!passes_all_chemicals)
+ return
+ var/datum/gas_mixture/mixture = airs[1]
+ var/pressure = mixture.return_pressure()
+ if(pressure < chosen_recipe.required_pressure)
+ return
+
+ if(!processing)
+ playsound(get_turf(src), 'sound/effects/bubbles2.ogg', 25, TRUE)
+ var/list/seen = viewers(4, get_turf(src))
+ var/iconhtml = icon2html(src, seen)
+ audible_message(span_notice("[iconhtml] The solution bubbles fiercely!"))
+ addtimer(CALLBACK(src, PROC_REF(create_recipe)), 7 SECONDS)
+ processing = TRUE
+
+/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/proc/create_recipe()
+ processing = FALSE
+ for(var/datum/reagent/reagent as anything in chosen_recipe.required_reagents)
+ reagents.remove_all_type(reagent, chosen_recipe.required_reagents[reagent])
+
+ for(var/datum/reagent/reagent as anything in chosen_recipe.outputs)
+ reagents.add_reagent(reagent, chosen_recipe.outputs[reagent])
+
+/datum/component/plumbing/pressurized_reaction_chamber
+ demand_connects = NORTH
+ supply_connects = SOUTH
+
+/datum/component/plumbing/pressurized_reaction_chamber/Initialize(start=TRUE, _ducting_layer, _turn_connects=TRUE, datum/reagents/custom_receiver)
+ . = ..()
+ if(!istype(parent, /obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber))
+ return COMPONENT_INCOMPATIBLE
+
+/datum/component/plumbing/pressurized_reaction_chamber/can_give(amount, reagent, datum/ductnet/net)
+ . = ..()
+ var/obj/machinery/plumbing/reaction_chamber/reaction_chamber = parent
+ if(!. || !reaction_chamber.emptying || reagents.is_reacting == TRUE)
+ return FALSE
+
+/datum/component/plumbing/pressurized_reaction_chamber/send_request(dir)
+ var/obj/machinery/atmospherics/components/unary/pressurized_reaction_chamber/chamber = parent
+ if(!chamber.chosen_recipe)
+ return
+
+ for(var/required_reagent in chamber.chosen_recipe.required_reagents)
+ var/has_reagent = FALSE
+ for(var/datum/reagent/containg_reagent as anything in reagents.reagent_list)
+ if(required_reagent == containg_reagent.type)
+ has_reagent = TRUE
+ if(containg_reagent.volume + CHEMICAL_QUANTISATION_LEVEL < chamber.chosen_recipe.required_reagents[required_reagent])
+ process_request(min(chamber.chosen_recipe.required_reagents[required_reagent] - containg_reagent.volume, MACHINE_REAGENT_TRANSFER) , required_reagent, dir)
+ return
+ if(!has_reagent)
+ process_request(min(chamber.chosen_recipe.required_reagents[required_reagent], MACHINE_REAGENT_TRANSFER), required_reagent, dir)
+ return
diff --git a/monkestation/code/modules/factory_type_beat/machinery/brine_chamber.dm b/monkestation/code/modules/factory_type_beat/machinery/brine_chamber.dm
new file mode 100644
index 000000000000..45fa27f2bde3
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/brine_chamber.dm
@@ -0,0 +1,144 @@
+/obj/structure/brine_chamber
+ name = "brine chamber"
+ desc = "Converts water into brine."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "brine_chamber"
+ density = TRUE
+ anchored = TRUE
+ can_atmos_pass = ATMOS_PASS_NO
+
+
+//pain
+/obj/structure/brine_chamber/proc/assert_sprite()
+ var/obj/structure/brine_chamber/above = locate(/obj/structure/brine_chamber) in get_step(src, NORTH)
+ var/obj/structure/brine_chamber/below = locate(/obj/structure/brine_chamber) in get_step(src, SOUTH)
+ var/obj/structure/brine_chamber/left = locate(/obj/structure/brine_chamber) in get_step(src, WEST)
+ var/obj/structure/brine_chamber/right = locate(/obj/structure/brine_chamber) in get_step(src, EAST)
+
+ if(!above && !below)
+ icon_state = "brine_chamber"
+ return
+ if(above && below)
+ icon_state = "brine_chamber_vertical"
+ return
+ if((above || below) && (left || right))
+ icon_state = "brine_corner"
+ if(above && left)
+ dir = NORTH
+ if(above && right)
+ dir = SOUTH
+ if(below && left)
+ dir = WEST
+ if(below && right)
+ dir = EAST
+
+/obj/structure/brine_chamber/controller/assert_sprite()
+ return
+
+/obj/structure/brine_chamber/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_BLOCK_LIQUID_SPREAD)))
+
+/obj/structure/brine_chamber/controller
+ icon_state = "brine_chamber_controller"
+
+ var/list/turfs = list()
+ var/list/walls = list()
+ var/process_count = 0
+
+/obj/structure/brine_chamber/controller/Initialize(mapload)
+ . = ..()
+ var/turf/our_turf = get_turf(src)
+ var/turf/inner_turf = get_step(src, NORTH)
+ inner_turf = get_step(inner_turf, EAST)
+ var/list/spawn_turfs = CORNER_OUTLINE(inner_turf, 2, 2)
+ var/list/full_turfs = CORNER_BLOCK(our_turf, 4, 4)
+ turfs = full_turfs - spawn_turfs
+
+ for(var/turf/spawned_turf in spawn_turfs)
+ if(spawned_turf == our_turf)
+ continue
+ if(spawned_turf.is_blocked_turf(TRUE))
+ repack()
+ break
+ var/obj/structure/brine_chamber/new_piece = new (spawned_turf)
+ walls += new_piece
+ for(var/obj/structure/brine_chamber/chamber as anything in walls)
+ chamber.assert_sprite()
+
+ create_reagents(3000, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/brine_controller)
+ AddComponent(/datum/component/plumbing/chemical_washer_water)
+ AddElement(/datum/element/repackable, item_to_pack_into = /obj/item/flatpacked_machine/ore_processing/brine_chamber, repacking_time = 3 SECONDS)
+
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/brine_chamber/controller/Destroy()
+ . = ..()
+ repack(TRUE)
+
+/obj/structure/brine_chamber/controller/process(seconds_per_tick)
+ if(process_count < 10)
+ process_count++
+ return
+ process_count = 0
+
+ var/turf/inside_turf = pick(turfs)
+ if(reagents.total_volume)
+ inside_turf.add_liquid_from_reagents(reagents, FALSE, reagents.chem_temp, reagents.total_volume)
+ reagents.remove_all(reagents.total_volume)
+ if(!inside_turf?.liquids)
+ return
+ var/water_volume = inside_turf.liquids.liquid_group.reagents.get_reagent_amount(/datum/reagent/water)
+ inside_turf.liquids.liquid_group.reagents.remove_all_type(/datum/reagent/water, water_volume * 0.1)
+ inside_turf.add_liquid(/datum/reagent/brine, water_volume * 0.1, FALSE, 300)
+
+
+/obj/structure/brine_chamber/controller/proc/repack(from_destroy = FALSE)
+ for(var/atom/movable/wall as anything in walls)
+ walls -= wall
+ qdel(wall)
+ if(!from_destroy)
+ new/obj/item/flatpacked_machine/ore_processing/brine_chamber(src.drop_location())
+ turfs = null
+
+
+/datum/component/plumbing/brine_controller
+ supply_connects = SOUTH
+ supply_color = COLOR_GREEN
+ extend_pipe_to_edge = TRUE
+
+ ducting_layer = FOURTH_DUCT_LAYER
+
+
+///returns TRUE when they can give the specified amount and reagent. called by process request
+/datum/component/plumbing/brine_controller/can_give(amount, reagent, datum/ductnet/net)
+ if(amount <= 0)
+ return
+ var/obj/structure/brine_chamber/controller/host = parent
+ var/turf/inside_turf = pick(host.turfs)
+ if(!inside_turf.liquids)
+ return
+
+ if(reagent) //only asked for one type of reagent
+ for(var/datum/reagent/contained_reagent as anything in inside_turf.liquids.liquid_group.reagents.reagent_list)
+ if(contained_reagent.type == reagent)
+ return TRUE
+ else if(inside_turf.liquids.liquid_group.reagents.total_volume) //take whatever
+ return TRUE
+
+ return FALSE
+
+///this is where the reagent is actually transferred and is thus the finish point of our process()
+/datum/component/plumbing/brine_controller/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net)
+ if(!target || !target.reagents)
+ return FALSE
+ var/obj/structure/brine_chamber/controller/host = parent
+ var/turf/inside_turf = pick(host.turfs)
+ if(!inside_turf.liquids)
+ return
+
+ if(reagent)
+ inside_turf.liquids.liquid_group.transfer_specific_reagents(target.recipient_reagents_holder, amount, reagent)
+ else
+ inside_turf.liquids.liquid_group.transfer_specific_reagents(target.recipient_reagents_holder, amount, reagents_to_check = list(/datum/reagent/brine))
diff --git a/monkestation/code/modules/factory_type_beat/machinery/grabber.dm b/monkestation/code/modules/factory_type_beat/machinery/grabber.dm
new file mode 100644
index 000000000000..21ef501f12bf
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/grabber.dm
@@ -0,0 +1,506 @@
+/// Manipulator Core. Main part of the mechanism that carries out the entire process.
+/obj/machinery/big_manipulator
+ name = "Big Manipulator"
+ desc = "Take and drop objects. Innovation..."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_core.dmi'
+ icon_state = "core"
+ density = TRUE
+ circuit = /obj/item/circuitboard/machine/big_manipulator
+ greyscale_colors = "#d8ce13"
+ greyscale_config = /datum/greyscale_config/big_manipulator
+ /// How many time manipulator need to take and drop item.
+ var/working_speed = 2 SECONDS
+ /// Using high tier manipulators speeds up big manipulator and requires more energy.
+ var/power_use_lvl = 0.2
+ /// When manipulator already working with item inside he don't take any new items.
+ var/on_work = FALSE
+ /// Activate mechanism.
+ var/on = FALSE
+ /// Dir to get turf where we take items.
+ var/take_here = NORTH
+ /// Dir to get turf where we drop items.
+ var/drop_here = SOUTH
+ /// Turf where we take items.
+ var/turf/take_turf
+ /// Turf where we drop items.
+ var/turf/drop_turf
+ /// Obj inside manipulator.
+ var/datum/weakref/containment_obj
+ /// Other manipulator component.
+ var/obj/effect/big_manipulator_hand/manipulator_hand
+ ///are we hacked?
+ var/hacked = FALSE
+ ///our installed filter
+ var/obj/item/manipulator_filter/filter
+ ///our failed attempts
+ var/failed_attempts = 0
+ var/atom/movable/failed_item
+
+/obj/machinery/big_manipulator/Initialize(mapload)
+ . = ..()
+ take_turf = get_step(src, take_here)
+ drop_turf = get_step(src, drop_here)
+ create_manipulator_hand()
+ RegisterSignal(manipulator_hand, COMSIG_QDELETING, PROC_REF(on_hand_qdel))
+ manipulator_lvl()
+
+/obj/machinery/big_manipulator/Destroy(force)
+ . = ..()
+ failed_item = null
+ if(filter)
+ filter.forceMove(get_turf(src))
+ filter = null
+ qdel(manipulator_hand)
+ if(isnull(containment_obj))
+ return
+ var/obj/obj_resolve = containment_obj?.resolve()
+ if(isnull(obj_resolve))
+ return
+ obj_resolve.forceMove(get_turf(obj_resolve))
+
+
+/obj/machinery/big_manipulator/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ take_and_drop_turfs_check()
+ if(isnull(get_turf(src)))
+ qdel(manipulator_hand)
+ return
+ if(!manipulator_hand)
+ create_manipulator_hand()
+ manipulator_hand.forceMove(get_turf(src))
+
+/obj/machinery/big_manipulator/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ default_unfasten_wrench(user, tool, time = 1 SECONDS)
+ return TRUE
+
+/obj/machinery/big_manipulator/wrench_act_secondary(mob/living/user, obj/item/tool)
+ . = ..()
+ if(on_work || on)
+ to_chat(user, span_warning("[src] is activated!"))
+ return
+ rotate_big_hand()
+ playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
+ return TRUE
+
+/obj/machinery/big_manipulator/can_be_unfasten_wrench(mob/user, silent)
+ if(on_work || on)
+ to_chat(user, span_warning("[src] is activated!"))
+ return FAILED_UNFASTEN
+ return ..()
+
+/obj/machinery/big_manipulator/default_unfasten_wrench(mob/user, obj/item/wrench, time)
+ . = ..()
+ if(. == SUCCESSFUL_UNFASTEN)
+ take_and_drop_turfs_check()
+
+/obj/machinery/big_manipulator/screwdriver_act(mob/living/user, obj/item/tool)
+ if(default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
+ return TRUE
+ return TRUE
+
+/obj/machinery/big_manipulator/crowbar_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_deconstruction_crowbar(tool))
+ return TRUE
+ return TRUE
+
+/obj/machinery/big_manipulator/RefreshParts()
+ . = ..()
+
+ manipulator_lvl()
+
+/// Creat manipulator hand effect on manipulator core.
+/obj/machinery/big_manipulator/proc/create_manipulator_hand()
+ manipulator_hand = new/obj/effect/big_manipulator_hand(get_turf(src))
+ manipulator_hand.dir = take_here
+
+/// Check servo tier and change manipulator speed, power_use and colour.
+/obj/machinery/big_manipulator/proc/manipulator_lvl()
+ var/datum/stock_part/manipulator/locate_servo = locate() in component_parts
+ if(!locate_servo)
+ return
+ switch(locate_servo.tier)
+ if(1)
+ working_speed = 2 SECONDS
+ power_use_lvl = 0.2
+ set_greyscale(COLOR_YELLOW)
+ manipulator_hand?.set_greyscale(COLOR_YELLOW)
+ if(2)
+ working_speed = 1.4 SECONDS
+ power_use_lvl = 0.4
+ set_greyscale(COLOR_ORANGE)
+ manipulator_hand?.set_greyscale(COLOR_ORANGE)
+ if(3)
+ working_speed = 0.8 SECONDS
+ power_use_lvl = 0.6
+ set_greyscale(COLOR_RED)
+ manipulator_hand?.set_greyscale(COLOR_RED)
+ if(4)
+ working_speed = 0.2 SECONDS
+ power_use_lvl = 0.8
+ set_greyscale(COLOR_PURPLE)
+ manipulator_hand?.set_greyscale(COLOR_PURPLE)
+
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * power_use_lvl
+
+/// Changing take and drop turf tiles when we anchore manipulator or if manipulator not in turf.
+/obj/machinery/big_manipulator/proc/take_and_drop_turfs_check()
+ if(anchored && isturf(src.loc))
+ take_turf = get_step(src, take_here)
+ drop_turf = get_step(src, drop_here)
+ else
+ take_turf = null
+ drop_turf = null
+
+/// Changing take and drop turf dirs and also changing manipulator hand sprite dir.
+/obj/machinery/big_manipulator/proc/rotate_big_hand()
+ switch(take_here)
+ if(NORTH)
+ manipulator_hand.item_x = 64
+ manipulator_hand.item_y = 32
+ take_here = EAST
+ drop_here = WEST
+ if(EAST)
+ manipulator_hand.item_x = 32
+ manipulator_hand.item_y = 0
+ take_here = SOUTH
+ drop_here = NORTH
+ if(SOUTH)
+ manipulator_hand.item_x = 0
+ manipulator_hand.item_y = 32
+ take_here = WEST
+ drop_here = EAST
+ if(WEST)
+ manipulator_hand.item_x = -32
+ manipulator_hand.item_y = 0
+ take_here = NORTH
+ drop_here = SOUTH
+ manipulator_hand.dir = take_here
+ take_and_drop_turfs_check()
+
+/// Deliting hand will destroy our manipulator core.
+/obj/machinery/big_manipulator/proc/on_hand_qdel()
+ SIGNAL_HANDLER
+
+ deconstruct(TRUE)
+
+/// Pre take and drop proc from [take and drop procs loop]:
+/// Check if we have item on take_turf to start take and drop loop
+/obj/machinery/big_manipulator/proc/is_work_check()
+ if(filter)
+ var/atom/movable = filter_return()
+ if(movable)
+ try_take_thing(take_turf, movable)
+ return
+
+ if(hacked)
+ for(var/mob/living/take_item in take_turf.contents)
+ try_take_thing(take_turf, take_item)
+ break
+ for(var/obj/take_item in take_turf.contents)
+ if(take_item.anchored)
+ continue
+ try_take_thing(take_turf, take_item)
+ break
+
+/obj/machinery/big_manipulator/proc/filter_return()
+ if(!filter)
+ return null
+ for(var/atom/movable/listed in take_turf.contents)
+ if(filter.check_filter(listed))
+ return listed
+
+/// First take and drop proc from [take and drop procs loop]:
+/// Check if we can take item from take_turf to work with him. This proc also calling from ATOM_ENTERED signal.
+/obj/machinery/big_manipulator/proc/try_take_thing(datum/source, atom/movable/target)
+ SIGNAL_HANDLER
+ if(target == failed_item)
+ failed_item = null
+ return
+
+ if(!on)
+ return
+ if(!anchored)
+ return
+ if(QDELETED(source) || QDELETED(target))
+ return
+ if(on_work)
+ return
+ if(!directly_use_power(active_power_usage))
+ on = FALSE
+ say("Not enough energy!")
+ return
+ failed_item = null
+
+ if(filter)
+ if(passes_filter(target))
+ start_work(target)
+ return
+
+ if(isitem(target) || (isliving(target) && hacked) || (isobj(target) && !target.anchored))
+ start_work(target)
+
+/obj/machinery/big_manipulator/proc/passes_filter(atom/movable/target)
+ if(!filter)
+ return FALSE
+ return filter.check_filter(target)
+
+/// Second take and drop proc from [take and drop procs loop]:
+/// Taking our item and start manipulator hand rotate animation.
+/obj/machinery/big_manipulator/proc/start_work(atom/movable/target)
+ target.forceMove(src)
+ containment_obj = WEAKREF(target)
+ manipulator_hand.picked = target
+ manipulator_hand.update_appearance()
+ on_work = TRUE
+ do_rotate_animation(1)
+ addtimer(CALLBACK(src, PROC_REF(drop_thing), target), working_speed)
+
+/// Third take and drop proc from [take and drop procs loop]:
+/// Drop our item and start manipulator hand backward animation.
+/obj/machinery/big_manipulator/proc/drop_thing(atom/movable/target)
+ if(!drop_turf.can_drop_off(target))
+ failed_attempts++
+ if(failed_attempts >= 10)
+ do_rotate_animation(0)
+ addtimer(CALLBACK(src, PROC_REF(end_work_failed), target), working_speed)
+ return
+ addtimer(CALLBACK(src, PROC_REF(drop_thing), target), working_speed)
+ return
+ failed_attempts = 0
+ target.forceMove(drop_turf)
+ manipulator_hand.picked = null
+ manipulator_hand.update_appearance()
+ do_rotate_animation(0)
+ addtimer(CALLBACK(src, PROC_REF(end_work)), working_speed)
+
+/// Fourth and last take and drop proc from take and drop procs loop:
+/// Finishes work and begins to look for a new item for [take and drop procs loop].
+/obj/machinery/big_manipulator/proc/end_work()
+ on_work = FALSE
+ is_work_check()
+
+/obj/machinery/big_manipulator/proc/end_work_failed(atom/movable/target)
+ target.forceMove(take_turf)
+ failed_item = target
+ manipulator_hand.picked = null
+ manipulator_hand.update_appearance()
+ on_work = FALSE
+ failed_attempts = 0
+ is_work_check()
+
+/// Rotates manipulator hand 90 degrees.
+/obj/machinery/big_manipulator/proc/do_rotate_animation(backward)
+ animate(manipulator_hand, transform = matrix(90, MATRIX_ROTATE), working_speed*0.5)
+ addtimer(CALLBACK(src, PROC_REF(finish_rotate_animation), backward), working_speed*0.5)
+
+/// Rotates manipulator hand from 90 degrees to 180 or 0 if backward.
+/obj/machinery/big_manipulator/proc/finish_rotate_animation(backward)
+ animate(manipulator_hand, transform = matrix(180 * backward, MATRIX_ROTATE), working_speed*0.5)
+
+/obj/machinery/big_manipulator/ui_interact(mob/user, datum/tgui/ui)
+ if(!anchored)
+ to_chat(user, span_warning("[src] isn't attached to the ground!"))
+ return
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "BigManipulator")
+ ui.open()
+
+/obj/machinery/big_manipulator/AltClick(mob/user)
+ . = ..()
+ if(!filter)
+ return
+ filter.forceMove(get_turf(src))
+ filter = null
+
+/obj/machinery/big_manipulator/ui_data(mob/user)
+ var/list/data = list()
+ data["active"] = on
+ return data
+
+/obj/machinery/big_manipulator/ui_act(action, params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("on")
+ on = !on
+ if(on)
+ RegisterSignal(take_turf, COMSIG_ATOM_ENTERED, PROC_REF(try_take_thing))
+ else
+ UnregisterSignal(take_turf, COMSIG_ATOM_ENTERED)
+ is_work_check()
+ return TRUE
+
+/// Manipulator hand. Effect we animate to show that the manipulator is working and moving something.
+/obj/effect/big_manipulator_hand
+ name = "Manipulator claw"
+ desc = "Take and drop objects. Innovation..."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi'
+ icon_state = "hand"
+ layer = LOW_ITEM_LAYER
+ anchored = TRUE
+ appearance_flags = KEEP_TOGETHER | LONG_GLIDE | TILE_BOUND | PIXEL_SCALE
+ greyscale_config = /datum/greyscale_config/manipulator_hand
+ pixel_x = -32
+ pixel_y = -32
+
+ ///item offset x
+ var/item_x = 32
+ var/item_y = 64
+ var/atom/movable/picked
+
+/obj/effect/big_manipulator_hand/update_overlays()
+ . = ..()
+ if(picked)
+ var/mutable_appearance/ma = mutable_appearance(picked.icon, picked.icon_state, picked.layer, src, appearance_flags = KEEP_TOGETHER)
+ ma.color = picked.color
+ ma.appearance = picked.appearance
+ ma.appearance_flags = appearance_flags
+ ma.plane = plane
+ ma.pixel_x = item_x
+ ma.pixel_y = item_y
+ . += ma
+
+/turf/proc/can_drop_off(atom/movable/target)
+ if(isclosedturf(src))
+ return FALSE
+ for(var/obj/structure/listed in contents)
+ if(!listed.can_drop_off(target))
+ return FALSE
+ for(var/obj/machinery/listed in contents)
+ if(!listed.can_drop_off(target))
+ return FALSE
+
+ return TRUE
+
+/obj/structure/proc/can_drop_off(atom/movable/target)
+ return TRUE
+
+/obj/machinery/proc/can_drop_off(atom/movable/target)
+ return TRUE
+
+
+/obj/item/manipulator_filter
+ name = "manipulator filter"
+ desc = "A filter specifically designed to work inside of a manipulator."
+
+ icon = 'monkestation/code/modules/factory_type_beat/icons/items.dmi'
+ icon_state = "filter"
+
+ var/list/filtered_items = list()
+ var/max_filtered_items = 5
+
+
+/obj/item/manipulator_filter/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if(istype(target, /obj/machinery/big_manipulator))
+ try_attach(target)
+ return
+
+ if(target == src)
+ return ..()
+ if(!proximity_flag)
+ return ..()
+ if(!ismovable(target))
+ return ..()
+ if(istype(target, /obj/effect/decal/conveyor_sorter))
+ return
+ if(is_type_in_list(target, filtered_items))
+ to_chat(user, span_warning("[target] is already in [src]'s sorting list!"))
+ return
+ if(length(filtered_items) >= max_filtered_items)
+ to_chat(user, span_warning("[src] already has [max_filtered_items] things within the sorting list!"))
+ return
+ filtered_items += target.type
+ to_chat(user, span_notice("[target] has been added to [src]'s sorting list."))
+
+/obj/item/manipulator_filter/examine(mob/user)
+ . = ..()
+ . += span_notice("This sorter can sort up to [max_filtered_items] Items.")
+ . += span_notice("Use Alt-Click to reset the sorting list.")
+ . += span_notice("Attack things to attempt to add to the sorting list.")
+
+/obj/item/manipulator_filter/AltClick(mob/user)
+ visible_message("[src] pings, resetting its sorting list!")
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ filtered_items = list()
+
+/obj/item/manipulator_filter/proc/try_attach(obj/machinery/big_manipulator/target)
+ if(target.filter)
+ return FALSE
+ target.filter = src
+ src.forceMove(target)
+ return TRUE
+
+/obj/item/manipulator_filter/proc/check_filter(atom/movable/target)
+ if(target.type in filtered_items)
+ return TRUE
+ return FALSE
+
+
+/obj/item/manipulator_filter/cargo
+ name = "manipulator filter"
+ desc = "A filter specifically designed to work inside of a manipulator."
+
+/obj/item/manipulator_filter/cargo/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if(istype(target, /obj/machinery/big_manipulator))
+ try_attach(target)
+ return
+
+/obj/item/manipulator_filter/attack_self(mob/user, modifiers)
+ . = ..()
+ var/choice = tgui_input_list(user, "Add a destination to check", name, GLOB.TAGGERLOCATIONS - filtered_items)
+ if(!choice)
+ return
+
+ if(length(filtered_items) >= max_filtered_items)
+ return
+
+ filtered_items |= choice
+
+/obj/item/manipulator_filter/cargo/check_filter(atom/movable/target)
+ if(istype(target, /obj/item/delivery))
+ var/obj/item/delivery/item = target
+ var/name_tag = GLOB.TAGGERLOCATIONS[item.sort_tag]
+ if(name_tag in filtered_items)
+ return TRUE
+
+ if(istype(target, /obj/item/mail))
+ var/obj/item/mail/item = target
+ var/name_tag = GLOB.TAGGERLOCATIONS[item.sort_tag]
+ if(name_tag in filtered_items)
+ return TRUE
+
+ if(SEND_SIGNAL(target, COMSIG_FILTER_CHECK, filtered_items))
+ return TRUE
+
+ return FALSE
+
+
+/obj/item/manipulator_filter/internal_filter
+ name = "internal filter"
+ desc = "Checks the contents inside of an object and if it matches any of the filters grabs the object"
+
+/obj/item/manipulator_filter/internal_filter/check_filter(atom/movable/target)
+ for(var/atom/movable/listed in target.contents)
+ if(listed.type in filtered_items)
+ return TRUE
+ return FALSE
+
+
+/proc/departmental_destination_to_tag(destination)
+ switch(destination)
+ if(/area/station/engineering/main)
+ return "Engineering"
+ if(/area/station/science/research)
+ return "Research"
+ if(/area/station/hallway/secondary/service)
+ return "Hydroponics"
+ if(/area/station/service/bar/atrium)
+ return "Bar"
+ if(/area/station/security/office, /area/station/security/brig, /area/station/security/brig/upper)
+ return "Security"
+ if(/area/station/medical/medbay/central, /area/station/medical/medbay, /area/station/medical/treatment_center, /area/station/medical/storage)
+ return "Medbay"
diff --git a/monkestation/code/modules/factory_type_beat/machinery/splitter.dm b/monkestation/code/modules/factory_type_beat/machinery/splitter.dm
new file mode 100644
index 000000000000..14134a57a192
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/splitter.dm
@@ -0,0 +1,55 @@
+/obj/structure/belt_splitter
+ name = "belt splitter"
+ desc = "takes an input from one side and tries to output it on any side that has a belt."
+
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "splitter"
+
+ anchored = TRUE
+
+ var/current_split_number = 1
+
+ var/list/direction_order = list(NORTH, EAST, SOUTH, WEST)
+
+/obj/structure/belt_splitter/Initialize(mapload)
+ . = ..()
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(try_split),
+ )
+ AddComponent(/datum/component/connect_loc_behalf, src, loc_connections)
+ AddComponent(/datum/component/simple_rotation)
+
+/obj/structure/belt_splitter/Destroy()
+ . = ..()
+
+/obj/structure/belt_splitter/setDir()
+ . = ..()
+ rebuild_directions()
+
+/obj/structure/belt_splitter/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ default_unfasten_wrench(user, tool)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/structure/belt_splitter/proc/rebuild_directions()
+ direction_order = list(NORTH, EAST, SOUTH, WEST)
+ direction_order -= dir
+
+/obj/structure/belt_splitter/proc/try_split(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+ if(arrived.anchored)
+ return
+ var/not_passed = TRUE
+ var/failed_attempts = 0
+ while(not_passed && failed_attempts < 10)
+ failed_attempts++
+ var/direction = direction_order[current_split_number]
+ current_split_number++
+ if(current_split_number > length(direction_order))
+ current_split_number = 1
+ if(direction == dir)
+ direction = direction_order[current_split_number]
+
+ if(!(locate(/obj/machinery/conveyor) in get_step(src, direction)))
+ continue
+ arrived.forceMove(get_step(src, direction))
+ not_passed = FALSE
diff --git a/monkestation/code/modules/factory_type_beat/machinery/test_boulder_spawner.dm b/monkestation/code/modules/factory_type_beat/machinery/test_boulder_spawner.dm
new file mode 100644
index 000000000000..24704dc1a767
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/machinery/test_boulder_spawner.dm
@@ -0,0 +1,21 @@
+/obj/structure/test_boulder_spawner
+ name = "DEBUG BOULDER SPAWNER"
+ desc = "... Why? How?"
+
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "unloader-corner"
+
+ var/spawn_dir = EAST
+
+ var/processing = FALSE
+
+/obj/structure/test_boulder_spawner/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(!processing)
+ START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+
+/obj/structure/test_boulder_spawner/process(seconds_per_tick)
+ var/atom/movable/new_item = new /obj/item/boulder/gulag_expanded(get_turf(src))
+ new_item.forceMove(get_step(src, spawn_dir))
diff --git a/monkestation/code/modules/factory_type_beat/map_templates.dm b/monkestation/code/modules/factory_type_beat/map_templates.dm
new file mode 100644
index 000000000000..1efe3376dcf2
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/map_templates.dm
@@ -0,0 +1,30 @@
+
+/datum/map_template/ruin/icemoon/underground/vent
+ name = "Icemoon Ore Vent"
+ id = "ore_vent_i"
+ description = "A vent that spews out ore. Seems to be a natural phenomenon." //Make this a subtype that only spawns medium and large vents. Some smalls will go to the top level.
+ suffix = "icemoon_underground_ore_vent.dmm"
+ allow_duplicates = TRUE
+ cost = 0
+ mineral_cost = 1
+ always_place = TRUE
+
+/datum/map_template/ruin/icemoon/ruin/vent
+ name = "Surface Icemoon Ore Vent"
+ id = "ore_vent_i"
+ description = "A vent that spews out ore. Seems to be a natural phenomenon. Smaller than the underground ones."
+ suffix = "icemoon_surface_ore_vent.dmm"
+ allow_duplicates = TRUE
+ cost = 0
+ mineral_cost = 1
+ always_place = TRUE
+
+/datum/map_template/ruin/lavaland/vent
+ name = "Ore Vent"
+ id = "ore_vent"
+ description = "A vent that spews out ore. Seems to be a natural phenomenon."
+ suffix = "lavaland_surface_ore_vent.dmm"
+ allow_duplicates = TRUE
+ cost = 0
+ mineral_cost = 1
+ always_place = TRUE
diff --git a/monkestation/code/modules/factory_type_beat/mobs/node_drone.dm b/monkestation/code/modules/factory_type_beat/mobs/node_drone.dm
new file mode 100644
index 000000000000..aeeb88729ccb
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/mobs/node_drone.dm
@@ -0,0 +1,154 @@
+#define FLY_IN_STATE 1
+#define FLY_OUT_STATE 2
+#define NEUTRAL_STATE 3
+
+/**
+ * Mining drones that are spawned when starting a ore vent's wave defense minigame.
+ * They will latch onto the vent to defend it from lavaland mobs, and will flee if attacked by lavaland mobs.
+ * If the drone survives, they will fly away to safety as the vent spawns ores.
+ * If the drone dies, the wave defense will fail.
+ */
+
+/mob/living/basic/node_drone
+ name = "NODE drone"
+ desc = "Standard in-atmosphere drone, used by Nanotrasen to operate and excavate valuable ore vents."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining.dmi'
+ icon_state = "mining_node_active"
+ icon_living = "mining_node_active"
+ icon_dead = "mining_node_active"
+
+ maxHealth = 500
+ health = 500
+ density = TRUE
+ pass_flags = PASSTABLE|PASSGRILLE|PASSMOB
+ mob_size = MOB_SIZE_LARGE
+ mob_biotypes = MOB_ROBOTIC
+ faction = list(FACTION_STATION, FACTION_NEUTRAL)
+ light_outer_range = 4
+ basic_mob_flags = DEL_ON_DEATH
+
+ speak_emote = list("chirps")
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "clangs"
+ response_harm_simple = "clang against"
+
+ ai_controller = /datum/ai_controller/basic_controller/node_drone
+
+ /// Is the drone currently attached to a vent?
+ var/active_node = FALSE
+ /// What status do we currently track for icon purposes?
+ var/flying_state = NEUTRAL_STATE
+ /// Weakref to the vent the drone is currently attached to.
+ var/obj/structure/ore_vent/attached_vent = null
+ /// Set when the drone is begining to leave lavaland after the vent is secured.
+ var/escaping = FALSE
+
+/mob/living/basic/node_drone/death(gibbed)
+ . = ..()
+ explosion(origin = src, light_impact_range = 1, smoke = 1)
+
+/mob/living/basic/node_drone/Destroy()
+ attached_vent?.node = null //clean our reference to the vent both ways.
+ attached_vent = null
+ return ..()
+
+
+/mob/living/basic/node_drone/examine(mob/user)
+ . = ..()
+ var/sameside = user.faction_check_atom(src, exact_match = FALSE)
+ if(sameside)
+ . += span_notice("This drone is currently attached to a mineral vent. You should protect it from harm to secure the mineral vent.")
+ else
+ . += span_warning("This vile Nanotrasen trash is trying to destroy the environment. Attack it to free the mineral vent from its grasp.")
+
+/mob/living/basic/node_drone/update_icon_state()
+ . = ..()
+
+ icon_state = "mining_node_active"
+
+ if(flying_state == FLY_IN_STATE || flying_state == FLY_OUT_STATE)
+ icon_state = "mining_node_flying"
+
+/mob/living/basic/node_drone/proc/arrive(obj/structure/ore_vent/parent_vent)
+ attached_vent = parent_vent
+ flying_state = FLY_IN_STATE
+ update_appearance(UPDATE_ICON_STATE)
+ pixel_z = 400
+ animate(src, pixel_z = 0, time = 2 SECONDS, easing = QUAD_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
+
+
+/**
+ * Called when wave defense is completed. Visually flicks the escape sprite and then deletes the mob.
+ */
+/mob/living/basic/node_drone/proc/escape()
+ var/funny_ending = FALSE
+ flying_state = FLY_OUT_STATE
+ update_appearance(UPDATE_ICON_STATE)
+ if(prob(1))
+ say("I have to go now, my planet needs me.")
+ funny_ending = TRUE
+ visible_message(span_notice("The drone flies away to safety as the vent is secured."))
+ animate(src, pixel_z = 400, time = 2 SECONDS, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
+ sleep(2 SECONDS)
+ if(funny_ending)
+ playsound(src, 'sound/effects/explosion3.ogg', 50, FALSE) //node drone died on the way back to his home planet.
+ visible_message(span_notice("...or maybe not."))
+ qdel(src)
+
+
+/mob/living/basic/node_drone/proc/pre_escape()
+ if(attached_vent)
+ attached_vent.unbuckle_mob(src)
+ attached_vent = null
+ if(!escaping)
+ escaping = TRUE
+ flick("mining_node_escape", src)
+ addtimer(CALLBACK(src, PROC_REF(escape)), 1.9 SECONDS)
+ return
+
+/// The node drone AI controller
+// Generally, this is a very simple AI that will try to find a vent and latch onto it, unless attacked by a lavaland mob, who it will try to flee from.
+/datum/ai_controller/basic_controller/node_drone
+ blackboard = list(
+ BB_BASIC_MOB_FLEEING = FALSE, // Will flee when the vent lies undefended.
+ BB_CURRENT_HUNTING_TARGET = null, // Hunts for vents.
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, // Use this to find vents to run away from
+ )
+
+ ai_traits = STOP_MOVING_WHEN_PULLED
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = null
+ planning_subtrees = list(
+ // Priority is see if lavaland mobs are attacking us to flee from them.
+ /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
+ // Fly you fool
+ /datum/ai_planning_subtree/flee_target/node_drone,
+ // Otherwise, look for and execute hunts for vents to latch onto.
+ /datum/ai_planning_subtree/find_and_hunt_target/look_for_vent,
+ )
+
+// Node subtree to hunt down ore vents.
+/datum/ai_planning_subtree/find_and_hunt_target/look_for_vent
+ hunting_behavior = /datum/ai_behavior/hunt_target/latch_onto/node_drone
+ hunt_targets = list(/obj/structure/ore_vent)
+ hunt_range = 7 // Hunt vents to the end of the earth.
+
+// node drone behavior for buckling down on a vent.
+/datum/ai_behavior/hunt_target/latch_onto/node_drone
+ hunt_cooldown = 5 SECONDS
+
+// Evasion behavior.
+/datum/ai_planning_subtree/flee_target/node_drone
+ flee_behaviour = /datum/ai_behavior/run_away_from_target/drone
+
+/datum/ai_behavior/run_away_from_target/drone
+ action_cooldown = 1 SECONDS
+ run_distance = 3
+
+
+#undef FLY_IN_STATE
+#undef FLY_OUT_STATE
+#undef NEUTRAL_STATE
diff --git a/monkestation/code/modules/factory_type_beat/ore_vent.dm b/monkestation/code/modules/factory_type_beat/ore_vent.dm
new file mode 100644
index 000000000000..cfb933cedd8b
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/ore_vent.dm
@@ -0,0 +1,525 @@
+#define MAX_ARTIFACT_ROLL_CHANCE 10
+#define MINERAL_TYPE_OPTIONS_RANDOM 4
+#define OVERLAY_OFFSET_START 0
+#define OVERLAY_OFFSET_EACH 5
+#define MINERALS_PER_BOULDER 3
+
+/obj/structure/ore_vent
+ name = "ore vent"
+ desc = "An ore vent, brimming with underground ore. Scan with an advanced mining scanner to start extracting ore from it."
+ icon = 'monkestation/code/modules/factory_type_beat/icons/terrain.dmi'
+ icon_state = "ore_vent"
+ move_resist = MOVE_FORCE_EXTREMELY_STRONG
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //This thing will take a beating.
+ anchored = TRUE
+ density = TRUE
+ can_buckle = TRUE
+
+ /// Has this vent been tapped to produce boulders? Cannot be untapped.
+ var/tapped = FALSE
+ /// Has this vent been scanned by a mining scanner? Cannot be scanned again. Adds ores to the vent's description.
+ var/discovered = FALSE
+ /// Is this type of vent exempt from the 15 vent limit? Think the free iron/glass vent or boss vents. This also causes it to not roll for random mineral breakdown.
+ var/unique_vent = FALSE
+ /// What icon_state do we use when the ore vent has been tapped?
+ var/icon_state_tapped = "ore_vent_active"
+
+ /// A weighted list of what minerals are contained in this vent, with weight determining how likely each mineral is to be picked in produced boulders.
+ var/list/mineral_breakdown = list()
+ /// What size boulders does this vent produce?
+ var/boulder_size = BOULDER_SIZE_SMALL
+ /// Reference to this ore vent's NODE drone, to track wave success.
+ var/mob/living/basic/node_drone/node = null //this path is a placeholder.
+ /// String containing the formatted list of ores that this vent can produce, and who first discovered this vent.
+ var/ore_string = ""
+ /// Associated list of vent size weights to pick from.
+ var/list/ore_vent_options = list(
+ LARGE_VENT_TYPE = 3,
+ MEDIUM_VENT_TYPE = 5,
+ SMALL_VENT_TYPE = 7,
+ )
+
+ /// What string do we use to warn the player about the excavation event?
+ var/excavation_warning = "Are you ready to excavate this ore vent?"
+ ///Are we currently spawning mobs?
+ var/spawning_mobs = FALSE
+ /// A list of mobs that can be spawned by this vent during a wave defense event.
+ var/list/defending_mobs = list(
+ /mob/living/basic/mining/goliath,
+ /mob/living/basic/mining/legion/spawner_made,
+ /mob/living/basic/mining/watcher,
+ /mob/living/basic/mining/lobstrosity/lava,
+ /mob/living/basic/mining/brimdemon,
+ /mob/living/basic/mining/bileworm,
+ )
+ ///What items can be used to scan a vent?
+ var/static/list/scanning_equipment = list(
+ /obj/item/t_scanner/adv_mining_scanner,
+ /obj/item/mining_scanner,
+ )
+
+ /// What base icon_state do we use for this vent's boulders?
+ var/boulder_icon_state = "boulder"
+ /// Percent chance that this vent will produce an artifact boulder.
+ var/artifact_chance = 0
+ /// We use a cooldown to prevent the wave defense from being started multiple times.
+ COOLDOWN_DECLARE(wave_cooldown)
+ COOLDOWN_DECLARE(manual_vent_cooldown)
+ COOLDOWN_DECLARE(next_attack)
+
+
+/obj/structure/ore_vent/Initialize(mapload)
+ if(mapload)
+ generate_description()
+ register_context()
+ SSore_generation.possible_vents += src
+ boulder_icon_state = pick(list(
+ "boulder",
+ "rock",
+ "stone",
+ ))
+ if(tapped)
+ SSore_generation.processed_vents += src
+ icon_state = icon_state_tapped
+ update_appearance(UPDATE_ICON_STATE)
+ add_overlay(mutable_appearance('monkestation/code/modules/factory_type_beat/icons/terrain.dmi', "well", ABOVE_MOB_LAYER, src, ABOVE_MOB_LAYER))
+ return ..()
+
+/obj/structure/ore_vent/Destroy()
+ SSore_generation.possible_vents -= src
+ node = null
+ if(tapped)
+ SSore_generation.processed_vents -= src
+ return ..()
+
+/obj/structure/ore_vent/attackby(obj/item/attacking_item, mob/user, params)
+ . = ..()
+ if(.)
+ return TRUE
+ if(!is_type_in_list(attacking_item, scanning_equipment))
+ return TRUE
+ if(tapped)
+ balloon_alert_to_viewers("vent tapped!")
+ return TRUE
+ scan_and_confirm(user)
+ return TRUE
+
+/obj/structure/ore_vent/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+ if(!HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ return
+ if(!discovered)
+ to_chat(user, span_notice("You can't quite find the weakpoint of [src]... Perhaps it needs to be scanned first?"))
+ return
+ to_chat(user, span_notice("You start striking [src] with your golem's fist, attempting to dredge up a boulder..."))
+ for(var/i in 1 to 3)
+ if(do_after(user, boulder_size * 1 SECONDS, src))
+ user.apply_damage(20, STAMINA)
+ playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
+ produce_boulder(TRUE)
+ visible_message(span_notice("You've successfully produced a boulder! Boy are your arms tired."))
+
+/obj/structure/ore_vent/attack_basic_mob(mob/user, list/modifiers)
+ . = ..()
+ if(!HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
+ return
+ produce_boulder(TRUE)
+
+/obj/structure/ore_vent/is_buckle_possible(mob/living/target, force, check_loc)
+ . = ..()
+ if(tapped)
+ return FALSE
+ if(istype(target, /mob/living/basic/node_drone))
+ return TRUE
+
+/obj/structure/ore_vent/examine(mob/user)
+ . = ..()
+ if(discovered)
+ switch(boulder_size)
+ if(BOULDER_SIZE_SMALL)
+ . += span_notice("This vent produces [span_bold("small")] boulders containing [ore_string]")
+ if(BOULDER_SIZE_MEDIUM)
+ . += span_notice("This vent produces [span_bold("medium")] boulders containing [ore_string]")
+ if(BOULDER_SIZE_LARGE)
+ . += span_notice("This vent produces [span_bold("large")] boulders containing [ore_string]")
+ else
+ . += span_notice("This vent can be scanned with a [span_bold("Mining Scanner")].")
+
+/obj/structure/ore_vent/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+ if(is_type_in_list(held_item, scanning_equipment))
+ context[SCREENTIP_CONTEXT_LMB] = "Scan vent"
+ return CONTEXTUAL_SCREENTIP_SET
+
+
+/**
+ * This proc is called when the ore vent is initialized, in order to determine what minerals boulders it spawns can contain.
+ * The materials available are determined by SSore_generation.ore_vent_minerals, which is a list of all minerals that can be contained in ore vents for a given cave generation.
+ * As a result, minerals use a weighted list as seen by ore_vent_minerals_lavaland, which is then copied to ore_vent_minerals.
+ * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided it's own internal weight used when assigning minerals to boulders spawned by this vent.
+ * May also be called after the fact, as seen in SSore_generation's initialize, to add more minerals to an existing vent.
+ *
+ * The above applies only when spawning in at mapload, otherwise we pick randomly from ore_vent_minerals_lavaland.
+ *
+ * @params new_minerals How many minerals should be added to this vent? Defaults to MINERAL_TYPE_OPTIONS_RANDOM, which is 4.
+ * @params map_loading Is this vent being spawned in at mapload? If so, we use the ore_generation subsystem's ore_vent_minerals list to pick minerals. Otherwise, we pick randomly from ore_vent_minerals_lavaland.
+ */
+/obj/structure/ore_vent/proc/generate_mineral_breakdown(new_minerals = MINERAL_TYPE_OPTIONS_RANDOM, map_loading = FALSE)
+ if(new_minerals < 1)
+ CRASH("generate_mineral_breakdown called with new_minerals < 1.")
+ var/list/available_mats = difflist(first = SSore_generation.ore_vent_minerals, second = mineral_breakdown, skiprep = 1)
+ for(var/i in 1 to new_minerals)
+ if(!length(SSore_generation.ore_vent_minerals) && map_loading)
+ // We should prevent this from happening in SSore_generation, but if not then we crash here
+ CRASH("No minerals left to pick from! We may have spawned too many ore vents in init, or the map config in seedRuins may not have enough resources for the mineral budget.")
+ var/datum/material/new_material
+ if(map_loading)
+ if(length(available_mats))
+ new_material = pick(GLOB.ore_vent_minerals_lavaland)
+ var/datum/material/surrogate_mat = pick(SSore_generation.ore_vent_minerals)
+ available_mats -= surrogate_mat
+ SSore_generation.ore_vent_minerals -= surrogate_mat
+ else
+ new_material = pick(available_mats)
+ available_mats -= new_material
+ SSore_generation.ore_vent_minerals -= new_material
+ else
+ new_material = pick(GLOB.ore_vent_minerals_lavaland)
+ mineral_breakdown[new_material] = rand(1, 4)
+
+
+/**
+ * Returns the quantity of mineral sheets in each ore vent's boulder contents roll.
+ * First roll can produce the most ore, with subsequent rolls scaling lower logarithmically.
+ * Inversely scales with ore_floor, so that the first roll is the largest, and subsequent rolls are smaller.
+ * (1 -> from 16 to 7 sheets of materials, and 3 -> from 8 to 6 sheets of materials on a small vent)
+ * This also means a large boulder can highroll a boulder with a full stack of 50 sheets of material.
+ * @params ore_floor The number of minerals already rolled. Used to scale the logarithmic function.
+ */
+/obj/structure/ore_vent/proc/ore_quantity_function(ore_floor)
+ return SHEET_MATERIAL_AMOUNT * round(boulder_size * (log(rand(1 + ore_floor, 4 + ore_floor)) ** -1))
+
+/**
+ * Starts the wave defense event, which will spawn a number of lavaland mobs based on the size of the ore vent.
+ * Called after the vent has been tapped by a scanning device.
+ * Will summon a number of waves of mobs, ending in the vent being tapped after the final wave.
+ */
+/obj/structure/ore_vent/proc/start_wave_defense()
+ AddComponent(\
+ /datum/component/spawner, \
+ spawn_types = defending_mobs, \
+ spawn_time = (10 SECONDS + (5 SECONDS * (boulder_size/5))), \
+ max_spawned = 10, \
+ max_spawn_per_attempt = (1 + (boulder_size/5)), \
+ spawn_text = "emerges to assault", \
+ spawn_distance = 4, \
+ spawn_distance_exclude = 3, \
+ )
+ var/wave_timer = 60 SECONDS
+ if(boulder_size == BOULDER_SIZE_MEDIUM)
+ wave_timer = 90 SECONDS
+ else if(boulder_size == BOULDER_SIZE_LARGE)
+ wave_timer = 150 SECONDS
+ COOLDOWN_START(src, wave_cooldown, wave_timer)
+ addtimer(CALLBACK(src, PROC_REF(handle_wave_conclusion)), wave_timer)
+ spawning_mobs = TRUE
+ icon_state = icon_state_tapped
+ update_appearance(UPDATE_ICON_STATE)
+
+/**
+ * Called when the wave defense event ends, after a variable amount of time in start_wave_defense.
+ *
+ * If the node drone is still alive, the ore vent is tapped and the ore vent will begin generating boulders.
+ * If the node drone is dead, the ore vent is not tapped and the wave defense can be reattempted.
+ *
+ * Also gives xp and mining points to all nearby miners in equal measure.
+ */
+/obj/structure/ore_vent/proc/handle_wave_conclusion()
+ SEND_SIGNAL(src, COMSIG_SPAWNER_STOP_SPAWNING)
+ COOLDOWN_RESET(src, wave_cooldown)
+ particles = null
+ if(!QDELETED(node)) ///The Node Drone has survived the wave defense, and the ore vent is tapped.
+ tapped = TRUE
+ SSore_generation.processed_vents += src
+ balloon_alert_to_viewers("vent tapped!")
+ icon_state = icon_state_tapped
+ update_appearance(UPDATE_ICON_STATE)
+ else
+ visible_message(span_danger("\the [src] creaks and groans as the mining attempt fails, and the vent closes back up."))
+ icon_state = initial(icon_state)
+ update_appearance(UPDATE_ICON_STATE)
+ return FALSE //Bad end, try again.
+
+ for(var/mob/living/miner in range(7, src)) //Give the miners who are near the vent points and xp.
+ var/obj/item/card/id/user_id_card = miner.get_idcard(TRUE)
+ if(miner.stat <= SOFT_CRIT)
+ miner.mind?.adjust_experience(/datum/skill/mining, MINING_SKILL_BOULDER_SIZE_XP * boulder_size)
+ if(!user_id_card)
+ continue
+ var/point_reward_val = (MINER_POINT_MULTIPLIER * boulder_size) - MINER_POINT_MULTIPLIER // We remove the base value of discovering the vent
+ user_id_card.registered_account.mining_points += point_reward_val
+ user_id_card.registered_account.bank_card_talk("You have been awarded [point_reward_val] mining points for your efforts.")
+ node.pre_escape() //Visually show the drone is done and flies away.
+ add_overlay(mutable_appearance('monkestation/code/modules/factory_type_beat/icons/terrain.dmi', "well", ABOVE_MOB_LAYER, src, GAME_PLANE))
+
+/**
+ * Called when the ore vent is tapped by a scanning device.
+ * Gives a readout of the ores available in the vent that gets added to the description,
+ * then asks the user if they want to start wave defense if it's already been discovered.
+ * @params user The user who tapped the vent.
+ * @params scan_only If TRUE, the vent will only scan, and not prompt to start wave defense. Used by the mech mineral scanner.
+ */
+/obj/structure/ore_vent/proc/scan_and_confirm(mob/living/user, scan_only = FALSE)
+ if(tapped)
+ balloon_alert_to_viewers("vent tapped!")
+ return
+ if(!COOLDOWN_FINISHED(src, wave_cooldown))
+ balloon_alert_to_viewers("protect the node drone!")
+ return
+ if(scan_only)
+ discovered = TRUE
+ generate_description(user)
+ balloon_alert_to_viewers("vent scanned!")
+ return
+ if(!discovered)
+ balloon_alert(user, "scanning...")
+ playsound(src, 'sound/items/timer.ogg', 30, TRUE)
+ if(do_after(user, 4 SECONDS))
+ discovered = TRUE
+ balloon_alert(user, "vent scanned!")
+ generate_description(user)
+ var/obj/item/card/id/user_id_card = user.get_idcard(TRUE)
+ if(isnull(user_id_card))
+ return
+ user_id_card.registered_account.mining_points += (MINER_POINT_MULTIPLIER)
+ user_id_card.registered_account.bank_card_talk("You've been awarded [MINER_POINT_MULTIPLIER] mining points for discovery of an ore vent.")
+ return
+
+ if(tgui_alert(user, excavation_warning, "Begin defending ore vent?", list("Yes", "No")) != "Yes")
+ return
+ if(!COOLDOWN_FINISHED(src, wave_cooldown))
+ return
+ //This is where we start spitting out mobs.
+ Shake(duration = 3 SECONDS)
+ node = new /mob/living/basic/node_drone(loc)
+ node.arrive(src)
+ RegisterSignal(node, COMSIG_QDELETING, PROC_REF(handle_wave_conclusion))
+ particles = new /particles/smoke/ash()
+
+ for(var/i in 1 to 5) // Clears the surroundings of the ore vent before starting wave defense.
+ for(var/turf/closed/mineral/rock in oview(i))
+ if(istype(rock, /turf/open/misc/asteroid) && prob(35)) // so it's too common
+ new /obj/effect/decal/cleanable/rubble(rock)
+ if(prob(100 - (i * 15)))
+ rock.gets_drilled(user, FALSE)
+ if(prob(50))
+ new /obj/effect/decal/cleanable/rubble(rock)
+ sleep(0.6 SECONDS)
+
+ start_wave_defense()
+
+/**
+ * Generates a description of the ore vent to ore_string, based on the minerals contained within it.
+ * Ore_string is passed to examine().
+ */
+/obj/structure/ore_vent/proc/generate_description(mob/user)
+ for(var/mineral_count in 1 to length(mineral_breakdown))
+ var/datum/material/resource = mineral_breakdown[mineral_count]
+ if(mineral_count == length(mineral_breakdown))
+ ore_string += "and " + span_bold(initial(resource.name)) + "."
+ else
+ ore_string += span_bold(initial(resource.name)) + ", "
+ if(user)
+ ore_string += "\nThis vent was first discovered by [user]."
+/**
+ * Adds floating temp_visual overlays to the vent, showcasing what minerals are contained within it.
+ * If undiscovered, adds a single overlay with the icon_state "unknown".
+ */
+/obj/structure/ore_vent/proc/add_mineral_overlays()
+ if(mineral_breakdown.len && !discovered)
+ var/obj/effect/temp_visual/mining_overlay/vent/new_mat = new /obj/effect/temp_visual/mining_overlay/vent(drop_location())
+ new_mat.icon_state = "unknown"
+ return
+ for(var/datum/material/selected_mat as anything in mineral_breakdown)
+ var/obj/effect/temp_visual/mining_overlay/vent/new_mat = new /obj/effect/temp_visual/mining_overlay/vent(drop_location())
+ new_mat.icon_state = selected_mat.name
+
+/**
+ * Here is where we handle producing a new boulder, based on the qualities of this ore vent.
+ * Returns the boulder produced.
+ * @params apply_cooldown Should we apply a cooldown to producing boulders? Default's false, used by manual boulder production (goldgrubs, golems, etc).
+ */
+/obj/structure/ore_vent/proc/produce_boulder(apply_cooldown = FALSE)
+ RETURN_TYPE(/obj/item/boulder)
+
+ if(!length(mineral_breakdown))
+ generate_mineral_breakdown()
+ //cooldown applies only for manual processing by hand
+ if(apply_cooldown && !COOLDOWN_FINISHED(src, manual_vent_cooldown))
+ return
+ var/obj/item/boulder/new_rock
+ if(prob(artifact_chance))
+ new_rock = new /obj/item/boulder/artifact(loc)
+ else
+ new_rock = new /obj/item/boulder(loc)
+ //decorate the boulder with materials
+ var/list/mats_list = list()
+ for(var/iteration in 1 to MINERALS_PER_BOULDER)
+ var/datum/material/material = pick_weight(mineral_breakdown)
+ mats_list[material] += ore_quantity_function(iteration)
+ new_rock.set_custom_materials(mats_list)
+
+ //set size & durability
+ new_rock.boulder_size = boulder_size
+ new_rock.durability = rand(2, boulder_size) //randomize durability a bit for some flavor.
+ new_rock.boulder_string = boulder_icon_state
+ new_rock.update_appearance(UPDATE_ICON_STATE)
+ if(apply_cooldown)
+ COOLDOWN_START(src, manual_vent_cooldown, 10 SECONDS)
+ return new_rock
+
+
+//comes with the station, and is already tapped.
+/obj/structure/ore_vent/starter_resources
+ name = "active ore vent"
+ desc = "An ore vent, brimming with underground ore. It's already supplying the station with iron and glass."
+ tapped = TRUE
+ discovered = TRUE
+ unique_vent = TRUE
+ boulder_size = BOULDER_SIZE_SMALL
+ mineral_breakdown = list(
+ /datum/material/iron = 50,
+ /datum/material/glass = 50,
+ )
+
+/obj/structure/ore_vent/random
+
+/obj/structure/ore_vent/random/Initialize(mapload)
+ . = ..()
+ if(!unique_vent && !mapload)
+ generate_mineral_breakdown(map_loading = mapload) //Default to random mineral breakdowns, unless this is a unique vent or we're still setting up default vent distribution.
+ generate_description()
+ artifact_chance = rand(0, MAX_ARTIFACT_ROLL_CHANCE)
+ var/string_boulder_size = pick_weight(ore_vent_options)
+ name = "[string_boulder_size] ore vent"
+ switch(string_boulder_size)
+ if(LARGE_VENT_TYPE)
+ boulder_size = BOULDER_SIZE_LARGE
+ if(mapload)
+ SSore_generation.ore_vent_sizes["large"] += 1
+ if(MEDIUM_VENT_TYPE)
+ boulder_size = BOULDER_SIZE_MEDIUM
+ if(mapload)
+ SSore_generation.ore_vent_sizes["medium"] += 1
+ if(SMALL_VENT_TYPE)
+ boulder_size = BOULDER_SIZE_SMALL
+ if(mapload)
+ SSore_generation.ore_vent_sizes["small"] += 1
+ else
+ boulder_size = BOULDER_SIZE_SMALL //Might as well set a default value
+ name = initial(name)
+
+
+
+/obj/structure/ore_vent/random/icebox //The one that shows up on the top level of icebox
+ icon_state = "ore_vent_ice"
+ icon_state_tapped = "ore_vent_ice_active"
+ defending_mobs = list(
+ /mob/living/basic/mining/lobstrosity,
+ /mob/living/basic/mining/legion/snow/spawner_made,
+ /mob/living/simple_animal/hostile/asteroid/polarbear,
+ /mob/living/basic/mining/wolf,
+ )
+ ore_vent_options = list(
+ SMALL_VENT_TYPE = 1,
+ )
+
+/obj/structure/ore_vent/random/icebox/lower
+ defending_mobs = list(
+ /mob/living/basic/mining/ice_whelp,
+ /mob/living/basic/mining/lobstrosity,
+ /mob/living/basic/mining/legion/snow/spawner_made,
+ /mob/living/basic/mining/ice_demon,
+ /mob/living/simple_animal/hostile/asteroid/polarbear,
+ /mob/living/basic/mining/wolf,
+ )
+ ore_vent_options = list(
+ SMALL_VENT_TYPE = 3,
+ MEDIUM_VENT_TYPE = 5,
+ LARGE_VENT_TYPE = 7,
+ )
+
+
+/obj/structure/ore_vent/boss
+ name = "menacing ore vent"
+ desc = "An ore vent, brimming with underground ore. This one has an evil aura about it. Better be careful."
+ unique_vent = TRUE
+ boulder_size = BOULDER_SIZE_LARGE
+ mineral_breakdown = list( // All the riches of the world, eeny meeny boulder room.
+ /datum/material/iron = 1,
+ /datum/material/glass = 1,
+ /datum/material/plasma = 1,
+ /datum/material/titanium = 1,
+ /datum/material/silver = 1,
+ /datum/material/gold = 1,
+ /datum/material/diamond = 1,
+ /datum/material/uranium = 1,
+ /datum/material/bluespace = 1,
+ /datum/material/plastic = 1,
+ )
+ defending_mobs = list(
+ /mob/living/simple_animal/hostile/megafauna/bubblegum,
+ /mob/living/simple_animal/hostile/megafauna/dragon,
+ /mob/living/simple_animal/hostile/megafauna/colossus,
+ )
+ excavation_warning = "Something big is nearby. Are you ABSOLUTELY ready to excavate this ore vent?"
+ ///What boss do we want to spawn?
+ var/summoned_boss = null
+
+/obj/structure/ore_vent/boss/Initialize(mapload)
+ . = ..()
+ summoned_boss = pick(defending_mobs)
+
+/obj/structure/ore_vent/boss/examine(mob/user)
+ . = ..()
+ var/boss_string = ""
+ switch(summoned_boss)
+ if(/mob/living/simple_animal/hostile/megafauna/bubblegum)
+ boss_string = "A giant fleshbound beast"
+ if(/mob/living/simple_animal/hostile/megafauna/dragon)
+ boss_string = "Sharp teeth and scales"
+ if(/mob/living/simple_animal/hostile/megafauna/colossus)
+ boss_string = "A giant, armored behemoth"
+ if(/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner)
+ boss_string = "A bloody drillmark"
+ if(/mob/living/simple_animal/hostile/megafauna/wendigo)
+ boss_string = "A chilling skull"
+ . += span_notice("[boss_string] is etched onto the side of the vent.")
+
+/obj/structure/ore_vent/boss/start_wave_defense()
+ // Completely override the normal wave defense, and just spawn the boss.
+ var/mob/living/simple_animal/hostile/megafauna/boss = new summoned_boss(loc)
+ RegisterSignal(boss, COMSIG_LIVING_DEATH, PROC_REF(handle_wave_conclusion))
+ COOLDOWN_START(src, wave_cooldown, INFINITY) //Basically forever
+ //boss.say(boss.summon_line) //Pull their specific summon line to say. Default is meme text so make sure that they have theirs set already.
+
+/obj/structure/ore_vent/boss/handle_wave_conclusion()
+ node = new /mob/living/basic/node_drone(loc) //We're spawning the vent after the boss dies, so the player can just focus on the boss.
+ COOLDOWN_RESET(src, wave_cooldown)
+ return ..()
+
+/obj/structure/ore_vent/boss/icebox
+ icon_state = "ore_vent_ice"
+ icon_state_tapped = "ore_vent_ice_active"
+ defending_mobs = list(
+ /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner,
+ /mob/living/simple_animal/hostile/megafauna/wendigo,
+ /mob/living/simple_animal/hostile/megafauna/colossus,
+ )
+
+#undef MAX_ARTIFACT_ROLL_CHANCE
+#undef MINERAL_TYPE_OPTIONS_RANDOM
+#undef OVERLAY_OFFSET_START
+#undef OVERLAY_OFFSET_EACH
+#undef MINERALS_PER_BOULDER
diff --git a/monkestation/code/modules/factory_type_beat/processing/bouldertech.dm b/monkestation/code/modules/factory_type_beat/processing/bouldertech.dm
new file mode 100644
index 000000000000..2b6618990787
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/bouldertech.dm
@@ -0,0 +1,380 @@
+/obj/machinery/bouldertech
+ name = "bouldertech brand refining machine"
+ desc = "You shouldn't be seeing this! And bouldertech isn't even a real company!"
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "ore_redemption"
+ anchored = TRUE
+ density = TRUE
+
+ /// What is the efficiency of minerals produced by the machine?
+ var/refining_efficiency = 1
+ /// How many boulders can we process maximum per loop?
+ var/boulders_processing_max = 1
+ /// What boulder(s) are we holding?
+ var/list/boulders_contained = list()
+ /// How many boulders can we hold maximum?
+ var/boulders_held_max = 1
+ /// Does this machine have a mineral storage link to the silo?
+ var/holds_minerals = FALSE
+ /// What materials do we accept and process out of boulders? Removing iron from an iron/glass boulder would leave a boulder with glass.
+ var/list/processable_materials = list()
+ /*
+ /// If we get a boulder with one of these inside, we'll drop it back out.
+ var/static/list/drop_if_contained = list(
+ /obj/item/relic,
+ )
+ */
+ /// What sound plays when a thing operates?
+ var/usage_sound = 'sound/machines/mining/wooping_teleport.ogg'
+ /// Cooldown associated with the usage_sound played.
+ COOLDOWN_DECLARE(sound_cooldown)
+
+ /// Silo link to it's materials list.
+ var/datum/component/remote_materials/silo_materials
+ ///Does this machine hold mining points?
+ var/holds_mining_points = FALSE
+ /// Mining points held by the machine for miners.
+ var/points_held = 0
+ ///our export side
+ var/export_side = EAST
+ ///do we allow boulders
+ var/allows_boulders = TRUE
+ var/next_allowed_process = 0
+ var/process_string
+
+/obj/machinery/bouldertech/Initialize(mapload)
+ . = ..()
+ register_context()
+ if(holds_minerals)
+ silo_materials = AddComponent(/datum/component/remote_materials, "bouldertech", mapload, force_connect = TRUE, mat_container_flags=BREAKDOWN_FLAGS_ORM)
+ AddComponent(/datum/component/simple_rotation)
+
+/obj/machinery/bouldertech/LateInitialize()
+ . = ..()
+ if(!holds_minerals)
+ return
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/machinery/bouldertech/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ var/processable = "Accepts: "
+ if(allows_boulders)
+ processable += "Boulders"
+ if(process_string)
+ if(allows_boulders)
+ processable += ", "
+ processable += process_string
+
+ context[SCREENTIP_CONTEXT_MISC] = processable
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/machinery/bouldertech/Destroy()
+ boulders_contained = null
+ silo_materials = null
+ return ..()
+
+/obj/machinery/bouldertech/update_icon_state()
+ . = ..()
+ icon_state ="[initial(icon_state)]"
+
+/obj/machinery/bouldertech/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_unfasten_wrench(user, tool, time = 1.5 SECONDS) == SUCCESSFUL_UNFASTEN)
+ update_appearance(UPDATE_ICON_STATE)
+ START_PROCESSING(SSmachines, src)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/bouldertech/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-off", initial(icon_state), tool))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/bouldertech/crowbar_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_pry_open(tool, close_after_pry = TRUE, closed_density = FALSE))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+ if(default_deconstruction_crowbar(tool))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/bouldertech/attackby(obj/item/attacking_item, mob/user, params)
+ if(holds_minerals && istype(attacking_item, /obj/item/boulder))
+ var/obj/item/boulder/my_boulder = attacking_item
+ update_boulder_count()
+ if(!accept_boulder(my_boulder))
+ balloon_alert_to_viewers("full!")
+ return
+ balloon_alert_to_viewers("accepted")
+ START_PROCESSING(SSmachines, src)
+ return TRUE
+ if(istype(attacking_item, /obj/item/card/id) && holds_mining_points)
+ if(points_held <= 0)
+ balloon_alert_to_viewers("no points to claim!")
+ if(!COOLDOWN_FINISHED(src, sound_cooldown))
+ return TRUE
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 30, FALSE)
+ return FALSE
+ var/obj/item/card/id/id_card = attacking_item
+ var/amount = tgui_input_number(user, "How many mining points do you wish to claim? ID Balance: [id_card.registered_account.mining_points], stored mining points: [points_held]", "Transfer Points", max_value = points_held, min_value = 0, round_value = 1)
+ if(!amount)
+ return TRUE
+ if(amount > points_held)
+ amount = points_held
+ id_card.registered_account.mining_points += amount
+ points_held = round(points_held - amount)
+ to_chat(user, span_notice("You claim [amount] mining points from \the [src] to [id_card]."))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!anchored)
+ balloon_alert(user, "anchor first!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(!holds_minerals)
+ return SECONDARY_ATTACK_CONTINUE_CHAIN
+ if(!length(boulders_contained))
+ balloon_alert_to_viewers("No boulders to remove!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ remove_boulder(pick(boulders_contained))
+ return SECONDARY_ATTACK_CONTINUE_CHAIN
+
+/obj/machinery/bouldertech/deconstruct(disassembled)
+ . = ..()
+ if(length(contents))
+ for(var/obj/item/boulder/boulder in contents)
+ remove_boulder(boulder)
+
+/obj/machinery/bouldertech/process()
+ if(!anchored)
+ return PROCESS_KILL
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(!istype(potential_boulder, /obj/item/boulder))
+ potential_boulder.forceMove(drop_location())
+ CRASH("\The [src] had a non-boulder in it's boulders contained!")
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ breakdown_boulder(boulder) //Crack that bouwlder open!
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+
+/obj/machinery/bouldertech/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(allows_boulders)
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/boulder))
+ var/obj/item/boulder/boulder = mover
+ return boulder.can_get_processed()
+ return ..()
+
+/obj/machinery/bouldertech/examine(mob/user)
+ . = ..()
+ if(holds_mining_points)
+ . += span_notice("The machine reads that it has [span_bold("[points_held] mining points")] stored. Swipe an ID to claim them.")
+
+/**
+ * Accepts a boulder into the machinery, then converts it into minerals.
+ * If the boulder can be fully processed by this machine, we take the materials, insert it into the silo, and destroy the boulder.
+ * If the boulder has materials left, we make a copy of the boulder to hold the processable materials, take the processable parts, and eject the original boulder.
+ * @param chosen_boulder The boulder to being breaking down into minerals.
+ */
+/obj/machinery/bouldertech/proc/breakdown_boulder(obj/item/boulder/chosen_boulder)
+ if(QDELETED(chosen_boulder))
+ return FALSE
+ if(chosen_boulder.loc != src)
+ return FALSE
+ if(!length(chosen_boulder.custom_materials))
+ qdel(chosen_boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+ return FALSE
+ if(isnull(silo_materials))
+ return FALSE
+
+ //here we loop through the boulder's ores
+ var/list/processable_ores = list()
+ var/tripped = FALSE
+ //If a material is in the boulder's custom_materials, but not in the processable_materials list, we add it to the processable_ores list to add back to a leftover boulder.
+ for(var/datum/material/possible_mat as anything in chosen_boulder.custom_materials)
+ if(!is_type_in_list(possible_mat, processable_materials))
+ continue
+ var/quantity = chosen_boulder.custom_materials[possible_mat]
+ points_held = round((points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER))) // put point total here into machine
+ processable_ores += possible_mat
+ processable_ores[possible_mat] = quantity
+ chosen_boulder.custom_materials -= possible_mat //Remove it from the boulder now that it's tracked
+ tripped = TRUE
+ if(!tripped)
+ remove_boulder(chosen_boulder)
+ say("Nothing to process!")
+ return FALSE //we shouldn't spend more time processing a boulder with contents we don't care about.
+ use_power(BASE_MACHINE_ACTIVE_CONSUMPTION)
+ check_for_boosts() //Calls the relevant behavior for boosting the machine's efficiency, if able.
+ var/is_artifact = (istype(chosen_boulder, /obj/item/boulder/artifact)) //We need to know if it's an artifact so we can carry it over to the new boulder.
+ var/obj/item/boulder/disposable_boulder = new (src)
+ disposable_boulder.custom_materials = processable_ores
+ silo_materials.mat_container.insert_item(disposable_boulder, refining_efficiency)
+ qdel(disposable_boulder)
+
+ refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100% now that we've processed any relevant ores.
+ if(!length(chosen_boulder.custom_materials))
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ if(is_artifact)
+ points_held = round((points_held + MINER_POINT_MULTIPLIER) * MINING_POINT_MACHINE_MULTIPLIER) /// Artifacts give bonus points!
+ chosen_boulder.break_apart()
+ update_boulder_count()
+ return TRUE //We've processed all the materials in the boulder, so we can just destroy it in break_apart.
+
+ chosen_boulder.restart_processing_cooldown() //So that we don't pick it back up!
+ chosen_boulder.durability = rand(chosen_boulder.boulder_size, chosen_boulder.boulder_size + BOULDER_SIZE_SMALL) //Reset durability to a random value between the boulder's size and a little more.
+ remove_boulder(chosen_boulder)
+ return TRUE
+
+/**
+ * Accepts a boulder into the machine. Used when a boulder is first placed into the machine.
+ * @param new_boulder The boulder to be accepted.
+ */
+/obj/machinery/bouldertech/proc/accept_boulder(obj/item/boulder/new_boulder)
+ if(isnull(new_boulder))
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max) //Full already
+ return FALSE
+ if(!istype(new_boulder) && !check_extras(new_boulder)) //Can't be processed
+ return FALSE
+ if(!new_boulder.custom_materials) //Shouldn't happen, but just in case.
+ qdel(new_boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return FALSE
+ new_boulder.forceMove(src)
+ boulders_contained += new_boulder
+ SSore_generation.available_boulders -= new_boulder
+ START_PROCESSING(SSmachines, src) //Starts processing if we aren't already.
+ return TRUE
+
+/obj/machinery/bouldertech/proc/check_extras(obj/item/item)
+ return FALSE
+
+/**
+ * Ejects a boulder from the machine. Used when a boulder is finished processing, or when a boulder can't be processed.
+ * @param drop_turf The location to eject the boulder to. If null, it will eject to the machine's drop_location().
+ * @param specific_boulder The boulder to be ejected.
+ */
+/obj/machinery/bouldertech/proc/remove_boulder(obj/item/boulder/specific_boulder, turf/drop_turf = null)
+ if(isnull(specific_boulder))
+ CRASH("remove_boulder() called with no boulder!")
+ if(!length(specific_boulder.custom_materials))
+ qdel(specific_boulder)
+ update_boulder_count()
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return FALSE
+ specific_boulder.restart_processing_cooldown() //Reset the cooldown so we don't pick it back up by the same machine.
+ if(isturf(drop_turf))
+ specific_boulder.forceMove(drop_turf)
+ else
+ specific_boulder.forceMove(drop_location())
+ if(!update_boulder_count())
+ return TRUE
+ STOP_PROCESSING(SSmachines, src)
+ balloon_alert_to_viewers("clear!")
+ playsound(loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return TRUE
+
+/obj/machinery/bouldertech/can_drop_off()
+ if(length(boulders_contained) >= boulders_held_max)
+ return FALSE
+ return TRUE
+
+/**
+ * Getter proc to determine how many boulders are contained in the machine.
+ * Also adds their reference to the boulders_contained list.
+ */
+/obj/machinery/bouldertech/proc/update_boulder_count()
+ boulders_contained = list()
+ for(var/obj/item/boulder/boulder in contents)
+ boulders_contained += boulder
+ if(length(return_extras()))
+ boulders_contained |= return_extras()
+ return boulders_contained.len
+
+/obj/machinery/bouldertech/proc/return_extras()
+ return list()
+
+/obj/machinery/bouldertech/proc/on_entered(datum/source, atom/movable/atom_movable)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(accept_boulder), atom_movable)
+
+/**
+ * Looks for a boost to the machine's efficiency, and applies it if found.
+ * Applied more on the chemistry integration but can be used for other things if desired.
+ */
+/obj/machinery/bouldertech/proc/check_for_boosts()
+ refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100%.
+
+/**
+ * Checks if a custom_material is in a list of processable materials in the machine.
+ * @param list/custom_material A list of materials, presumably taken from a boulder. If a material that this machine can process is in this list, it will return true, inclusively.
+ */
+/obj/machinery/bouldertech/proc/check_for_processable_materials(list/boulder_mats)
+ for(var/material as anything in boulder_mats)
+ if(is_type_in_list(material, processable_materials))
+ return TRUE
+ return FALSE
+
+///Beacon to launch a new mining setup when activated. For testing and speed!
+/obj/item/boulder_beacon
+ name = "boulder beacon"
+ desc = "N.T. approved boulder beacon, toss it down and you will have a full bouldertech mining station."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "floor_beacon"
+ /// Number of activations left on this beacon. Uses will be removed as the beacon is used and each triggers a different machine to be spawned from it.
+ var/uses = 3
+
+/obj/item/boulder_beacon/attack_self()
+ loc.visible_message(span_warning("\The [src] begins to beep loudly!"))
+ addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS)
+
+/**
+ * Spawns a new bouldertech machine from the beacon, then removes a use from the beacon.
+ * Use one spawns a BRM teleporter, then a refinery, and lastly a smelter.
+ */
+/obj/item/boulder_beacon/proc/launch_payload()
+ playsound(src, SFX_SPARKS, 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ switch(uses)
+ if(3)
+ new /obj/machinery/bouldertech/brm(drop_location())
+ if(2)
+ new /obj/machinery/bouldertech/refinery(drop_location())
+ if(1)
+ new /obj/machinery/bouldertech/refinery/smelter(drop_location())
+ qdel(src)
+ uses--
diff --git a/monkestation/code/modules/factory_type_beat/processing/brm.dm b/monkestation/code/modules/factory_type_beat/processing/brm.dm
new file mode 100644
index 000000000000..2791bd39c8cb
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/brm.dm
@@ -0,0 +1,201 @@
+#define MANUAL_TELEPORT_SOUND 'sound/machines/mining/manual_teleport.ogg'
+#define AUTO_TELEPORT_SOUND 'sound/machines/mining/auto_teleport.ogg'
+
+/datum/wires/brm
+ holder_type = /obj/machinery/bouldertech/brm
+ proper_name = "Boulder Retrieval Matrix"
+
+/datum/wires/brm/New(atom/holder)
+ add_duds(1)
+ return ..()
+
+/datum/wires/brm/on_pulse(wire)
+ var/obj/machinery/bouldertech/brm/brm_holder = holder
+ if(brm_holder.panel_open)
+ return
+ brm_holder.toggle_auto_on()
+
+/obj/machinery/bouldertech/brm
+ name = "boulder retrieval matrix"
+ desc = "A teleportation matrix used to retrieve boulders excavated by mining NODEs from ore vents."
+ icon_state = "brm"
+ circuit = /obj/item/circuitboard/machine/brm
+ usage_sound = MANUAL_TELEPORT_SOUND
+ processing_flags = START_PROCESSING_MANUALLY
+ boulders_held_max = 2
+ /// Are we trying to actively collect boulders automatically?
+ var/toggled_on = FALSE
+ /// How long does it take to collect a boulder?
+ var/teleportation_time = 1.5 SECONDS
+ /// Cooldown used for left click teleportation.
+ COOLDOWN_DECLARE(manual_teleport_cooldown)
+
+/obj/machinery/bouldertech/brm/Initialize(mapload)
+ . = ..()
+ set_wires(new /datum/wires/brm(src))
+
+/obj/machinery/bouldertech/brm/Destroy()
+ QDEL_NULL(wires)
+ return ..()
+
+/obj/machinery/bouldertech/brm/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(!handle_teleport_conditions(user))
+ return
+ pre_collect_boulder()
+
+ COOLDOWN_START(src, manual_teleport_cooldown, teleportation_time)
+
+/obj/machinery/bouldertech/brm/attack_robot(mob/user)
+ if(!handle_teleport_conditions(user))
+ return
+ pre_collect_boulder()
+
+ COOLDOWN_START(src, manual_teleport_cooldown, teleportation_time)
+
+/obj/machinery/bouldertech/brm/attackby(obj/item/attacking_item, mob/user, params)
+ if(is_wire_tool(attacking_item) && panel_open)
+ wires.interact(user)
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/brm/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!anchored)
+ balloon_alert(user, "anchor first!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ toggle_auto_on(user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/bouldertech/brm/attack_robot_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!anchored)
+ balloon_alert(user, "anchor first!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ toggle_auto_on(user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/bouldertech/brm/process()
+ if(SSore_generation.available_boulders.len < 1)
+ say("No boulders to collect. Entering idle mode.")
+ toggled_on = FALSE
+ update_appearance(UPDATE_ICON_STATE)
+ return PROCESS_KILL
+ for(var/i in 1 to boulders_processing_max)
+ if(pre_collect_boulder())
+ continue
+ toggled_on = FALSE
+ update_appearance(UPDATE_ICON_STATE)
+ return PROCESS_KILL
+ for(var/obj/item/boulder/ground_rocks in loc.contents)
+ boulders_contained += ground_rocks
+ if(boulders_contained.len < boulders_held_max)
+ continue
+ toggled_on = FALSE
+ boulders_contained.Cut()
+ update_appearance(UPDATE_ICON_STATE)
+ return PROCESS_KILL
+
+/obj/machinery/bouldertech/brm/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ . = ..()
+ context[SCREENTIP_CONTEXT_LMB] = "Teleport single boulder"
+ context[SCREENTIP_CONTEXT_RMB] = "Toggle automatic boulder retrieval"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/machinery/bouldertech/brm/examine(mob/user)
+ . = ..()
+ . += span_notice("The small screen reads there are [span_boldnotice("[SSore_generation.available_boulders.len] boulders")] available to teleport.")
+
+/obj/machinery/bouldertech/brm/RefreshParts()
+ . = ..()
+ var/scanner_stack = 0
+ var/laser_stack = 0
+ for(var/datum/stock_part/scanning_module/scanner in component_parts)
+ scanner_stack += scanner.tier
+ boulders_processing_max = scanner_stack
+ for(var/datum/stock_part/micro_laser/laser in component_parts)
+ laser_stack += laser.tier
+ boulders_held_max = laser_stack + 1
+
+/obj/machinery/bouldertech/brm/update_icon_state()
+ if(toggled_on && !panel_open)
+ icon_state = "[initial(icon_state)]-toggled"
+ return
+ return ..()
+
+/**
+ * Handles qualifiers for enabling teleportation of boulders.
+ * Returns TRUE if the teleportation can proceed, FALSE otherwise.
+ */
+/obj/machinery/bouldertech/brm/proc/handle_teleport_conditions(mob/user)
+ if(!COOLDOWN_FINISHED(src, manual_teleport_cooldown))
+ return FALSE
+ if(panel_open)
+ balloon_alert(user, "close panel first!")
+ return FALSE
+ playsound(src, MANUAL_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return TRUE
+
+/**
+ * Begins to collect a boulder from the available boulders list in SSore_generation.
+ * Boulders must not be processed by another BRM or machine, and must be in the available boulders list.
+ * A selected boulder is picked randomly.
+ * The actual movement is then handled by collect_boulder() after a timed callback.
+ */
+/obj/machinery/bouldertech/brm/proc/pre_collect_boulder()
+ if(!length(SSore_generation.available_boulders))
+ playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
+ balloon_alert_to_viewers("no boulders to collect!")
+ return FALSE //Nothing to collect
+ var/obj/item/boulder/random_boulder = pick(SSore_generation.available_boulders)
+ if(random_boulder.processed_by)
+ return FALSE
+
+ random_boulder.processed_by = src
+ random_boulder.Shake(duration = 1.5 SECONDS)
+ SSore_generation.available_boulders -= random_boulder
+ addtimer(CALLBACK(src, PROC_REF(collect_boulder), random_boulder), 1.5 SECONDS)
+ return TRUE
+
+/**
+ * Collects a boulder from the available boulders list in SSore_generation.
+ * Handles the movement of the boulder as well as visual effects on the BRM.
+ * @param obj/item/boulder/random_boulder The boulder to collect.
+ */
+/obj/machinery/bouldertech/brm/proc/collect_boulder(obj/item/boulder/random_boulder)
+ flick("brm-flash", src)
+ if(QDELETED(random_boulder))
+ playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
+ balloon_alert_to_viewers("target lost!")
+ return FALSE
+ playsound(src, AUTO_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ random_boulder.forceMove(drop_location())
+ random_boulder.processed_by = null
+ random_boulder.pixel_x = rand(-2, 2)
+ random_boulder.pixel_y = rand(-2, 2)
+ balloon_alert_to_viewers("boulder appears!")
+ random_boulder.visible_message(span_warning("[random_boulder] suddenly appears!"))
+ use_power(BASE_MACHINE_ACTIVE_CONSUMPTION * 0.1)
+ return TRUE
+
+/**
+ * Toggles automatic boulder retrieval on.
+ * Adjusts the teleportation sound, icon state, and begins processing.
+ * @param mob/user The user who toggled the BRM.
+ */
+/obj/machinery/bouldertech/brm/proc/toggle_auto_on(mob/user)
+ if(panel_open)
+ if(user)
+ balloon_alert(user, "close panel first!")
+ return
+ toggled_on = TRUE
+ START_PROCESSING(SSmachines, src)
+ update_appearance(UPDATE_ICON_STATE)
+ usage_sound = AUTO_TELEPORT_SOUND
+
+#undef MANUAL_TELEPORT_SOUND
+#undef AUTO_TELEPORT_SOUND
diff --git a/monkestation/code/modules/factory_type_beat/processing/checmial_washer.dm b/monkestation/code/modules/factory_type_beat/processing/checmial_washer.dm
new file mode 100644
index 000000000000..230ba5fd34f5
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/checmial_washer.dm
@@ -0,0 +1,137 @@
+/obj/machinery/bouldertech/chemical_washer
+ name = "chemical washer"
+ desc = "Crushes clumps of ore into dirty dust which needs to be enriched."
+ icon_state = "washer"
+ allows_boulders = FALSE
+ holds_minerals = TRUE
+ process_string = "Water, Dirty Slurry"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+ var/maximum_volume = 1000
+ var/water_per_use = 100
+
+/obj/machinery/bouldertech/chemical_washer/Initialize(mapload)
+ . = ..()
+ create_reagents(maximum_volume, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/chemical_washer)
+ AddComponent(/datum/component/plumbing/chemical_washer_water)
+
+/obj/machinery/bouldertech/chemical_washer/process()
+ if(!anchored)
+ return
+ if(reagents.total_volume < water_per_use)
+ return
+ process_slurry()
+
+
+/obj/machinery/bouldertech/chemical_washer/proc/process_slurry()
+ var/processed = FALSE
+ for(var/datum/reagent/processing/dirty_slurry/slurry as anything in reagents.reagent_list)
+ if(!istype(slurry))
+ continue
+
+ if(!slurry.data["materials"])
+ continue
+ var/list/slurry_data = slurry.data
+ var/slurry_volume = slurry.volume
+
+ reagents.remove_all_type(slurry.type, slurry.volume)
+ reagents.add_reagent(/datum/reagent/processing/clean_slurry, slurry_volume, slurry_data)
+ processed = TRUE
+
+
+ if(processed)
+ reagents.remove_all_type(/datum/reagent/water, water_per_use)
+
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/datum/component/plumbing/chemical_washer
+ demand_connects = WEST
+ supply_connects = EAST
+
+/datum/component/plumbing/chemical_washer/send_request(dir)
+ var/atom/movable/host = parent
+
+ var/slurry_amount = host.reagents.get_reagent_amount(/datum/reagent/processing/dirty_slurry)
+ process_request(amount = max(500 - slurry_amount, 0), reagent = /datum/reagent/processing/dirty_slurry, dir = dir)
+
+///check who can give us what we want, and how many each of them will give us
+/datum/component/plumbing/chemical_washer/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir)
+ //find the duct to take from
+ var/datum/ductnet/net
+ if(!ducts.Find(num2text(dir)))
+ return
+ net = ducts[num2text(dir)]
+
+ var/atom/movable/host = parent
+
+ var/datum/reagent/processing/requested_reagent
+
+ for(var/datum/reagent/listed as anything in host.reagents.reagent_list)
+ if(istype(reagent, /datum/reagent/processing/clean_slurry))
+ return
+
+ for(var/datum/reagent/listed as anything in host.reagents.reagent_list)
+ if(!reagent)
+ break
+ if(reagent == listed.type)
+ requested_reagent = listed
+ break
+ //find all valid suppliers in the duct
+ var/list/valid_suppliers = list()
+ for(var/datum/component/plumbing/supplier as anything in net.suppliers)
+ var/failed = FALSE
+ if(requested_reagent)
+ var/atom/movable/supplier_host = supplier.parent
+ for(var/datum/reagent/supplier_listed as anything in supplier_host.reagents.reagent_list)
+ if(supplier_listed.type != reagent)
+ continue
+ if(supplier_listed.data["materials"] != requested_reagent.data["materials"])
+ failed = TRUE
+ break
+ var/material = supplier_listed.data["materials"]
+ var/quantity = supplier_listed.data["materials"][material]
+ if(quantity != requested_reagent.data["materials"][material])
+ failed = TRUE
+ break
+ if(failed)
+ continue
+ if(supplier.can_give(amount, reagent, net))
+ valid_suppliers += supplier
+ var/suppliersLeft = valid_suppliers.len
+ if(!suppliersLeft)
+ return
+
+ //take an equal amount from each supplier
+ var/currentRequest
+ var/target_volume = reagents.total_volume + amount
+ for(var/datum/component/plumbing/give as anything in valid_suppliers)
+ currentRequest = (target_volume - reagents.total_volume) / suppliersLeft
+ give.transfer_to(src, currentRequest, reagent, net)
+ suppliersLeft--
+
+/datum/component/plumbing/chemical_washer_water
+ demand_connects = SOUTH
+ demand_color = COLOR_BLUE
+
+ ducting_layer = SECOND_DUCT_LAYER
+
+/datum/component/plumbing/chemical_washer_water/send_request(dir)
+ var/atom/movable/host = parent
+ var/water_amount = host.reagents.get_reagent_amount(/datum/reagent/water)
+ process_request(amount = max(500 - water_amount, 0), reagent = /datum/reagent/water, dir = dir)
diff --git a/monkestation/code/modules/factory_type_beat/processing/chemical_injector.dm b/monkestation/code/modules/factory_type_beat/processing/chemical_injector.dm
new file mode 100644
index 000000000000..c193c02e516c
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/chemical_injector.dm
@@ -0,0 +1,165 @@
+/obj/machinery/bouldertech/chemical_injector
+ name = "chemical injector"
+ desc = "Crushes shards when infused with brine."
+ icon_state = "chemical_injection"
+ allows_boulders = FALSE
+ holds_minerals = TRUE
+ process_string = "Brine"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+ var/maximum_volume = 1000
+ var/brine_per_use = 25
+ var/crystal_inside = FALSE
+
+/obj/machinery/bouldertech/chemical_injector/update_icon_state()
+ . = ..()
+ if(crystal_inside)
+ icon_state = "chemical_injection-inject"
+ else
+ icon_state = "chemical_injection"
+
+/obj/machinery/bouldertech/chemical_injector/update_overlays()
+ . = ..()
+ if(crystal_inside)
+ . += mutable_appearance(icon, "chemical_injection-crystal")
+
+/obj/machinery/bouldertech/chemical_injector/Initialize(mapload)
+ . = ..()
+ create_reagents(maximum_volume, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/chemical_injector_brine)
+
+/obj/machinery/bouldertech/chemical_injector/process()
+ if(!anchored)
+ return PROCESS_KILL
+
+ if(next_allowed_process > world.time)
+ return
+
+ if(reagents.total_volume < brine_per_use)
+ return
+
+ if(crystal_inside)
+ return
+
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+
+ if(istype(potential_boulder, /obj/item/processing/amalgam))
+ next_allowed_process = world.time + 30 SECONDS
+ visible_message(span_danger("The machine gets clogged with [potential_boulder]! Disabling it for 30 Seconds."))
+
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(!istype(potential_boulder, /obj/item/boulder))
+ crystal_inside = TRUE
+ update_appearance()
+ addtimer(CALLBACK(src, PROC_REF(process_crystal), potential_boulder), 2.6 SECONDS)
+ continue
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ export_shard(boulder) //Crack that bouwlder open!
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+
+/obj/machinery/bouldertech/chemical_injector/proc/process_crystal(obj/item/processing/crystals/clump)
+ for(var/datum/material/material as anything in clump.custom_materials)
+ var/quantity = clump.custom_materials[material]
+ var/obj/item/processing/shards/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+
+ crystal_inside = FALSE
+ reagents.remove_all(brine_per_use)
+ qdel(clump)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/chemical_injector/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/processing/crystals))
+ return TRUE
+ if(istype(mover, /obj/item/processing/amalgam))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/chemical_injector/return_extras()
+ var/list/boulders_contained = list()
+ for(var/obj/item/processing/crystals/boulder in contents)
+ boulders_contained += boulder
+ for(var/obj/item/processing/amalgam/amalgam in contents)
+ boulders_contained += amalgam
+ return boulders_contained
+
+/obj/machinery/bouldertech/chemical_injector/check_extras(obj/item/item)
+ if(istype(item, /obj/item/processing/crystals))
+ return TRUE
+ if(istype(item, /obj/item/processing/amalgam))
+ return TRUE
+ return FALSE
+
+/obj/machinery/bouldertech/chemical_injector/proc/export_shard(obj/item/boulder/boulder)
+ for(var/datum/material/material as anything in boulder.custom_materials)
+ var/quantity = boulder.custom_materials[material]
+ for(var/i = 1 to 4)
+ var/obj/item/processing/shards/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+
+ reagents.remove_all(brine_per_use)
+ qdel(boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+
+/datum/component/plumbing/chemical_injector_brine
+ demand_connects = SOUTH
+ demand_color = COLOR_YELLOW
+
+ ducting_layer = SECOND_DUCT_LAYER
+
+/datum/component/plumbing/chemical_injector_brine/send_request(dir)
+ process_request(amount = MACHINE_REAGENT_TRANSFER, reagent = /datum/reagent/brine, dir = dir)
diff --git a/monkestation/code/modules/factory_type_beat/processing/crusher.dm b/monkestation/code/modules/factory_type_beat/processing/crusher.dm
new file mode 100644
index 000000000000..3cffe8985509
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/crusher.dm
@@ -0,0 +1,72 @@
+/obj/machinery/bouldertech/crusher
+ name = "crusher"
+ desc = "Crushes clumps of ore into dirty dust which needs to be enriched."
+ icon_state = "crusher"
+ allows_boulders = FALSE
+ holds_minerals = TRUE
+ process_string = "Clumps"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+
+/obj/machinery/bouldertech/crusher/process()
+ if(!anchored)
+ return PROCESS_KILL
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(!istype(potential_boulder, /obj/item/boulder))
+ process_clump(potential_boulder)
+ continue
+
+/obj/machinery/bouldertech/crusher/proc/process_clump(obj/item/processing/clumps/clump)
+ for(var/datum/material/material as anything in clump.custom_materials)
+ var/quantity = clump.custom_materials[material]
+ var/obj/item/processing/dirty_dust/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+
+ qdel(clump)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/crusher/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/processing/clumps))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/crusher/return_extras()
+ var/list/boulders_contained = list()
+ for(var/obj/item/processing/clumps/boulder in contents)
+ boulders_contained += boulder
+ return boulders_contained
+
+/obj/machinery/bouldertech/crusher/check_extras(obj/item/item)
+ if(istype(item, /obj/item/processing/clumps))
+ return TRUE
+ return FALSE
diff --git a/monkestation/code/modules/factory_type_beat/processing/crystalizer.dm b/monkestation/code/modules/factory_type_beat/processing/crystalizer.dm
new file mode 100644
index 000000000000..d1ee831350d1
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/crystalizer.dm
@@ -0,0 +1,140 @@
+/obj/machinery/bouldertech/crystalizer
+ name = "crystalizer"
+ desc = "Crushes clumps of ore into dirty dust which needs to be enriched."
+ icon_state = "crystalizer"
+ allows_boulders = FALSE
+ holds_minerals = TRUE
+ process_string = "Clean Slurry"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+ var/maximum_volume = 50
+ var/crystalized_reagent = 50
+ var/processes_left = 3
+ var/crystal_in_progress = FALSE
+
+/obj/machinery/bouldertech/crystalizer/Initialize(mapload)
+ . = ..()
+ create_reagents(maximum_volume, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/material_crystalizer)
+
+/obj/machinery/bouldertech/crystalizer/update_overlays()
+ . = ..()
+ . += mutable_appearance(icon, "crystalizer-glass", layer + 0.2, src)
+
+ if(crystal_in_progress)
+ . += mutable_appearance(icon, "crystalizer-crystal", layer, src)
+ . += mutable_appearance(icon, "crystalizer-[processes_left]")
+
+/obj/machinery/bouldertech/crystalizer/process()
+ if(!anchored)
+ return
+ if(reagents.total_volume < crystalized_reagent)
+ crystal_in_progress = FALSE
+ return
+ crystal_in_progress = TRUE
+ if(processes_left > 0)
+ processes_left--
+ update_appearance()
+ return
+
+ processes_left = 3
+ process_slurry()
+ reagents.remove_all_type(/datum/reagent/processing/clean_slurry, crystalized_reagent)
+ crystal_in_progress = FALSE
+ update_appearance()
+
+
+/obj/machinery/bouldertech/crystalizer/proc/process_slurry()
+ for(var/datum/reagent/processing/clean_slurry/slurry as anything in reagents.reagent_list)
+ if(!istype(slurry))
+ continue
+ if(!slurry.data["materials"])
+ continue
+ for(var/item in slurry.data["materials"])
+ var/material = item
+ var/quantity = slurry.data["materials"][material]
+ var/obj/item/processing/crystals/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+ if(prob(15))
+ new /obj/item/processing/amalgam(get_step(src, export_side))
+
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/datum/component/plumbing/material_crystalizer
+ demand_connects = WEST
+
+/datum/component/plumbing/material_crystalizer/send_request(dir)
+ var/atom/movable/host = parent
+ var/reagents_left = host.reagents.maximum_volume - host.reagents.total_volume
+ process_request(amount = reagents_left, reagent = /datum/reagent/processing/clean_slurry, dir = dir)
+
+///check who can give us what we want, and how many each of them will give us
+/datum/component/plumbing/material_crystalizer/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir)
+ //find the duct to take from
+ var/datum/ductnet/net
+ if(!ducts.Find(num2text(dir)))
+ return
+ net = ducts[num2text(dir)]
+
+ var/atom/movable/host = parent
+
+ var/datum/reagent/processing/requested_reagent
+
+ for(var/datum/reagent/listed as anything in host.reagents.reagent_list)
+ if(!reagent)
+ break
+ if(reagent == listed.type)
+ requested_reagent = listed
+ break
+
+ //find all valid suppliers in the duct
+ var/list/valid_suppliers = list()
+ for(var/datum/component/plumbing/supplier as anything in net.suppliers)
+ var/failed = FALSE
+ if(requested_reagent)
+ var/atom/movable/supplier_host = supplier.parent
+ for(var/datum/reagent/supplier_listed as anything in supplier_host.reagents.reagent_list)
+ if(supplier_listed.type != reagent)
+ continue
+ if(supplier_listed.data["materials"] != requested_reagent.data["materials"])
+ failed = TRUE
+ break
+ var/material = supplier_listed.data["materials"]
+ var/quantity = supplier_listed.data["materials"][material]
+ if(quantity != requested_reagent.data["materials"][material])
+ failed = TRUE
+ break
+ if(failed)
+ continue
+ if(supplier.can_give(amount, reagent, net))
+ valid_suppliers += supplier
+ var/suppliersLeft = valid_suppliers.len
+ if(!suppliersLeft)
+ return
+
+ //take an equal amount from each supplier
+ var/currentRequest
+ var/target_volume = reagents.total_volume + amount
+ for(var/datum/component/plumbing/give as anything in valid_suppliers)
+ currentRequest = (target_volume - reagents.total_volume) / suppliersLeft
+ give.transfer_to(src, currentRequest, reagent, net)
+ suppliersLeft--
diff --git a/monkestation/code/modules/factory_type_beat/processing/dissolution_chamber.dm b/monkestation/code/modules/factory_type_beat/processing/dissolution_chamber.dm
new file mode 100644
index 000000000000..2f6e6c357790
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/dissolution_chamber.dm
@@ -0,0 +1,96 @@
+/obj/machinery/bouldertech/dissolution_chamber
+ name = "dissolution chamber"
+ desc = "Crushes shards when infused with brine."
+ icon_state = "dissolution"
+ holds_minerals = TRUE
+ process_string = "Sulfuric Acid"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+ var/maximum_volume = 3000
+ var/acid_per_use = 100
+
+/obj/machinery/bouldertech/dissolution_chamber/Initialize(mapload)
+ . = ..()
+ create_reagents(maximum_volume, TRANSPARENT)
+ AddComponent(/datum/component/plumbing/dissolution_chamber)
+ AddComponent(/datum/component/plumbing/dissolution_chamber_output)
+
+/obj/machinery/bouldertech/dissolution_chamber/process()
+ if(!anchored)
+ return PROCESS_KILL
+
+
+ if(reagents.total_volume < acid_per_use)
+ return
+
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ export_slurry(boulder) //Crack that bouwlder open!
+ reagents.remove_all_type(/datum/reagent/toxin/acid, acid_per_use)
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+/obj/machinery/bouldertech/dissolution_chamber/proc/export_slurry(obj/item/boulder/boulder)
+ for(var/datum/material/material as anything in boulder.custom_materials)
+ var/list/data = list()
+ data |= material
+ data[material] = boulder.custom_materials[material]
+ var/list/material_data = list()
+ material_data += "materials"
+ material_data["materials"] = data
+ reagents.add_reagent(/datum/reagent/processing/dirty_slurry, 250, material_data)
+
+ qdel(boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/datum/component/plumbing/dissolution_chamber
+ demand_connects = SOUTH
+ demand_color = COLOR_YELLOW
+
+ ducting_layer = SECOND_DUCT_LAYER
+
+/datum/component/plumbing/dissolution_chamber/send_request(dir)
+ var/atom/movable/host = parent
+ var/reagents_left = host.reagents.get_reagent_amount(/datum/reagent/toxin/acid)
+ process_request(amount = max(2500 - reagents_left, 0), reagent = /datum/reagent/toxin/acid, dir = dir)
+
+/datum/component/plumbing/dissolution_chamber_output
+ supply_connects = EAST
diff --git a/monkestation/code/modules/factory_type_beat/processing/enricher.dm b/monkestation/code/modules/factory_type_beat/processing/enricher.dm
new file mode 100644
index 000000000000..7bc80bdb2e97
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/enricher.dm
@@ -0,0 +1,105 @@
+/obj/machinery/bouldertech/enricher
+ name = "enrichment chamber"
+ desc = "enriches boulders into dust which can then de smelted at a smelter for double the materials."
+ icon_state = "enricher"
+ holds_minerals = TRUE
+ process_string = "Dirty Dust"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+
+/obj/machinery/bouldertech/enricher/process()
+ if(!anchored)
+ return PROCESS_KILL
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(!istype(potential_boulder, /obj/item/boulder))
+ process_dirty_dust(potential_boulder)
+ continue
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ export_dust(boulder) //Crack that bouwlder open!
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+/obj/machinery/bouldertech/enricher/proc/export_dust(obj/item/boulder/boulder)
+ for(var/datum/material/material as anything in boulder.custom_materials)
+ var/quantity = boulder.custom_materials[material]
+ for(var/i = 1 to 2)
+ var/obj/item/processing/refined_dust/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+ qdel(boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/enricher/proc/process_dirty_dust(obj/item/processing/dirty_dust/dirty_dust)
+ for(var/datum/material/material as anything in dirty_dust.custom_materials)
+ var/quantity = dirty_dust.custom_materials[material]
+ var/obj/item/processing/refined_dust/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+ qdel(dirty_dust)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/enricher/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/processing/dirty_dust))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/enricher/return_extras()
+ var/list/boulders_contained = list()
+ for(var/obj/item/processing/dirty_dust/boulder in contents)
+ boulders_contained += boulder
+ return boulders_contained
+
+/obj/machinery/bouldertech/enricher/check_extras(obj/item/item)
+ if(istype(item, /obj/item/processing/dirty_dust))
+ return TRUE
+ return FALSE
diff --git a/monkestation/code/modules/factory_type_beat/processing/holding_types.dm b/monkestation/code/modules/factory_type_beat/processing/holding_types.dm
new file mode 100644
index 000000000000..2f5b06312397
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/holding_types.dm
@@ -0,0 +1,59 @@
+/obj/item/processing
+ name = "generic"
+ desc = "oopsie"
+ icon = 'monkestation/code/modules/factory_type_beat/icons/processing.dmi'
+ icon_state = "dust"
+
+/obj/item/processing/proc/set_colors()
+ for(var/datum/material/material as anything in custom_materials)
+ color = material.greyscale_colors
+ alpha = material.alpha
+
+/obj/item/processing/refined_dust
+ name = "refined dust"
+ desc = "After being enriched it has turned into some dust."
+
+/obj/item/processing/dirty_dust
+ name = "dirty dust"
+ desc = "After crushing some clumps we are left with this."
+ icon = 'monkestation/icons/obj/items/drugs.dmi'
+ icon_state = "crack"
+
+/obj/item/processing/clumps
+ name = "ore clumps"
+ desc = "After being purified we are left with some clumps of ore."
+ icon_state = "clump"
+
+/obj/item/processing/shards
+ name = "ore shards"
+ desc = "After being filled with chemicals we are left with some shards of ores."
+ icon_state = "shard"
+
+/obj/item/processing/crystals
+ name = "ore crystals"
+ desc = "After crystalizing some clean slurry we have crystals."
+ icon_state = "crystal"
+
+/datum/reagent/processing
+ name = "Generic Processing Reagent"
+ data = list("materials" = list())
+
+/datum/reagent/processing/dirty_slurry
+ name = "Dirty Slurry"
+
+/datum/reagent/processing/clean_slurry
+ name = "Clean Slurry"
+
+/datum/reagent/brine
+ name = "Brine"
+
+
+/obj/item/processing/amalgam
+ name = "ore amalgam"
+ desc = "Pretty useless and jams up your processing."
+ icon_state = "dust"
+
+/obj/item/processing/ruined_shard
+ name = "ruined shard"
+ desc = "Pretty useless and jams up your processing."
+ icon_state = "dust"
diff --git a/monkestation/code/modules/factory_type_beat/processing/purification_chamber.dm b/monkestation/code/modules/factory_type_beat/processing/purification_chamber.dm
new file mode 100644
index 000000000000..13e577032420
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/purification_chamber.dm
@@ -0,0 +1,167 @@
+#define REQUIRED_OXYGEN_MOLES 25
+/obj/machinery/bouldertech/purification_chamber
+ name = "purification chamber"
+ desc = "Uses a large amount of oxygen to purify ores into clumps."
+ icon_state = "purification_chamber"
+ holds_minerals = TRUE
+ process_string = "Shards"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+
+ var/oxygen_moles = 0
+ var/obj/machinery/portable_atmospherics/purification_input/oxygen_input
+
+/obj/machinery/bouldertech/purification_chamber/AltClick(mob/user)
+ . = ..()
+ if(oxygen_input)
+ oxygen_input.disconnect()
+ QDEL_NULL(oxygen_input)
+
+ var/side = tgui_input_list(user, "Choose a side to try and deploy the tank on", "[name]", list("North", "South"))
+ if(!side)
+ return
+
+ var/direction = NORTH
+ if(side == "South")
+ direction = SOUTH
+
+ if(!(locate(/obj/machinery/atmospherics/components/unary/portables_connector) in get_step(src, direction)))
+ return
+
+ oxygen_input = new(get_step(src, direction))
+ var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in oxygen_input.loc
+ if(!oxygen_input.connect(possible_port))
+ QDEL_NULL(oxygen_input)
+
+/obj/machinery/bouldertech/purification_chamber/process()
+ if(!anchored)
+ return PROCESS_KILL
+
+ if(oxygen_input)
+ oxygen_input.air_contents.assert_gas(/datum/gas/oxygen, oxygen_input.air_contents)
+ oxygen_moles = oxygen_input.air_contents.gases[/datum/gas/oxygen][MOLES]
+
+ if(oxygen_moles < REQUIRED_OXYGEN_MOLES)
+ return
+
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(oxygen_input)
+ oxygen_input.air_contents.remove_specific(/datum/gas/oxygen, REQUIRED_OXYGEN_MOLES)
+
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(!istype(potential_boulder, /obj/item/boulder))
+ process_shard(potential_boulder)
+ continue
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ export_clump(boulder) //Crack that bouwlder open!
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+
+/obj/machinery/bouldertech/purification_chamber/proc/process_shard(obj/item/processing/shards/shard)
+ for(var/datum/material/material as anything in shard.custom_materials)
+ var/quantity = shard.custom_materials[material]
+ var/obj/item/processing/clumps/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+
+ qdel(shard)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/purification_chamber/proc/export_clump(obj/item/boulder/boulder)
+ for(var/datum/material/material as anything in boulder.custom_materials)
+ var/quantity = boulder.custom_materials[material]
+ for(var/i = 1 to 3)
+ var/obj/item/processing/clumps/dust = new(get_turf(src))
+ dust.custom_materials = list()
+ dust.custom_materials += material
+ dust.custom_materials[material] = quantity
+ dust.set_colors()
+ dust.forceMove(get_step(src, export_side))
+
+ qdel(boulder)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/purification_chamber/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/processing/shards))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/purification_chamber/return_extras()
+ var/list/boulders_contained = list()
+ for(var/obj/item/processing/shards/boulder in contents)
+ boulders_contained += boulder
+ return boulders_contained
+
+/obj/machinery/bouldertech/purification_chamber/check_extras(obj/item/item)
+ if(istype(item, /obj/item/processing/shards))
+ return TRUE
+ return FALSE
+
+#undef REQUIRED_OXYGEN_MOLES
+
+/obj/machinery/portable_atmospherics/purification_input
+ name = "external purification oxygen tank"
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "air_pump"
+ pressure_resistance = 7 * ONE_ATMOSPHERE
+ volume = 2000
+ density = TRUE
+ max_integrity = 300
+ integrity_failure = 0.4
+ armor_type = /datum/armor/portable_atmospherics_canister
+
+
+/obj/machinery/portable_atmospherics/purification_input/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/atmos_sensitive, mapload)
+ AddElement(/datum/element/volatile_gas_storage)
+ AddComponent(/datum/component/gas_leaker, leak_rate=0.01)
+
+ SSair.start_processing_machine(src)
diff --git a/monkestation/code/modules/factory_type_beat/processing/refinery.dm b/monkestation/code/modules/factory_type_beat/processing/refinery.dm
new file mode 100644
index 000000000000..0908d7f21dab
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/refinery.dm
@@ -0,0 +1,175 @@
+/**
+ * Your new favorite industrial waste magnet!
+ * Accepts boulders and produces sheets of non-metalic materials.
+ * Can be upgraded with stock parts or through chemical inputs.
+ * When upgraded, it can hold more boulders and process more at once.
+ *
+ * Chemical inputs can be used to boost the refinery's efficiency, but produces industrial waste, which eats through the station and is generally difficult to store.
+ */
+
+/obj/machinery/bouldertech/refinery
+ name = "boulder refinery"
+ desc = "BR for short. Accepts boulders and refines non-metallic ores into sheets using internal chemicals. Can be upgraded with stock parts or through chemical inputs."
+ icon_state = "stacker"
+ holds_minerals = TRUE
+ processable_materials = list(
+ /datum/material/glass,
+ /datum/material/plasma,
+ /datum/material/diamond,
+ /datum/material/bluespace,
+ /datum/material/bananium,
+ /datum/material/plastic,
+ )
+ circuit = /obj/item/circuitboard/machine/refinery
+ usage_sound = 'sound/machines/mining/refinery.ogg'
+ holds_mining_points = TRUE
+
+/// okay so var that holds mining points to claim
+/// add total of pts from minerals mined in parent proc
+/// then, little mini UI showing points to collect?
+
+/obj/machinery/bouldertech/refinery/RefreshParts()
+ . = ..()
+ var/manipulator_stack = 0
+ var/matter_bin_stack = 0
+ for(var/datum/stock_part/manipulator/servo in component_parts)
+ manipulator_stack += servo.tier - 1
+ boulders_processing_max = clamp(manipulator_stack, 1, 6)
+ for(var/datum/stock_part/matter_bin/bin in component_parts)
+ matter_bin_stack += bin.tier
+ boulders_held_max = matter_bin_stack
+
+
+/obj/machinery/bouldertech/refinery/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ . = ..()
+ if(istype(held_item, /obj/item/boulder))
+ context[SCREENTIP_CONTEXT_LMB] = "Insert boulder"
+ if(istype(held_item, /obj/item/card/id) && points_held > 0)
+ context[SCREENTIP_CONTEXT_LMB] = "Claim mining points"
+ context[SCREENTIP_CONTEXT_RMB] = "Remove boulder"
+ return CONTEXTUAL_SCREENTIP_SET
+
+
+/**
+ * Your other new favorite industrial waste magnet!
+ * Accepts boulders and produces sheets of metalic materials.
+ * Can be upgraded with stock parts or through chemical inputs.
+ * When upgraded, it can hold more boulders and process more at once.
+ *
+ * Chemical inputs can be used to boost the refinery's efficiency, but produces industrial waste, which eats through the station and is generally difficult to store.
+ */
+/obj/machinery/bouldertech/refinery/smelter
+ name = "boulder smelter"
+ desc = "BS for short. Accept boulders and refines metallic ores into sheets. Can be upgraded with stock parts or through gas inputs."
+ icon_state = "smelter"
+ processable_materials = list(
+ /datum/material/iron,
+ /datum/material/titanium,
+ /datum/material/silver,
+ /datum/material/gold,
+ /datum/material/uranium,
+ /datum/material/mythril,
+ /datum/material/adamantine,
+ /datum/material/runite,
+ )
+ light_system = OVERLAY_LIGHT
+ light_outer_range = 1
+ light_power = 2
+ light_color = "#ffaf55"
+ light_on = FALSE
+ circuit = /obj/item/circuitboard/machine/smelter
+ usage_sound = 'sound/machines/mining/smelter.ogg'
+
+/obj/machinery/bouldertech/refinery/smelter/RefreshParts()
+ . = ..()
+ light_power = boulders_processing_max
+
+/obj/machinery/bouldertech/refinery/smelter/accept_boulder(obj/item/boulder/new_boulder)
+ . = ..()
+ if(.)
+ set_light_on(TRUE)
+ return TRUE
+
+
+/obj/machinery/bouldertech/refinery/smelter/process()
+ . = ..()
+ if(. == PROCESS_KILL)
+ set_light_on(FALSE)
+
+/obj/machinery/bouldertech/refinery/process()
+ if(!anchored)
+ return PROCESS_KILL
+ var/stop_processing_check = FALSE
+ var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call
+ for(var/obj/item/potential_boulder as anything in boulders_contained)
+ if(QDELETED(potential_boulder))
+ boulders_contained -= potential_boulder
+ break
+ if(boulders_concurrent <= 0)
+ break //Try again next time
+
+ if(istype(potential_boulder, /obj/item/processing/refined_dust))
+ refine_dust(potential_boulder)
+
+ if(!istype(potential_boulder, /obj/item/boulder) && !istype(potential_boulder, /obj/item/processing/refined_dust))
+ potential_boulder.forceMove(drop_location())
+ CRASH("\The [src] had a non-boulder in it's boulders contained!")
+
+ var/obj/item/boulder/boulder = potential_boulder
+ if(boulder.durability < 0)
+ CRASH("\The [src] had a boulder with negative durability!")
+ if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process.
+ boulders_concurrent-- //We count skipped boulders
+ remove_boulder(boulder)
+ continue
+ boulders_concurrent--
+ boulder.durability-- //One less durability to the processed boulder.
+ if(COOLDOWN_FINISHED(src, sound_cooldown))
+ COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS)
+ playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call.
+ stop_processing_check = TRUE
+ if(boulder.durability <= 0)
+ breakdown_boulder(boulder) //Crack that bouwlder open!
+ continue
+ if(!stop_processing_check)
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
+ return PROCESS_KILL
+
+/obj/machinery/bouldertech/refinery/proc/refine_dust(obj/item/processing/refined_dust/dust)
+ use_power(BASE_MACHINE_ACTIVE_CONSUMPTION)
+ var/list/processable_ores = list()
+ for(var/datum/material/possible_mat as anything in dust.custom_materials)
+ if(!is_type_in_list(possible_mat, processable_materials))
+ continue
+ var/quantity = dust.custom_materials[possible_mat]
+ points_held = round((points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER))) // put point total here into machine
+ processable_ores += possible_mat
+ processable_ores[possible_mat] = quantity
+ dust.custom_materials -= possible_mat //Remove it from the boulder now that it's tracked
+
+ var/obj/item/boulder/disposable_boulder = new (src)
+ disposable_boulder.custom_materials = processable_ores
+ silo_materials.mat_container.insert_item(disposable_boulder, refining_efficiency)
+ qdel(dust)
+ playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ update_boulder_count()
+
+/obj/machinery/bouldertech/refinery/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!anchored)
+ return FALSE
+ if(boulders_contained.len >= boulders_held_max)
+ return FALSE
+ if(istype(mover, /obj/item/processing/refined_dust))
+ return TRUE
+ return ..()
+
+/obj/machinery/bouldertech/refinery/return_extras()
+ var/list/boulders_contained = list()
+ for(var/obj/item/processing/refined_dust/boulder in contents)
+ boulders_contained += boulder
+ return boulders_contained
+
+/obj/machinery/bouldertech/refinery/check_extras(obj/item/item)
+ if(istype(item, /obj/item/processing/refined_dust))
+ return TRUE
+ return FALSE
diff --git a/monkestation/code/modules/factory_type_beat/readme.md b/monkestation/code/modules/factory_type_beat/readme.md
new file mode 100644
index 000000000000..6c08a3c4a8fc
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/readme.md
@@ -0,0 +1 @@
+This also contains the base arcmining stuff in the modular folder as its gonna get real messy
diff --git a/monkestation/code/modules/factory_type_beat/ss_ore_gen.dm b/monkestation/code/modules/factory_type_beat/ss_ore_gen.dm
new file mode 100644
index 000000000000..54ca83428730
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/ss_ore_gen.dm
@@ -0,0 +1,94 @@
+
+SUBSYSTEM_DEF(ore_generation)
+ name = "Ore Generation"
+ wait = 60 SECONDS
+ init_order = INIT_ORDER_DEFAULT
+ runlevels = RUNLEVEL_GAME
+
+ /// All ore vents that are currently producing boulders.
+ var/list/obj/structure/ore_vent/processed_vents = list()
+ /// All the ore vents that are currently in the game, not just the ones that are producing boulders.
+ var/list/obj/structure/ore_vent/possible_vents = list()
+ /// All the boulders that have been produced by ore vents to be pulled by BRM machines.
+ var/list/obj/item/boulder/available_boulders = list()
+ /**
+ * Associated list of minerals to be associated with our ore vents.
+ * Generally Should be empty by the time initialize ends on lavaland.
+ * Each key value is the number of vents that will have this ore as a unique possible choice.
+ */
+ var/static/list/ore_vent_minerals_default = list(
+ /datum/material/iron = 13,
+ /datum/material/glass = 12,
+ /datum/material/plasma = 9,
+ /datum/material/titanium = 6,
+ /datum/material/silver = 5,
+ /datum/material/gold = 5,
+ /datum/material/diamond = 3,
+ /datum/material/uranium = 3,
+ /datum/material/bluespace = 3,
+ )
+ /**
+ * A list of all the minerals that are being mined by ore vents. We reset this list every time cave generation is done.
+ * Generally Should be empty by the time initialize ends on lavaland.
+ * Each key value is the number of vents that will have this ore as a unique possible choice.
+ * If we call cave_generation more than once, we copy a list from the lists in lists/ores_spawned.dm
+ */
+ var/list/ore_vent_minerals = list()
+
+ /// A tracker of how many of each ore vent size we have in the game. Useful for tracking purposes.
+ var/list/ore_vent_sizes = list(
+ LARGE_VENT_TYPE = 0,
+ MEDIUM_VENT_TYPE = 0,
+ SMALL_VENT_TYPE = 0,
+ )
+ /// Ores spawned by proximity to an ore vent. Useful for logging purposes.
+ var/list/post_ore_random = list(
+ "1" = 0,
+ "2" = 0,
+ "3" = 0,
+ "4" = 0,
+ "5" = 0,
+ )
+ /// Ores spawned randomly on the map without proximity to an ore vent. Useful for logging purposes.
+ var/list/post_ore_manual = list(
+ "1" = 0,
+ "2" = 0,
+ "3" = 0,
+ "4" = 0,
+ "5" = 0,
+ )
+
+/datum/controller/subsystem/ore_generation/Initialize()
+ //Basically, we're going to round robin through the list of ore vents and assign a mineral to them until complete.
+ while(length(ore_vent_minerals) > 0) //Keep looping if there's more to assign
+ var/stallbreaker = 0
+ for(var/obj/structure/ore_vent/vent as anything in possible_vents)
+ if(length(ore_vent_minerals) <= 0) //But break early if there's none left.
+ break
+ if(vent.unique_vent)
+ continue //Ya'll already got your minerals.
+ if(length(difflist(first = ore_vent_minerals, second = vent.mineral_breakdown, skiprep = 1)))
+ vent.generate_mineral_breakdown(new_minerals = 1, map_loading = TRUE)
+ else
+ stallbreaker++
+ if(stallbreaker >= length(possible_vents))
+ break //We've done all we can here. break inner loop
+ continue
+ if(stallbreaker >= length(possible_vents))
+ break //We've done all we can here. break outer loop
+
+ return SS_INIT_SUCCESS
+
+/datum/controller/subsystem/ore_generation/fire(resumed)
+ available_boulders.Cut() // reset upon new fire.
+ for(var/obj/structure/ore_vent/current_vent as anything in processed_vents)
+
+ var/local_vent_count = 0
+ for(var/obj/item/boulder/old_rock in current_vent.loc)
+ available_boulders += old_rock
+ local_vent_count++
+
+ if(local_vent_count >= MAX_BOULDERS_PER_VENT)
+ continue //We don't want to be accountable for literally hundreds of unprocessed boulders for no reason.
+
+ available_boulders += current_vent.produce_boulder()
diff --git a/monkestation/code/modules/factory_type_beat/technodes.dm b/monkestation/code/modules/factory_type_beat/technodes.dm
new file mode 100644
index 000000000000..27557f460ed2
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/technodes.dm
@@ -0,0 +1,18 @@
+/datum/techweb_node/ore_processing
+ id = "ore_processing_nodes"
+ display_name = "Ore Processing Nodes"
+ description = "Contains all of the ore processing designs."
+ design_ids = list(
+ "brine_chamber",
+ "purification_chamber",
+ "enricher",
+ "crusher",
+ "crystalizer",
+ "chemical_injector",
+ "chemical_washer",
+ "dissolution_chamber",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000000000000000) // God save you
+ hidden = TRUE
+ show_on_wiki = FALSE
+ starting_node = TRUE
diff --git a/monkestation/code/modules/factory_type_beat/yummy.dm b/monkestation/code/modules/factory_type_beat/yummy.dm
new file mode 100644
index 000000000000..248f1507b34f
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/yummy.dm
@@ -0,0 +1,17 @@
+/obj/item/organ/internal/cyberimp/chest/gyro
+ name = "Gyrotron-3000"
+ desc = "Blood sweat and tears went into this bad boy."
+ encode_info = AUGMENT_NO_REQ
+ icon_state = "sandy"
+ actions_types = list(/datum/action/item_action/organ_action/sandy)
+ icon = 'monkestation/code/modules/cybernetics/icons/implants.dmi'
+
+ /// The bodypart overlay datum we should apply to whatever mob we are put into
+ visual_implant = TRUE
+ bodypart_overlay = /datum/bodypart_overlay/simple/gyro
+
+
+/datum/bodypart_overlay/simple/gyro
+ icon = 'monkestation/code/modules/factory_type_beat/icons/mining_machines.dmi'
+ icon_state = "gyrotron-3000"
+ layers = EXTERNAL_FRONT
diff --git a/monkestation/code/modules/ghost_critters/ghost_critter_mobs/donator_mobs.dm b/monkestation/code/modules/ghost_critters/ghost_critter_mobs/donator_mobs.dm
index d655ba9db7f9..0c852b29ef40 100644
--- a/monkestation/code/modules/ghost_critters/ghost_critter_mobs/donator_mobs.dm
+++ b/monkestation/code/modules/ghost_critters/ghost_critter_mobs/donator_mobs.dm
@@ -1,4 +1,4 @@
-/mob/living/basic/var/list/ckeywhitelist = list()
+/mob/living/basic/var/list/ckeywhitelist
/client/proc/return_donator_mobs()
var/list/mobs = list(
diff --git a/monkestation/code/modules/loadouts/items/neck.dm b/monkestation/code/modules/loadouts/items/neck.dm
index 983b4245e2a8..99825e818760 100644
--- a/monkestation/code/modules/loadouts/items/neck.dm
+++ b/monkestation/code/modules/loadouts/items/neck.dm
@@ -289,12 +289,12 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck)
restricted_roles = list(JOB_HEAD_OF_SECURITY)
requires_purchase = FALSE
-/*
+
/datum/loadout_item/neck/mantle_bs
name = "Blueshield's Mantle"
item_path = /obj/item/clothing/neck/mantle/bsmantle
restricted_roles = list(JOB_BLUESHIELD)
-*/
+
/datum/loadout_item/neck/mantle_cap
name = "Captain's Mantle"
item_path = /obj/item/clothing/neck/mantle/capmantle
diff --git a/monkestation/code/modules/mech_comp/objects/flush.dm b/monkestation/code/modules/mech_comp/objects/flush.dm
index 649208b3810a..8aa0672df51f 100644
--- a/monkestation/code/modules/mech_comp/objects/flush.dm
+++ b/monkestation/code/modules/mech_comp/objects/flush.dm
@@ -27,6 +27,11 @@
trunk_check()
if(!trunk || !COOLDOWN_FINISHED(src, flush_cd) || !input?.cmd)
return
+
+ if(QDELETED(trunk))
+ trunk = null
+ return
+
var/count = 0
for(var/atom/movable/listed_movable in src.loc)
if(listed_movable.anchored)
diff --git a/monkestation/code/modules/mech_comp/objects/messages/button.dm b/monkestation/code/modules/mech_comp/objects/messages/button.dm
index 2d6b169339d7..9dac64079b44 100644
--- a/monkestation/code/modules/mech_comp/objects/messages/button.dm
+++ b/monkestation/code/modules/mech_comp/objects/messages/button.dm
@@ -21,6 +21,8 @@
if(!user.dropItemToGround(src))
return
+ if(!user.CanReach(target))
+ return
forceMove(target)
if(isclosedturf(target))
icon_up = "comp_switch"
diff --git a/monkestation/code/modules/mob/dead/new_player/new_player.dm b/monkestation/code/modules/mob/dead/new_player/new_player.dm
index 5f6d6cb8d5c0..ff657817d278 100644
--- a/monkestation/code/modules/mob/dead/new_player/new_player.dm
+++ b/monkestation/code/modules/mob/dead/new_player/new_player.dm
@@ -1,3 +1,8 @@
/mob/dead/new_player
/// What is our temp assignment, used for round start antag calculation
var/datum/job/temp_assignment
+
+/mob/dead/new_player/Destroy()
+ . = ..()
+ if(temp_assignment)
+ temp_assignment = null
diff --git a/monkestation/code/modules/patches_if_they_were_cool/_base_patch_changes.dm b/monkestation/code/modules/patches_if_they_were_cool/_base_patch_changes.dm
index 2271f350f103..0d831130c7d9 100644
--- a/monkestation/code/modules/patches_if_they_were_cool/_base_patch_changes.dm
+++ b/monkestation/code/modules/patches_if_they_were_cool/_base_patch_changes.dm
@@ -17,8 +17,9 @@
if(!isliving(target))
return
- if(!do_after(user, CHEM_INTERACT_DELAY(0.1 SECONDS, user), target))
- return
+ if(target != user)
+ if(!do_after(user, CHEM_INTERACT_DELAY(3 SECONDS, user), target))
+ return
var/list/parameters = params2list(params)
if(!LAZYACCESS(parameters, ICON_X) || !LAZYACCESS(parameters, ICON_Y))
@@ -62,8 +63,9 @@
/obj/item/reagent_containers/pill/patch/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
- if(!. && prob(15) && isliving(hit_atom))
- stick(hit_atom,rand(-7,7),rand(-7,7))
+ if(!. && prob(10) && isliving(hit_atom))
+ stick(hit_atom, throwingdatum.thrower, rand(-7,7), rand(-7,7))
+ to_chat(attached, span_bolddanger("[src] has stuck to you."))
attached.balloon_alert_to_viewers("[src] lands on its sticky side!")
///Signal handler for COMSIG_LIVING_IGNITED, deletes this patch, if it is flammable
diff --git a/monkestation/code/modules/physics/physics_component.dm b/monkestation/code/modules/physics/physics_component.dm
index 185718e92802..c36ea828065d 100644
--- a/monkestation/code/modules/physics/physics_component.dm
+++ b/monkestation/code/modules/physics/physics_component.dm
@@ -64,6 +64,8 @@
var/datum/callback/bounce_callback
/// If we have this callback, it gets invoked when stopping movement
var/datum/callback/stop_callback
+ /// If we have this callback, it gets invoked when bumping on another atom
+ var/datum/callback/bump_callback
/**
* The cached animate_movement of the parent
@@ -94,6 +96,7 @@
bounce_spin_clockwise = 0,
bounce_sound,
bounce_callback,
+ bump_callback,
stop_callback,
)
if(!ismovable(parent))
@@ -118,6 +121,7 @@
src.bounce_spin_clockwise = bounce_spin_clockwise
src.bounce_sound = bounce_sound
src.bounce_callback = bounce_callback
+ src.bump_callback = bump_callback
src.stop_callback = stop_callback
set_angle(angle)
@@ -128,6 +132,7 @@
return ..()
/datum/component/movable_physics/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_MOVABLE_NEWTONIAN_MOVE, PROC_REF(on_newtonian_move))
RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump))
if(isitem(parent))
RegisterSignal(parent, COMSIG_ITEM_PICKUP, PROC_REF(on_item_pickup))
@@ -158,22 +163,28 @@
//this code basically only makes sense if we only move at most a single tile per tick, it is absolutely fucked otherwise
while(tick_amount > 0)
tick_amount--
+ //we need to know if we have gravity right now to apply friction and such, yeah
+ var/has_gravity = moving_atom.has_gravity()
+
moving_atom.pixel_x = round(moving_atom.pixel_x + (horizontal_velocity * sin(angle)), MOVABLE_PHYSICS_PRECISION)
moving_atom.pixel_y = round(moving_atom.pixel_y + (horizontal_velocity * cos(angle)), MOVABLE_PHYSICS_PRECISION)
- moving_atom.pixel_z = round(max(z_floor, moving_atom.pixel_z + vertical_velocity), MOVABLE_PHYSICS_PRECISION)
+ moving_atom.pixel_z = round(clamp(moving_atom.pixel_z + vertical_velocity, z_floor, world.icon_size), MOVABLE_PHYSICS_PRECISION)
moving_atom.adjust_visual_angle(round(visual_angle_velocity, 1))
- horizontal_velocity = max(0, horizontal_velocity - horizontal_friction)
- // we are not on the floor, apply friction
- if(moving_atom.pixel_z > z_floor)
- vertical_velocity -= vertical_friction
- // we are on the floor, try to bounce if we have any vertical velocity
- else if(moving_atom.pixel_z <= z_floor && vertical_velocity)
- z_floor_bounce(moving_atom)
-
- visual_angle_velocity = max(0, visual_angle_velocity - visual_angle_friction)
+ if(has_gravity)
+ visual_angle_velocity = max(0, visual_angle_velocity - visual_angle_friction)
+ horizontal_velocity = max(0, horizontal_velocity - horizontal_friction)
+ // we are not on the floor, apply friction
+ if(moving_atom.pixel_z > z_floor)
+ vertical_velocity -= vertical_friction
+ // we are on the floor, try to bounce if we have any vertical velocity
+ else if(moving_atom.pixel_z <= z_floor && vertical_velocity)
+ z_floor_bounce(moving_atom)
+ // z_floor_bounce could have deleted us
+ if(QDELETED(src))
+ return
var/move_direction = NONE
var/effective_pixel_x = moving_atom.pixel_x - moving_atom.base_pixel_x
@@ -257,6 +268,12 @@
/datum/component/movable_physics/proc/set_angle(new_angle)
angle = SIMPLIFY_DEGREES(new_angle)
+/// We do not EVER want newtonian movement while handling movement ourselves, so block it!
+/datum/component/movable_physics/proc/on_newtonian_move(atom/movable/source, direction, start_delay)
+ SIGNAL_HANDLER
+
+ return COMPONENT_MOVABLE_NEWTONIAN_BLOCK
+
/// Proc for bouncing, aka object reached z_floor on pixel_z and needs a dose of Newton's third law
/datum/component/movable_physics/proc/z_floor_bounce(atom/movable/moving_atom)
moving_atom.pixel_z = round(z_floor, MOVABLE_PHYSICS_PRECISION)
@@ -276,6 +293,8 @@
var/incidence = GET_ANGLE_OF_INCIDENCE(face_angle, angle + 180)
var/new_angle = SIMPLIFY_DEGREES(face_angle + incidence)
set_angle(new_angle)
+ if(bump_callback)
+ bump_callback.Invoke(bumped_atom)
if(!visual_angle_velocity)
return
incidence = GET_ANGLE_OF_INCIDENCE(face_angle, source.visual_angle + 180)
diff --git a/monkestation/code/modules/pollution/pollution_emitter_element.dm b/monkestation/code/modules/pollution/pollution_emitter_element.dm
index 69e5ea083da4..d886bd391709 100644
--- a/monkestation/code/modules/pollution/pollution_emitter_element.dm
+++ b/monkestation/code/modules/pollution/pollution_emitter_element.dm
@@ -35,4 +35,4 @@ PROCESSING_SUBSYSTEM_DEF(pollution_emitters)
return PROCESS_KILL
for(var/atom/affected_atom as anything in affected)
var/turf/my_turf = get_turf(affected_atom)
- my_turf.pollute_turf(pollutant_type, pollutant_amount)
+ my_turf?.pollute_turf(pollutant_type, pollutant_amount)
diff --git a/monkestation/code/modules/reagents/chemistry/reagents/other_reagents.dm b/monkestation/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 6fd26f35b908..2862da172fb7 100644
--- a/monkestation/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/monkestation/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -9,8 +9,8 @@
/datum/reagent/acetone_oxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people kills people!
. = ..()
if(methods & TOUCH | VAPOR | INGEST)
- exposed_mob.adjustFireLoss(((reac_volume * 2) / 1.65))
- exposed_mob.adjust_fire_stacks((reac_volume / 5))
+ exposed_mob.adjustFireLoss(min((reac_volume * 0.5) / 1.65, 25))
+ exposed_mob.adjust_fire_stacks(round(reac_volume / 50))
/datum/reagent/acetone_oxide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) // Old acetone oxide didn't have a metabolism effect!
. = ..()
@@ -58,7 +58,7 @@
/datum/reagent/hydrogen_peroxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with h2o2 can burn them !
. = ..()
if(methods & TOUCH)
- exposed_mob.adjustFireLoss(((reac_volume * 2) / 3))
+ exposed_mob.adjustFireLoss(min((reac_volume * 0.5) / 3, 25))
/datum/reagent/hydrogen_peroxide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) // Old h2o2 didn't have a metabolizing effect either!
. = ..()
diff --git a/monkestation/code/modules/smithing/ipcs/species.dm b/monkestation/code/modules/smithing/ipcs/species.dm
index 101eef01e94f..00af82672889 100644
--- a/monkestation/code/modules/smithing/ipcs/species.dm
+++ b/monkestation/code/modules/smithing/ipcs/species.dm
@@ -22,7 +22,6 @@
TRAIT_LIMBATTACHMENT,
TRAIT_LITERATE,
TRAIT_REVIVES_BY_HEALING,
- TRAIT_NOCRITDAMAGE, // We do our own handling of crit damage.
TRAIT_NO_DNA_COPY,
)
@@ -71,6 +70,7 @@
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/robot/ipc,
)
+ brutemod = 1.5
coldmod = 1.2
heatmod = 2 // TWO TIMES DAMAGE FROM BEING TOO HOT?! WHAT?! No wonder lava is literal instant death for us.
siemens_coeff = 1.4 // Not more because some shocks will outright crit you, which is very unfun
diff --git a/monkestation/code/modules/smithing/oozelings/species.dm b/monkestation/code/modules/smithing/oozelings/species.dm
index b71c429b98de..ad0e7ada02dc 100644
--- a/monkestation/code/modules/smithing/oozelings/species.dm
+++ b/monkestation/code/modules/smithing/oozelings/species.dm
@@ -105,6 +105,7 @@
if(core_signal)
core_signal.Remove(C)
..()
+ C.blood_volume = BLOOD_VOLUME_SAFE
/datum/species/oozeling/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm
index 700957dff6c6..cbf469a3fb3c 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm
@@ -8,6 +8,7 @@
restricted_roles = list(
JOB_AI,
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_CHAPLAIN,
JOB_CYBORG,
JOB_DETECTIVE,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm
index 1bdf4c177a0a..30ec0ef49fbf 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm
@@ -4,6 +4,7 @@
antag_datum = /datum/antagonist/bloodsucker
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm
index a2413bc3e608..90a6f492aba0 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm
@@ -5,6 +5,7 @@
tags = list(TAG_COMBAT, TAG_TEAM_ANTAG)
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm
index 39e9d605a7e4..f198a7b2e85b 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm
@@ -4,6 +4,7 @@
antag_datum = /datum/antagonist/changeling
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm
index 3f7475364bc1..d61c09ddfe94 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm
@@ -8,6 +8,7 @@
restricted_roles = list(
JOB_AI,
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_CHAPLAIN,
JOB_CYBORG,
JOB_DETECTIVE,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
index dc86d98cb9b9..65950c93feca 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
@@ -8,6 +8,7 @@
restricted_roles = list(
JOB_AI,
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_CYBORG,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
index e9271d387ba0..54ed3b23756c 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
@@ -34,7 +34,7 @@
// I give up, just there should be enough heads with 35 players...
min_players = 35
earliest_start = 60 MINUTES
- weight = 4
+ weight = 3
max_occurrences = 1
prompted_picking = TRUE
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm
index 726b1a809bbf..9050bbdf1941 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm
@@ -4,6 +4,7 @@
antag_datum = /datum/antagonist/heretic
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm
index 52f7647ae515..01441f7a84b5 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm
@@ -8,6 +8,7 @@
antag_datum = /datum/antagonist/monsterhunter
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
index f2a5a12a3e14..54685b4f4871 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
@@ -8,6 +8,7 @@
restricted_roles = list(
JOB_AI,
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_CYBORG,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm b/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm
index bfb3b8294c2e..deb7b8b1e792 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm
@@ -5,6 +5,7 @@
typepath = /datum/round_event/antagonist/solo/obsessed
restricted_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm
index eb8fce9f4aeb..9d9b08303e61 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm
@@ -8,6 +8,7 @@
restricted_roles = list(
JOB_AI,
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_CYBORG,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm
index 58ed6dd76653..ede797b7be16 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm
@@ -4,6 +4,7 @@
antag_datum = /datum/antagonist/traitor/infiltrator
protected_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER,
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm
index 70e042c70f47..b0426a0191c8 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm
@@ -7,6 +7,7 @@
shared_occurence_type = SHARED_HIGH_THREAT
restricted_roles = list(
JOB_CAPTAIN,
+ JOB_BLUESHIELD,
JOB_HEAD_OF_SECURITY,
) // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted
maximum_antags = 1
diff --git a/monkestation/code/modules/trading/unusual_effects/animation_housing/__spawning_component.dm b/monkestation/code/modules/trading/unusual_effects/animation_housing/__spawning_component.dm
index 9ccf5603098c..a7d1df45c69a 100644
--- a/monkestation/code/modules/trading/unusual_effects/animation_housing/__spawning_component.dm
+++ b/monkestation/code/modules/trading/unusual_effects/animation_housing/__spawning_component.dm
@@ -6,6 +6,8 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'monkestation/code/modules/trading/icons/particles.dmi'
icon_state = "none"
+ underlays = null
+ overlays = null
/datum/component/particle_spewer
var/atom/source_object
@@ -117,7 +119,8 @@
for(var/i = 0 to burstees)
//create and assign particle its stuff
- var/obj/effect/abstract/particle/spawned = new(get_turf(source_object))
+ var/obj/effect/abstract/particle/spawned
+ spawned = new(get_turf(source_object))
if(offsets)
spawned.pixel_x = offset_x
spawned.pixel_y = offset_y
diff --git a/monkestation/code/modules/trading/unusual_effects/animation_housing/money.dm b/monkestation/code/modules/trading/unusual_effects/animation_housing/money.dm
new file mode 100644
index 000000000000..baacfb56682b
--- /dev/null
+++ b/monkestation/code/modules/trading/unusual_effects/animation_housing/money.dm
@@ -0,0 +1,38 @@
+/datum/component/particle_spewer/cash
+ unusual_description = "cashflow"
+ icon_file = 'icons/obj/economy.dmi'
+ particle_state = "spacecash1"
+ burst_amount = 1
+ duration = 2 SECONDS
+ random_bursts = TRUE
+ spawn_interval = 6 SECONDS
+
+/datum/component/particle_spewer/cash/animate_particle(obj/effect/abstract/particle/spawned)
+ var/chance = rand(1, 10)
+ switch(chance)
+ if(1 to 2)
+ spawned.icon_state = "spacecash1"
+ if(3 to 4)
+ spawned.icon_state = "spacecash10"
+ if(5 to 6)
+ spawned.icon_state = "spacecash50"
+ else
+ spawned.icon_state = "spacecash20"
+
+ if(prob(65))
+ spawned.layer = LOW_ITEM_LAYER
+ spawned.pixel_x += rand(-12, 12)
+ spawned.pixel_y += rand(-5, 5)
+ . = ..()
+
+/datum/component/particle_spewer/cash/adjust_animate_steps()
+ animate_holder.add_animation_step(list(transform = matrix(0.5, 0.5, MATRIX_SCALE), alpha = 125, time = 0))
+
+ animate_holder.add_animation_step(list(transform = "RANDOM", time = 2 SECONDS, pixel_y = "RANDOM", pixel_x = "RANDOM", easing = LINEAR_EASING))
+
+ animate_holder.set_random_var(2, "transform", list(-90, 90))
+ animate_holder.set_random_var(2, "pixel_x", list(-16, 16))
+ animate_holder.set_random_var(2, "pixel_y", list(-16, 16))
+ animate_holder.set_transform_type(2, MATRIX_ROTATE)
+
+ animate_holder.add_animation_step(list(alpha = 25, time = 1.5 SECONDS))
diff --git a/monkestation/code/modules/virology/disease/plague_rat/event.dm b/monkestation/code/modules/virology/disease/plague_rat/event.dm
index 6217eb8d8d10..9ed00b05632a 100644
--- a/monkestation/code/modules/virology/disease/plague_rat/event.dm
+++ b/monkestation/code/modules/virology/disease/plague_rat/event.dm
@@ -1,11 +1,11 @@
/datum/round_event_control/plague_rat
name = "Spawn Plague Rats"
typepath = /datum/round_event/ghost_role/plague_rat
- weight = 7
+ weight = 1
max_occurrences = 1
track = EVENT_TRACK_MAJOR
min_players = 30 //monke edit: 20 to 30
- earliest_start = 30 MINUTES //monke edit: 20 to 60
+ earliest_start = 55 MINUTES //monke edit: 20 to 60
//dynamic_should_hijack = TRUE
category = EVENT_CATEGORY_ENTITIES
description = "Spawns a horde of plague rats."
diff --git a/monkestation/code/modules/virology/disease/plague_rat/plague_rat.dm b/monkestation/code/modules/virology/disease/plague_rat/plague_rat.dm
index 4375985d7f24..74f945c91f25 100644
--- a/monkestation/code/modules/virology/disease/plague_rat/plague_rat.dm
+++ b/monkestation/code/modules/virology/disease/plague_rat/plague_rat.dm
@@ -6,9 +6,17 @@
icon_living = "mouse_plague"
icon_dead = "mouse_plague_dead"
+ maxHealth = 30
+ health = 30
+
melee_damage_lower = 4
melee_damage_upper = 7
chooses_bodycolor = FALSE
+ pass_flags = PASSTABLE|PASSGRILLE|PASSMOB|PASSDOORS
+
+/mob/living/basic/mouse/plague/Initialize(mapload, tame, new_body_color)
+ . = ..()
+ add_movespeed_modifier(/datum/movespeed_modifier/plague_rat)
/mob/living/basic/mouse/plague/attack_hand(mob/living/carbon/human/user, list/modifiers)
@@ -29,3 +37,6 @@
/mob/living/basic/mouse/attackby(obj/item/attacking_item, mob/living/user, params)
. = ..()
attacking_item.disease_contact(src, BODY_ZONE_CHEST)
+
+/datum/movespeed_modifier/plague_rat
+ multiplicative_slowdown = 0.5
diff --git a/monkestation/code/modules/virology/disease/symptom_cracker/cracker_puzzle.dm b/monkestation/code/modules/virology/disease/symptom_cracker/cracker_puzzle.dm
index f5d0d7108999..0c62231805fe 100644
--- a/monkestation/code/modules/virology/disease/symptom_cracker/cracker_puzzle.dm
+++ b/monkestation/code/modules/virology/disease/symptom_cracker/cracker_puzzle.dm
@@ -17,6 +17,8 @@
var/datum/parent
+ var/list/plotted_points = list()
+
/datum/cracker_puzzle/New(grid_size = 5, difficulty = 1, datum/parent)
src.grid_size = grid_size
src.difficulty = difficulty
@@ -47,37 +49,23 @@
var/sequence_length = 4 + difficulty
- var/last_sequence_spot = null
- var/last_vertical_sequence_spot = null
+ var/last_sequence_spot = rand(1, grid_size)
+ var/last_vertical_sequence_spot = rand(1, grid_size)
var/vertical = FALSE
for(var/i = 1 to sequence_length)
if(vertical)
- var/vertical_spot = rand(1, grid_size)
- var/list/horizontal_cut = grid[vertical_spot]
- sequence += horizontal_cut[last_vertical_sequence_spot]
- var/horizontal_choice = rand(1, grid_size)
- last_sequence_spot = horizontal_choice
-
- vertical = FALSE
-
+ var/vertical_spot = rand(1, grid_size) // Random row (y-coordinate)
+ var/list/horizontal_cut_vert = grid[vertical_spot] // Get the row corresponding to vertical_spot
+ sequence += horizontal_cut_vert[last_sequence_spot] // Use the last x-coordinate to select the letter
+ last_vertical_sequence_spot = vertical_spot // Update the y-coordinate
+ plotted_points += "[last_sequence_spot], [last_vertical_sequence_spot]" // Log the coordinate pair
+ vertical = FALSE // Switch to horizontal for the next iteration
else
- if(!last_sequence_spot)
- ///grabs the horizontal slice of the grid
- var/horizontal_spot = rand(1, grid_size)
- var/list/horizontal_cut = grid[horizontal_spot]
-
- last_sequence_spot = horizontal_spot //sets the last slice position
-
- var/vertical_spot = rand(1, grid_size)// we randomize the selection inside the slice
- sequence += horizontal_cut[vertical_spot]
- last_vertical_sequence_spot = vertical_spot //set the last vertical spot to this
- else
- var/list/choices = grid[last_sequence_spot]
- var/grid_selection = rand(1, grid_size)
- last_vertical_sequence_spot = grid_selection
- sequence += choices[grid_selection]
-
- vertical = TRUE
+ var/horizontal_spot = rand(1, grid_size) // Random column (x-coordinate)
+ sequence += grid[last_vertical_sequence_spot][horizontal_spot] // Access the column in the current row
+ last_sequence_spot = horizontal_spot // Update the x-coordinate
+ plotted_points += "[last_sequence_spot], [last_vertical_sequence_spot]" // Log the coordinate pair
+ vertical = TRUE // Switch to vertical for the next iteration
/datum/cracker_puzzle/proc/check_press(x, y)
diff --git a/monkestation/code/modules/virology/disease/symptom_varients/base.dm b/monkestation/code/modules/virology/disease/symptom_varients/base.dm
index 88e3615cef15..8a431f328336 100644
--- a/monkestation/code/modules/virology/disease/symptom_varients/base.dm
+++ b/monkestation/code/modules/virology/disease/symptom_varients/base.dm
@@ -46,5 +46,5 @@
COOLDOWN_START(src, host_cooldown, cooldown_time)
/datum/symptom_varient/proc/Copy(datum/symptom/new_symp)
- var/datum/symptom_varient/new_varient = new (new_symp)
+ var/datum/symptom_varient/new_varient = new new_symp
return new_varient
diff --git a/monkestation/code/modules/virology/disease/symtoms/restricted/stage3.dm b/monkestation/code/modules/virology/disease/symtoms/restricted/stage3.dm
index 1fd8e9e54005..ebdd77b0cc58 100644
--- a/monkestation/code/modules/virology/disease/symtoms/restricted/stage3.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/restricted/stage3.dm
@@ -45,7 +45,7 @@
if(prob(1))
mob.emote("drool")
if(prob(1.5))
- mob.adjustCloneLoss(1, FALSE)
+ mob.adjustToxLoss(1, FALSE)
if(prob(1))
to_chat(mob, span_danger("Your skin feels strange."))
@@ -56,7 +56,7 @@
mob.emote("drool")
if(prob(2.5))
mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
- mob.adjustCloneLoss(2, FALSE)
+ mob.adjustToxLoss(2, FALSE)
if(prob(7.5))
mob.adjust_stutter(6 SECONDS)
if(5)
@@ -67,5 +67,5 @@
if(prob(2.5))
to_chat(mob, span_danger("Your skin starts degrading!"))
if(prob(5))
- mob.adjustCloneLoss(5, FALSE)
+ mob.adjustToxLoss(5, FALSE)
mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
diff --git a/monkestation/code/modules/virology/disease/symtoms/stage2.dm b/monkestation/code/modules/virology/disease/symtoms/stage2.dm
index 95136fc53d52..e00750ca7466 100644
--- a/monkestation/code/modules/virology/disease/symtoms/stage2.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/stage2.dm
@@ -368,8 +368,8 @@
/datum/symptom/famine/activate(mob/living/mob)
if(ishuman(mob))
var/mob/living/carbon/human/victim = mob
- if(ispodperson(victim))
- victim.adjustCloneLoss(5 * multiplier) //Plantmen take a LOT of damag
+ if(ispodperson(victim)) //Plantmen take a LOT of damage
+ victim.adjustToxLoss(5 * multiplier)
for(var/obj/item/food/grown/crop in range(2 * multiplier,mob))
crop.visible_message(span_warning("\The [crop] rots at an alarming rate!"))
diff --git a/monkestation/code/modules/virology/disease/symtoms/stage3.dm b/monkestation/code/modules/virology/disease/symtoms/stage3.dm
index 0086dbeb9853..05379d006233 100644
--- a/monkestation/code/modules/virology/disease/symtoms/stage3.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/stage3.dm
@@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list())
var/mob/living/carbon/human/H = mob
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 50)
else
- mob.setCloneLoss(50)
+ mob.setToxLoss(50)
/datum/symptom/hallucinations
name = "Hallucinational Syndrome"
@@ -451,8 +451,12 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list())
desc = "Causes the infected to oversynthesize stem cells engineered towards organ generation, causing damage to the host's organs in the process. Said generated organs are expelled from the body upon completion."
stage = 3
badness = EFFECT_DANGER_HARMFUL
+ COOLDOWN_DECLARE(organ_cooldown)
/datum/symptom/teratoma/activate(mob/living/carbon/mob)
+ if(!COOLDOWN_FINISHED(src, organ_cooldown))
+ return
+ COOLDOWN_START(src, organ_cooldown, 2 MINUTES)
var/fail_counter = 0
var/not_passed = TRUE
var/obj/item/organ/spawned_organ
diff --git a/monkestation/code/modules/virology/disease/symtoms/stage4.dm b/monkestation/code/modules/virology/disease/symtoms/stage4.dm
index b607c9384a1a..94354c3a3425 100644
--- a/monkestation/code/modules/virology/disease/symtoms/stage4.dm
+++ b/monkestation/code/modules/virology/disease/symtoms/stage4.dm
@@ -68,9 +68,9 @@
/datum/symptom/dna/activate(mob/living/carbon/mob)
mob.bodytemperature = max(mob.bodytemperature, 350)
- scramble_dna(mob, TRUE, TRUE, TRUE, rand(15, 45))
- if(mob.cloneloss <= 50)
- mob.adjustCloneLoss(10)
+ scramble_dna(mob, TRUE, TRUE, TRUE, rand(15,45))
+ if(mob.toxloss <= 50)
+ mob.adjustToxLoss(10)
/datum/symptom/immortal
name = "Longevity Syndrome"
@@ -92,8 +92,8 @@
total_healed += heal_amt * 0.2
else
total_healed += (heal_amt - current_health) * 0.2
- mob.heal_overall_damage(brute = heal_amt, burn = heal_amt, updating_health = FALSE)
- mob.adjustCloneLoss(-heal_amt, updating_health = TRUE)
+ mob.heal_overall_damage(brute = heal_amt, burn = heal_amt)
+ mob.adjustToxLoss(-heal_amt)
/datum/symptom/immortal/deactivate(mob/living/carbon/mob)
if(ishuman(mob))
@@ -147,16 +147,28 @@
stage = 4
max_multiplier = 7
badness = EFFECT_DANGER_HARMFUL
- var/spawn_type= /mob/living/basic/spider/growing/spiderling/guard
- var/spawn_name="spiderling"
+ var/list/spawn_types= list(/mob/living/basic/spider/growing/spiderling/guard = 10)
+ ///what gets added based on multiplier NOT INCLUSIVE OF PREVIOUS TIERS
+ var/list/multipler_unlocks = list()
/datum/symptom/spawn/activate(mob/living/carbon/mob)
- playsound(mob.loc, 'sound/effects/splat.ogg', vol = 50, vary = TRUE)
+ check_unlocks()
+ playsound(mob.loc, 'sound/effects/splat.ogg', 50, 1)
+ var/atom/spawn_type = pick_weight(spawn_types)
+ var/spawn_name = initial(spawn_type.name)
var/mob/living/spawned_mob = new spawn_type(get_turf(mob))
mob.emote("me", 1, "vomits up a live [spawn_name]!")
if(multiplier < 4)
addtimer(CALLBACK(src, PROC_REF(kill_mob), spawned_mob), 1 MINUTES)
+/datum/symptom/spawn/proc/check_unlocks()
+ spawn_types = initial(spawn_types)
+ var/text_multi = num2text(round(multiplier))
+
+ if(!(text_multi in multipler_unlocks))
+ return
+ spawn_types += multipler_unlocks[text_multi]
+
/datum/symptom/spawn/proc/kill_mob(mob/living/basic/mob)
mob.visible_message(span_warning("The [mob] falls apart!"), span_warning("You fall apart"))
mob.death()
@@ -166,8 +178,13 @@
desc = "Converts the infected's stomach to begin producing creatures of the blattid variety."
stage = 4
badness = EFFECT_DANGER_HINDRANCE
- spawn_type = /mob/living/basic/cockroach
- spawn_name = "cockroach"
+ spawn_types = list(/mob/living/basic/cockroach = 10)
+ multipler_unlocks = list(
+ "4" = list(/mob/living/basic/cockroach/glockroach = 3),
+ "5" = list(/mob/living/basic/cockroach/glockroach = 4),
+ "6" = list(/mob/living/basic/cockroach/glockroach = 5, /mob/living/basic/cockroach/glockroach/mobroach = 3),
+ "7" = list(/mob/living/basic/cockroach/glockroach = 5, /mob/living/basic/cockroach/glockroach/mobroach = 3, /mob/living/basic/cockroach/hauberoach = 3),
+ )
/datum/symptom/gregarious
name = "Gregarious Impetus"
diff --git a/monkestation/code/modules/virology/items/_base_item_additions.dm b/monkestation/code/modules/virology/items/_base_item_additions.dm
index cfe80ba21362..6722945f79bc 100644
--- a/monkestation/code/modules/virology/items/_base_item_additions.dm
+++ b/monkestation/code/modules/virology/items/_base_item_additions.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(infected_items, list())
//how sterile an item is, not used for much atm
var/sterility = 0
/obj/item
- var/list/viruses = list()
+ var/list/viruses
/obj/item/attack_hand(mob/user, list/modifiers)
. = ..()
diff --git a/monkestation/code/modules/virology/items/antibodyscanner.dm b/monkestation/code/modules/virology/items/antibodyscanner.dm
index ec67fb48c823..8222f5bf49ee 100644
--- a/monkestation/code/modules/virology/items/antibodyscanner.dm
+++ b/monkestation/code/modules/virology/items/antibodyscanner.dm
@@ -154,4 +154,9 @@
var/obj/effect/abstract/blank/scan/scanline = new
vis_contents += scanline
- addtimer(CALLBACK(src, GLOBAL_PROC_REF(qdel), scanline), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(remove), scanline), 2 SECONDS)
+
+/atom/movable/proc/remove(atom/scanline)
+ vis_contents -= scanline
+ qdel(scanline)
+
diff --git a/monkestation/code/modules/virology/items/extrapolator.dm b/monkestation/code/modules/virology/items/extrapolator.dm
index a210c43137e4..84d7513bbbc5 100644
--- a/monkestation/code/modules/virology/items/extrapolator.dm
+++ b/monkestation/code/modules/virology/items/extrapolator.dm
@@ -74,18 +74,19 @@
. = ..()
if(!proximity_flag && !scan)
return
- if(isliving(target))
+ if(isliving(target) && target != usr)
user_data = WEAKREF(target)
if(scanner)
if(!scan)
if(length(stored_varient_types))
try_disease_modification(user, target)
- switch(target.extrapolator_act(user, src, scan))
- if(FALSE)
- if(scan)
- to_chat(user, "the extrapolator fails to return any data")
- if(TRUE)
- to_chat(user, span_notice("You store [target]'s blood sample in [src]."))
+ else
+ switch(target.extrapolator_act(user, src, scan))
+ if(FALSE)
+ if(scan)
+ to_chat(user, "the extrapolator fails to return any data")
+ if(TRUE)
+ to_chat(user, span_notice("You store [target]'s blood sample in [src]."))
else
to_chat(user, "the extrapolator has no scanner installed")
diff --git a/monkestation/code/modules/virology/living/mouse.dm b/monkestation/code/modules/virology/living/mouse.dm
index 71ba38f520bc..e1bea9307313 100644
--- a/monkestation/code/modules/virology/living/mouse.dm
+++ b/monkestation/code/modules/virology/living/mouse.dm
@@ -1,11 +1,15 @@
/mob/living/basic/mouse
- var/disease_chance = 50
+ var/disease_chance = 25
+ var/diseased = TRUE
+
+/mob/living/basic/mouse/ratking
+ diseased = FALSE
/mob/living/basic/mouse/Initialize(mapload, tame, new_body_color)
. = ..()
immune_system = new(src)
- if(prob(disease_chance))
+ if(prob(disease_chance) && diseased)
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
var/list/anti = list(
ANTIGEN_BLOOD = 2,
@@ -23,6 +27,7 @@
)
var/datum/disease/advanced/disease = new virus_choice
disease.makerandom(list(50,90),list(10,100),anti,bad,src)
+ disease.spread_flags &= ~DISEASE_SPREAD_AIRBORNE
diseases = list()
diseases += disease
disease.after_add()
diff --git a/monkestation/code/modules/virology/reagents/_stage_mutations.dm b/monkestation/code/modules/virology/reagents/_stage_mutations.dm
index f09d300f7d55..685b44a1ff5f 100644
--- a/monkestation/code/modules/virology/reagents/_stage_mutations.dm
+++ b/monkestation/code/modules/virology/reagents/_stage_mutations.dm
@@ -24,12 +24,12 @@
dish.info = "OUTDATED : [dish.info]"
dish.update_appearance()
-/datum/reagent/toxin/plasma/plasmavirusfood/stage_disease_incubate(datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine)
+/datum/reagent/toxin/plasma/plasmavirusfood/stage_disease_incubate(atom/movable/parent, datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine)
disease.log += "[ROUND_TIME()] Symptom Multiplier Increase (Virus Rations)" for(var/datum/symptom/symptom as anything in symptoms) symptom.multiplier_tweak(0.1) -/datum/reagent/medicine/antipathogenic/spaceacillin/stage_disease_incubate(datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine) +/datum/reagent/medicine/antipathogenic/spaceacillin/stage_disease_incubate(atom/movable/parent, datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine) disease.log += "
[ROUND_TIME()] Symptom Multiplier Decrease (Spaceacillin)" for(var/datum/symptom/symptom as anything in symptoms) symptom.multiplier_tweak(-0.1) diff --git a/monkestation/code/modules/virology/reagents/incubation.dm b/monkestation/code/modules/virology/reagents/incubation.dm index 362afc864361..da7ffb86fbde 100644 --- a/monkestation/code/modules/virology/reagents/incubation.dm +++ b/monkestation/code/modules/virology/reagents/incubation.dm @@ -1,7 +1,7 @@ /datum/reagent/proc/disease_incubate(atom/movable/parent, datum/disease/disease, obj/machinery/disease2/incubator/machine) return -/datum/reagent/proc/stage_disease_incubate(datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine) +/datum/reagent/proc/stage_disease_incubate(atom/movable/parent, datum/disease/disease, list/symptoms, obj/machinery/disease2/incubator/machine) return diff --git a/monkestation/gunning_ing/recoil.dm b/monkestation/gunning_ing/recoil.dm new file mode 100644 index 000000000000..907a7a677f18 --- /dev/null +++ b/monkestation/gunning_ing/recoil.dm @@ -0,0 +1,22 @@ +/obj/item/gun + ///a multiplier of the duration the recoil takes to go back to normal view, this is (recoil*recoil_backtime_multiplier)+1 + var/recoil_backtime_multiplier = 2 + ///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max. + var/recoil_deviation = 22.5 + +/obj/item/gun/ballistic + recoil = 1 +///Makes a recoil-like animation on the mob camera. +/proc/recoil_camera(mob/M, duration, backtime_duration, strength, angle) + if(!M || !M.client) + return + var/client/sufferer = M.client + strength *= world.icon_size + var/oldx = sufferer.pixel_x + var/oldy = sufferer.pixel_y + + //get pixels to move the camera in an angle + var/mpx = sin(angle) * strength + var/mpy = cos(angle) * strength + animate(sufferer, pixel_x = oldx+mpx, pixel_y = oldy+mpy, time = duration, flags = ANIMATION_RELATIVE) + animate(pixel_x = oldx, pixel_y = oldy, time = backtime_duration, easing = BACK_EASING) diff --git a/sound/attributions.txt b/sound/attributions.txt index 4bdcd008aa17..aaafecc9316b 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -122,3 +122,19 @@ https://freesound.org/people/vmgraw/sounds/235610/ vmgraw's "Distant Whistle" (CC 0) https://freesound.org/people/giddster/sounds/414480/ + +rock_break.ogg is taken from Bertsz's Rock Destroy from Freesound.org, CC0: +https://freesound.org/people/Bertsz/sounds/524312/ + +sonar-ping.ogg and radar-ping is taken and modified from SamsterBirdies' Sonar Ping from Freesound.org, CC0: +https://freesound.org/people/SamsterBirdies/sounds/539957/ + +manual_teleport.ogg is taken from Quetzakol's teleport from Freesound.org, CC0: +https://freesound.org/people/Quetzakol/sounds/520743/ + +auto_teleport.ogg is taken from Steaq's A teleportation from Freesound.org, CC0: +https://freesound.org/people/steaq/sounds/560124/ + +refinery.ogg, smelter.ogg, and wooping_teleport.ogg are all original works by ArcaneMusic, +with smelter.ogg using samples from rock_break alongside original sound effects from a warrior electric drill, +where refinery and wooping_teleport are modifications of that same electric drill recording. diff --git a/sound/effects/rock_break.ogg b/sound/effects/rock_break.ogg new file mode 100644 index 000000000000..09f6b1d5d33c Binary files /dev/null and b/sound/effects/rock_break.ogg differ diff --git a/sound/machines/mining/auto_teleport.ogg b/sound/machines/mining/auto_teleport.ogg new file mode 100644 index 000000000000..a8fe669e8657 Binary files /dev/null and b/sound/machines/mining/auto_teleport.ogg differ diff --git a/sound/machines/mining/manual_teleport.ogg b/sound/machines/mining/manual_teleport.ogg new file mode 100644 index 000000000000..b011ef91e65a Binary files /dev/null and b/sound/machines/mining/manual_teleport.ogg differ diff --git a/sound/machines/mining/refinery.ogg b/sound/machines/mining/refinery.ogg new file mode 100644 index 000000000000..fdae21f9a301 Binary files /dev/null and b/sound/machines/mining/refinery.ogg differ diff --git a/sound/machines/mining/smelter.ogg b/sound/machines/mining/smelter.ogg new file mode 100644 index 000000000000..b1d65f3bd203 Binary files /dev/null and b/sound/machines/mining/smelter.ogg differ diff --git a/sound/machines/mining/wooping_teleport.ogg b/sound/machines/mining/wooping_teleport.ogg new file mode 100644 index 000000000000..edf5eb57b432 Binary files /dev/null and b/sound/machines/mining/wooping_teleport.ogg differ diff --git a/sound/machines/radar-ping.ogg b/sound/machines/radar-ping.ogg new file mode 100644 index 000000000000..d6fd0000d1a5 Binary files /dev/null and b/sound/machines/radar-ping.ogg differ diff --git a/sound/machines/sonar-ping.ogg b/sound/machines/sonar-ping.ogg new file mode 100644 index 000000000000..c69d43520958 Binary files /dev/null and b/sound/machines/sonar-ping.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 7d63f0cf86bd..7140b7485cc9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -158,6 +158,7 @@ #include "code\__DEFINES\melee.dm" #include "code\__DEFINES\memory_defines.dm" #include "code\__DEFINES\mergers.dm" +#include "code\__DEFINES\mining.dm" #include "code\__DEFINES\mob_spawn.dm" #include "code\__DEFINES\mobfactions.dm" #include "code\__DEFINES\mobs.dm" @@ -406,7 +407,9 @@ #include "code\__DEFINES\~monkestation\blackboard.dm" #include "code\__DEFINES\~monkestation\blueshift.dm" #include "code\__DEFINES\~monkestation\botany.dm" +#include "code\__DEFINES\~monkestation\cargo.dm" #include "code\__DEFINES\~monkestation\chat.dm" +#include "code\__DEFINES\~monkestation\chewin.dm" #include "code\__DEFINES\~monkestation\clock_cult.dm" #include "code\__DEFINES\~monkestation\colors.dm" #include "code\__DEFINES\~monkestation\combat.dm" @@ -439,6 +442,7 @@ #include "code\__DEFINES\~monkestation\oozeling.dm" #include "code\__DEFINES\~monkestation\optfor.dm" #include "code\__DEFINES\~monkestation\overwatch.dm" +#include "code\__DEFINES\~monkestation\pain.dm" #include "code\__DEFINES\~monkestation\particles.dm" #include "code\__DEFINES\~monkestation\physics.dm" #include "code\__DEFINES\~monkestation\power.dm" @@ -612,6 +616,7 @@ #include "code\_globalvars\lists\mobs.dm" #include "code\_globalvars\lists\names.dm" #include "code\_globalvars\lists\objects.dm" +#include "code\_globalvars\lists\ores_spawned.dm" #include "code\_globalvars\lists\poll_ignore.dm" #include "code\_globalvars\lists\quirks.dm" #include "code\_globalvars\lists\rtd.dm" @@ -5947,6 +5952,12 @@ #include "monkestation\code\game\turfs\open\water.dm" #include "monkestation\code\game\turfs\open\floor\misc_floor.dm" #include "monkestation\code\modules\_paperwork\paper_premade.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\area.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\scrap.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\machines\console.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\machines\recycler.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\ships\_base_ship.dm" +#include "monkestation\code\modules\a_ship_in_need_of_breaking\ships\robotics.dm" #include "monkestation\code\modules\abberant_organs\organ_process.dm" #include "monkestation\code\modules\abberant_organs\components\abberant_organ.dm" #include "monkestation\code\modules\abberant_organs\custom_organs\drunkards_liver.dm" @@ -6169,22 +6180,6 @@ #include "monkestation\code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_buff.dm" #include "monkestation\code\modules\antagonists\nukeop\nukeop.dm" #include "monkestation\code\modules\antagonists\nukeop\equipment\nuclear_bomb\bee_nuke.dm" -#include "monkestation\code\modules\antagonists\slasher\__base_slasher_additions.dm" -#include "monkestation\code\modules\antagonists\slasher\ghost_role.dm" -#include "monkestation\code\modules\antagonists\slasher\slasher_datum.dm" -#include "monkestation\code\modules\antagonists\slasher\slasher_punishment.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\_slasher_base.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\blood_walk.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\incorporealize.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\recall_machette.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\slasher_regenerate.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\soul_steal.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\stalk_target.dm" -#include "monkestation\code\modules\antagonists\slasher\abilities\terror_screech.dm" -#include "monkestation\code\modules\antagonists\slasher\components\team_monitor.dm" -#include "monkestation\code\modules\antagonists\slasher\slasher_outfit\slasher_footwear.dm" -#include "monkestation\code\modules\antagonists\slasher\slasher_outfit\slasher_headgear.dm" -#include "monkestation\code\modules\antagonists\slasher\slasher_outfit\slasher_middlewear.dm" #include "monkestation\code\modules\antagonists\space_ninja\space_ninja.dm" #include "monkestation\code\modules\antagonists\traitor\traitor_objective.dm" #include "monkestation\code\modules\antagonists\traitor\uplink_handler.dm" @@ -6283,6 +6278,22 @@ #include "monkestation\code\modules\ballpit\ballpit.dm" #include "monkestation\code\modules\bitrunners\code\ability_disks.dm" #include "monkestation\code\modules\bitrunners\code\combat_gear_disks.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\fly_away.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\particle.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\__base_slasher_additions.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\ghost_role.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\slasher_datum.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\_slasher_base.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\blood_walk.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\envelope_darkness.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\recall_machette.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\slasher_regenerate.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\soul_steal.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\stalk_target.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\abilities\terror_screech.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\components\see_as_something.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\components\team_monitor.dm" +#include "monkestation\code\modules\blood_for_the_blood_gods\slasher\slasher_outfit\slasher_clothing.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker_assets.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_conversion.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_datum.dm" @@ -6365,6 +6376,18 @@ #include "monkestation\code\modules\bloodsuckers\vassals\vassal_pinpointer.dm" #include "monkestation\code\modules\bloodsuckers\vassals\types\favorite.dm" #include "monkestation\code\modules\bloodsuckers\vassals\types\revenge.dm" +#include "monkestation\code\modules\blueshield\areas.dm" +#include "monkestation\code\modules\blueshield\closet.dm" +#include "monkestation\code\modules\blueshield\clothing.dm" +#include "monkestation\code\modules\blueshield\gun.dm" +#include "monkestation\code\modules\blueshield\job.dm" +#include "monkestation\code\modules\blueshield\landmarks.dm" +#include "monkestation\code\modules\blueshield\radio.dm" +#include "monkestation\code\modules\blueshield\trim.dm" +#include "monkestation\code\modules\blueshield\devices\crew_monitor.dm" +#include "monkestation\code\modules\blueshield\devices\sensor.dm" +#include "monkestation\code\modules\blueshield\modsuit\suit.dm" +#include "monkestation\code\modules\blueshield\modsuit\theme.dm" #include "monkestation\code\modules\blueshift\shuttles.dm" #include "monkestation\code\modules\blueshift\appliances\colony.dm" #include "monkestation\code\modules\blueshift\appliances\multi_charger.dm" @@ -6400,7 +6423,6 @@ #include "monkestation\code\modules\blueshift\cargo\deforest.dm" #include "monkestation\code\modules\blueshift\cargo\flatpacks.dm" #include "monkestation\code\modules\blueshift\cargo\specialist_armor.dm" -#include "monkestation\code\modules\blueshift\clothing\blueshield.dm" #include "monkestation\code\modules\blueshift\clothing\dogginos.dm" #include "monkestation\code\modules\blueshift\clothing\kahraman.dm" #include "monkestation\code\modules\blueshift\clothing\nova_armorsuit.dm" @@ -6633,11 +6655,89 @@ #include "monkestation\code\modules\botany\species\apid\hive\area.dm" #include "monkestation\code\modules\botany\species\apid\hive\hive_object.dm" #include "monkestation\code\modules\botany\species\apid\hive\hive_turfs.dm" +#include "monkestation\code\modules\brewin_and_chewin\cargo_exports.dm" +#include "monkestation\code\modules\brewin_and_chewin\uniqueness.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\bottler.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\bottles.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\designs.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\fermintation_keg.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\reagents.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipe_card.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\_base.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\beers.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\custom.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\liquors.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\meads.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\misc.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\rums.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\vinegars.dm" +#include "monkestation\code\modules\brewin_and_chewin\brewing\recipes\wines.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\cooking_containers.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\food_additons.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\fryer_overhaul.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\global_creation.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\items.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\oven_overrides.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\tracker.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\food_effects\food_posioning.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\_base.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\add_item.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\add_produce.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\add_produce_choice.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\add_reagent.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\add_reagent_choice.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\recipe_start.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_fryer.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_grill.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_item.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_oven.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_stove.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipe_steps\use_tool.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\black_eggs.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\example_recipe.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\french_fries.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\fried_blood_sausage.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\fried_rice.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\katsu_curry.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\kimchi.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\lizard_dumplings.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\oven_bread.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\recipe_crafting_helper_generator.dm" +#include "monkestation\code\modules\brewin_and_chewin\chewing\recipes\sandwhich_test.dm" #include "monkestation\code\modules\buckshotroulette\projectiles\ammunition\ballistic\shotgun.dm" #include "monkestation\code\modules\buckshotroulette\projectiles\boxes_magazines\internal\shotgun.dm" #include "monkestation\code\modules\buckshotroulette\projectiles\guns\ballistic\shotgun.dm" #include "monkestation\code\modules\bunny_wizard\outfits.dm" #include "monkestation\code\modules\bunny_wizard\wizard_items.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\subsystem.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\components\make_item_slow.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\elements\temperature_pack.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\_base.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\bodyparts.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\effects.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\helpers.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\item_helpers.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\modifiers.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\pain_assistance_tools.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\pain_goodies.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\preferences.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\shock.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\species.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\traits.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\causes\generic.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\causes\opiods.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\causes\surgery.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\reagents\modified_reagents.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\reagents\painkiller_related.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\reagents\painkillers.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\anesthetics.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\fire_pain.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\low_blood_pressure.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\min_pain.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\pain_limp.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\sharp_pain.dm" +#include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\temp_pack.dm" #include "monkestation\code\modules\cargo\bounties\pathology.dm" #include "monkestation\code\modules\cargo\crates\costumes_toys.dm" #include "monkestation\code\modules\cargo\crates\emergency.dm" @@ -6836,6 +6936,41 @@ #include "monkestation\code\modules\events\summon_wizard_event.dm" #include "monkestation\code\modules\events\ghost_role\drifting_contractor.dm" #include "monkestation\code\modules\events\wizard\summon_gifts.dm" +#include "monkestation\code\modules\factory_type_beat\boulder.dm" +#include "monkestation\code\modules\factory_type_beat\circuits.dm" +#include "monkestation\code\modules\factory_type_beat\debug.dm" +#include "monkestation\code\modules\factory_type_beat\designs.dm" +#include "monkestation\code\modules\factory_type_beat\effects.dm" +#include "monkestation\code\modules\factory_type_beat\flatpacks.dm" +#include "monkestation\code\modules\factory_type_beat\map_templates.dm" +#include "monkestation\code\modules\factory_type_beat\ore_vent.dm" +#include "monkestation\code\modules\factory_type_beat\ss_ore_gen.dm" +#include "monkestation\code\modules\factory_type_beat\technodes.dm" +#include "monkestation\code\modules\factory_type_beat\yummy.dm" +#include "monkestation\code\modules\factory_type_beat\ai_behaviours\latch_onto.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\assembler.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\brine_chamber.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\grabber.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\splitter.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\test_boulder_spawner.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\chemical_infuser.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\pressurized_reaction_chamber.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\chemical_infuser_recipes\_base.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\chemical_infuser_recipes\sulfur.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\pressurised_reactions\_base.dm" +#include "monkestation\code\modules\factory_type_beat\machinery\atmos_chem\pressurised_reactions\sulfur.dm" +#include "monkestation\code\modules\factory_type_beat\mobs\node_drone.dm" +#include "monkestation\code\modules\factory_type_beat\processing\bouldertech.dm" +#include "monkestation\code\modules\factory_type_beat\processing\brm.dm" +#include "monkestation\code\modules\factory_type_beat\processing\checmial_washer.dm" +#include "monkestation\code\modules\factory_type_beat\processing\chemical_injector.dm" +#include "monkestation\code\modules\factory_type_beat\processing\crusher.dm" +#include "monkestation\code\modules\factory_type_beat\processing\crystalizer.dm" +#include "monkestation\code\modules\factory_type_beat\processing\dissolution_chamber.dm" +#include "monkestation\code\modules\factory_type_beat\processing\enricher.dm" +#include "monkestation\code\modules\factory_type_beat\processing\holding_types.dm" +#include "monkestation\code\modules\factory_type_beat\processing\purification_chamber.dm" +#include "monkestation\code\modules\factory_type_beat\processing\refinery.dm" #include "monkestation\code\modules\flavor_text\flavor_examine.dm" #include "monkestation\code\modules\flavor_text\flavor_helpers.dm" #include "monkestation\code\modules\flavor_text\flavor_hrefs.dm" @@ -6900,7 +7035,6 @@ #include "monkestation\code\modules\job_xp\milestones\botany_milestones.dm" #include "monkestation\code\modules\job_xp\preferences\base_preferences.dm" #include "monkestation\code\modules\job_xp\preferences\xp_handlers.dm" -#include "monkestation\code\modules\jobs\job_types\blueshield.dm" #include "monkestation\code\modules\jobs\job_types\brig_physician.dm" #include "monkestation\code\modules\jobs\job_types\candysalesman.dm" #include "monkestation\code\modules\jobs\job_types\chaplain.dm" @@ -7719,6 +7853,7 @@ #include "monkestation\code\modules\trading\unusual_effects\animation_housing\fire.dm" #include "monkestation\code\modules\trading\unusual_effects\animation_housing\galaxies.dm" #include "monkestation\code\modules\trading\unusual_effects\animation_housing\holy_steps.dm" +#include "monkestation\code\modules\trading\unusual_effects\animation_housing\money.dm" #include "monkestation\code\modules\trading\unusual_effects\animation_housing\music.dm" #include "monkestation\code\modules\trading\unusual_effects\animation_housing\rain.dm" #include "monkestation\code\modules\trading\unusual_effects\animation_housing\shooting_stars.dm" @@ -7878,4 +8013,5 @@ #include "monkestation\code\random_rooms\engines\kilostation.dm" #include "monkestation\code\random_rooms\engines\metastation.dm" #include "monkestation\code\random_rooms\engines\tramstation.dm" +#include "monkestation\gunning_ing\recoil.dm" // END_INCLUDE diff --git a/tgui/packages/tgui/components/Collapsible.jsx b/tgui/packages/tgui/components/Collapsible.jsx index 7d59a11417cc..944b517b57f8 100644 --- a/tgui/packages/tgui/components/Collapsible.jsx +++ b/tgui/packages/tgui/components/Collapsible.jsx @@ -20,7 +20,14 @@ export class Collapsible extends Component { render() { const { props } = this; const { open } = this.state; - const { children, color = 'default', title, buttons, ...rest } = props; + const { + children, + color = 'default', + title, + buttons, + contentStyle, + ...rest + } = props; return (
@@ -39,7 +46,11 @@ export class Collapsible extends Component {
- {open && {buttons}
)}
+
+ );
+
+ if (tooltip) {
+ buttonContent = (
+
+ {asset ? (
+
+ ) : (
+ 
+ )}
+
+ {content &&
+ (vertical ? (
+
+ {disabled && disabledContent ? disabledContent : content}
+
+ ) : (
+
+ {title && (
+
+ ))}
+
+ {title}
+
+
+ )}
+
+ {content}
+
+
+ {buttonContent}
+ {children}
+
+ );
+};
+
+ImageButton.defaultHooks = pureComponentHooks;
+
+/**
+ * That's VERY fucking expensive thing!
+ * Use it only in places, where it really needed.
+ * Otherwise, the window opening time may increase by a third!
+ * Most of the blame is on Icon.
+ * Maybe it's also because I'm a bit crooked.
+ * (с) Aylong
+ */
+export const ImageButtonItem = (props) => {
+ const {
+ className,
+ color,
+ content,
+ horizontal,
+ selected,
+ disabled,
+ disabledContent,
+ tooltip,
+ tooltipPosition,
+ icon,
+ iconColor,
+ iconPosition,
+ iconRotation,
+ iconSize,
+ onClick,
+ children,
+ ...rest
+ } = props;
+ rest.onClick = (e) => {
+ if (!disabled && onClick) {
+ onClick(e);
+ }
+ };
+ let itemContent = (
+
+
+ );
+ if (tooltip) {
+ itemContent = (
+
+
+
+ {icon && (iconPosition === 'top' || iconPosition === 'left') && (
+
+
+ {disabled && disabledContent ? disabledContent : content}
+ {children}
+
+ {icon && !(iconPosition === 'top' || iconPosition === 'left') && (
+ -
+ {currentGroup.steps.map((groupStep, groupIndex) => (
+
- {groupStep} + ))} +
-
+ {(currentGroup as any).steps.map((groupStep, groupIndex) => (
+
- {groupStep} + ))} +
-
- {item.steps.map((step) => (
-
- {step} - ))} -
- {groupedSteps}