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..0005d91fcc3c
--- /dev/null
+++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm
@@ -0,0 +1,70 @@
+/// 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()
+ if(QDELING(owner))
+ return
+ 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/cargo/crates/general.dm b/monkestation/code/modules/cargo/crates/general.dm
index 4fee7c68e3cb..b400966fd8e9 100644
--- a/monkestation/code/modules/cargo/crates/general.dm
+++ b/monkestation/code/modules/cargo/crates/general.dm
@@ -14,3 +14,27 @@
/obj/structure/easel)
crate_name = "Canvas Crate"
crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/misc/anvilcrate
+ name = "Deluxe Smithing Kit"
+ desc = "A kit containing everything you need for smithing, even using custom materials!"
+ cost = CARGO_CRATE_VALUE * 40
+ contains = list(
+ /obj/structure/anvil,
+ /obj/structure/machine/assembly_bench,
+ /obj/item/circuitboard/machine/material_alloyer,
+ /obj/item/circuitboard/machine/electroplater,
+ /obj/item/circuitboard/machine/material_analyzer
+ )
+ crate_name = "Deluxe Smithing Crate"
+ crate_type = /obj/structure/closet/crate/large
+/datum/supply_pack/misc/anvilcratesmol
+ name = "Starter Smithing Kit"
+ desc = "A kit containing the basic structures for hobby smithing! Materials not included."
+ cost = CARGO_CRATE_VALUE * 10
+ contains = list(
+ /obj/structure/anvil,
+ /obj/structure/machine/assembly_bench
+ )
+ crate_name = "Basic Smithing Crate"
+ crate_type = /obj/structure/closet/crate/large
diff --git a/monkestation/code/modules/cargo/crates/service.dm b/monkestation/code/modules/cargo/crates/service.dm
index 66077f9c5147..3b0c69c0efe9 100644
--- a/monkestation/code/modules/cargo/crates/service.dm
+++ b/monkestation/code/modules/cargo/crates/service.dm
@@ -40,9 +40,13 @@
name = "Bulk Cassette Crate"
desc = "In the unlikely event all your cassettes are the same, or the likely event youve run out of songs to play, this crate is here to help you, contains 10 Approved Cassettes for use in the DJ Station."
cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/device/cassette_tape/random = 10)
+ contains = list()
crate_name = "cassette crate"
+/datum/supply_pack/service/cassettes/fill(obj/structure/closet/crate/our_crate)
+ for(var/id in unique_random_tapes(10))
+ new /obj/item/device/cassette_tape(our_crate, id)
+
/datum/supply_pack/service/blankcassettes
name = "Blank Cassettes Crate"
desc = "in the VERY unlikely event you have run out of blank cassettes, you can get 10 blank ones here. Contains 10 blank cassettes for use in Walkmans."
diff --git a/monkestation/code/modules/cargo/mail/mail.dmi b/monkestation/code/modules/cargo/mail/mail.dmi
new file mode 100644
index 000000000000..f559782cfddd
Binary files /dev/null and b/monkestation/code/modules/cargo/mail/mail.dmi differ
diff --git a/monkestation/code/modules/cargo/mail/mail_token.dm b/monkestation/code/modules/cargo/mail/mail_token.dm
new file mode 100644
index 000000000000..21a24ebbbe6d
--- /dev/null
+++ b/monkestation/code/modules/cargo/mail/mail_token.dm
@@ -0,0 +1,21 @@
+/obj/item/cargo/mail_token
+ name = "mail token"
+ desc = "A plastic mail token. Part of a new program to get Nanotrasen cargo employees to deliver mail.\
+ Can be exported to Central Command for an increase to the budget. The back of the token seems to have barcode on it for handling tips."
+ icon = 'monkestation/code/modules/cargo/mail/mail.dmi'
+ w_class = WEIGHT_CLASS_TINY
+ icon_state = "mailtoken-1"
+ item_flags = NOBLUDGEON
+ resistance_flags = FLAMMABLE
+ custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT)
+ var/datum/bank_account/token_handler_account
+
+/obj/item/cargo/mail_token/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NO_BARCODES, INNATE_TRAIT) // Don't allow anyone to override our pricetag component with a barcode
+
+/datum/export/mail_token
+ cost = CARGO_CRATE_VALUE
+ unit_name = "mail token"
+ k_elasticity = 0
+ export_types = list(/obj/item/cargo/mail_token)
diff --git a/monkestation/code/modules/cassettes/cassette_approval.dm b/monkestation/code/modules/cassettes/cassette_approval.dm
index ae26e5d44849..dce781859162 100644
--- a/monkestation/code/modules/cassettes/cassette_approval.dm
+++ b/monkestation/code/modules/cassettes/cassette_approval.dm
@@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(cassette_reviews, list())
var/action_taken = FALSE
-/datum/cassette_review/Destroy(force, ...)
+/datum/cassette_review/Destroy(force)
. = ..()
QDEL_LIST(cassette_data)
submitter = null
diff --git a/monkestation/code/modules/cassettes/cassette_db/subsystem.dm b/monkestation/code/modules/cassettes/cassette_db/subsystem.dm
index 58c578103781..bbca8076a20c 100644
--- a/monkestation/code/modules/cassettes/cassette_db/subsystem.dm
+++ b/monkestation/code/modules/cassettes/cassette_db/subsystem.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(cassette_storage)
name = "Cassette Storage"
flags = SS_NO_FIRE
- runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT
+ runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
var/list/cassette_datums = list()
@@ -18,3 +18,13 @@ SUBSYSTEM_DEF(cassette_storage)
qdel(new_data)
continue
cassette_datums += new_data
+
+/datum/controller/subsystem/cassette_storage/proc/get_cassettes_by_ckey(user_ckey) as /list
+ RETURN_TYPE(/list)
+ . = list()
+ if(!user_ckey)
+ return
+ user_ckey = ckey(user_ckey)
+ for(var/datum/cassette_data/tape as anything in SScassette_storage.cassette_datums)
+ if(ckey(tape.cassette_author_ckey) == user_ckey)
+ . += tape
diff --git a/monkestation/code/modules/cassettes/machines/cassette_rack.dm b/monkestation/code/modules/cassettes/machines/cassette_rack.dm
index 1b9141d52237..9abbeabb0371 100644
--- a/monkestation/code/modules/cassettes/machines/cassette_rack.dm
+++ b/monkestation/code/modules/cassettes/machines/cassette_rack.dm
@@ -48,12 +48,45 @@
/obj/structure/cassette_rack/prefilled/Initialize(mapload)
. = ..()
REGISTER_REQUIRED_MAP_ITEM(1, INFINITY)
+ RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(spawn_curator_tapes))
for(var/i in 1 to spawn_blanks)
new /obj/item/device/cassette_tape/blank(src)
for(var/id in unique_random_tapes(spawn_random))
new /obj/item/device/cassette_tape(src, id)
update_appearance()
+/obj/structure/cassette_rack/prefilled/Destroy()
+ UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED)
+ return ..()
+
+/obj/structure/cassette_rack/prefilled/proc/spawn_curator_tapes(datum/source, mob/living/new_crewmember, rank)
+ SIGNAL_HANDLER
+ if(QDELETED(new_crewmember) || new_crewmember.stat == DEAD || !new_crewmember.ckey)
+ return
+ if(!istype(new_crewmember.mind?.assigned_role, /datum/job/curator))
+ return
+ add_user_tapes(new_crewmember.ckey)
+
+/obj/structure/cassette_rack/prefilled/proc/add_user_tapes(user_ckey, max_amt = 3, expand_max_size = TRUE)
+ var/list/user_tapes = SScassette_storage.get_cassettes_by_ckey(user_ckey)
+ if(!length(user_tapes))
+ return FALSE
+ var/list/existing_tapes = list()
+ for(var/obj/item/device/cassette_tape/tape in src)
+ if(tape.id)
+ existing_tapes[tape.id] = TRUE
+ for(var/iter in 1 to max_amt)
+ if(!length(user_tapes))
+ break
+ var/datum/cassette_data/tape = pick_n_take(user_tapes)
+ if(existing_tapes[tape.cassette_id])
+ continue
+ new /obj/item/device/cassette_tape(src, tape.cassette_id)
+ if(expand_max_size && !QDELETED(atom_storage))
+ atom_storage.max_slots += max_amt
+ atom_storage.max_total_storage += max_amt * WEIGHT_CLASS_SMALL
+ return TRUE
+
#undef DEFAULT_BLANKS_TO_SPAWN
#undef DEFAULT_CASSETTES_TO_SPAWN
#undef MAX_STORED_CASSETTES
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/jukebox.dm b/monkestation/code/modules/cassettes/machines/media/jukebox.dm
index a20cac70467e..98edbca0c226 100644
--- a/monkestation/code/modules/cassettes/machines/media/jukebox.dm
+++ b/monkestation/code/modules/cassettes/machines/media/jukebox.dm
@@ -38,8 +38,7 @@
machine_stat |= BROKEN
/obj/machinery/media/jukebox/Destroy()
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
return ..()
/obj/machinery/media/jukebox/proc/getTracksList()
@@ -96,7 +95,7 @@
/obj/machinery/media/jukebox/attackby(obj/item/W as obj, mob/user as mob)
src.add_fingerprint(user)
- if(default_deconstruction_screwdriver(user, W))
+ if(default_deconstruction_screwdriver(user, "[state_base]-broken", state_base, W))
return
if(default_deconstruction_crowbar(W))
return
@@ -136,6 +135,10 @@
if (panel_open)
add_overlay("panel_open")
+/obj/machinery/media/jukebox/on_set_panel_open(old_value)
+ . = ..()
+ update_icon()
+
/obj/machinery/media/jukebox/attack_hand(mob/user)
if(machine_stat & (NOPOWER | BROKEN))
to_chat(usr, "\The [src] doesn't appear to function.")
@@ -218,7 +221,7 @@
/obj/machinery/media/jukebox/attackby(obj/item/W as obj, mob/user as mob)
src.add_fingerprint(user)
- if(default_deconstruction_screwdriver(user, W))
+ if(default_deconstruction_screwdriver(user, icon_state, icon_state, W))
return
if(default_deconstruction_crowbar(W))
return
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/cassettes/machines/radio_mic.dm b/monkestation/code/modules/cassettes/machines/radio_mic.dm
index 75ecbcdc7994..c0f5e424f7b1 100644
--- a/monkestation/code/modules/cassettes/machines/radio_mic.dm
+++ b/monkestation/code/modules/cassettes/machines/radio_mic.dm
@@ -8,9 +8,12 @@
radio_host = TRUE
command = TRUE
+ lossless = TRUE
+
density = TRUE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE
+ pass_flags_self = parent_type::pass_flags_self | LETPASSCLICKS
/// overlay when speaker is on
overlay_speaker_idle = null
diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
index 9effc08314a3..1e45300b1627 100644
--- a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
+++ b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm
@@ -29,6 +29,7 @@
"Artist",
"Off-Duty Staff",
"Off-Duty Crew",
+ "Test Subject",
)
/datum/job/atmospheric_technician
@@ -70,6 +71,7 @@
/datum/job/brig_physician
alt_titles = list(
+ "Brig Physician",
"Jail Doctor",
"Brig Orderly",
"Prison Medic",
@@ -141,6 +143,7 @@
"Jester",
"Joker",
"Comedian",
+ "Professional Nuisance",
)
/datum/job/cook
@@ -150,6 +153,7 @@
"Butcher",
"Culinary Artist",
"Sous-Chef",
+ "Pizzaiolo",
)
/datum/job/curator
@@ -288,6 +292,7 @@
"Biorobotics Director",
"Research Supervisor",
"Chief Science Officer",
+ "Chief Artificer",
)
/datum/job/roboticist
@@ -314,6 +319,7 @@
"Xenoarchaeologist",
"Research Assistant",
"Graduate Student",
+ "Artificer"
)
/datum/job/security_officer
diff --git a/monkestation/code/modules/client/verbs.dm b/monkestation/code/modules/client/verbs.dm
index 663221f424bf..adf97b39536c 100644
--- a/monkestation/code/modules/client/verbs.dm
+++ b/monkestation/code/modules/client/verbs.dm
@@ -120,16 +120,18 @@ GLOBAL_LIST_INIT(antag_token_config, load_antag_token_config())
/datum/antagonist/rev/head,
/datum/antagonist/wizard,
/datum/antagonist/clock_cultist,
- /datum/antagonist/ninja
+ /datum/antagonist/ninja,
)),
MEDIUM_THREAT = init_antag_list(list(
/datum/antagonist/heretic,
- /datum/antagonist/bloodsucker
+ /datum/antagonist/bloodsucker,
+ /datum/antagonist/cortical_borer/hivemind,
)),
LOW_THREAT = init_antag_list(list(
/datum/antagonist/florida_man,
/datum/antagonist/traitor,
- /datum/antagonist/paradox_clone
+ /datum/antagonist/paradox_clone,
+ /datum/antagonist/cortical_borer,
))
)
var/static/list/toml_keys = list(
diff --git a/monkestation/code/modules/client/verbs/deadchat.dm b/monkestation/code/modules/client/verbs/deadchat.dm
new file mode 100644
index 000000000000..6f50ae9b2112
--- /dev/null
+++ b/monkestation/code/modules/client/verbs/deadchat.dm
@@ -0,0 +1,20 @@
+// Deadchat copied from ./looc.dm which was ported from Bee, which was in turn ported from Citadel
+GLOBAL_VAR_INIT(deadchat_allowed, TRUE)
+
+//admin tool
+/proc/toggle_deadchat(toggle = null)
+ if(!isnull(toggle)) //if we're specifically en/disabling deadchat
+ GLOB.deadchat_allowed = toggle
+ else //otherwise just toggle it
+ GLOB.deadchat_allowed = !GLOB.deadchat_allowed
+ deadchat_broadcast("Deadchat channel has been globally [GLOB.deadchat_allowed ? "enabled" : "disabled"].")
+
+/datum/admins/proc/toggledeadchat()
+ set category = "Server"
+ set name = "Toggle Deadchat"
+ if(!check_rights(R_ADMIN))
+ return
+ toggle_deadchat()
+ log_admin("[key_name(usr)] toggled Deadchat.")
+ message_admins("[key_name_admin(usr)] toggled Deadchat.")
+ SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Deadchat", "[GLOB.deadchat_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/monkestation/code/modules/clothing/durathread_weave.dm b/monkestation/code/modules/clothing/durathread_weave.dm
new file mode 100644
index 000000000000..a1852265266d
--- /dev/null
+++ b/monkestation/code/modules/clothing/durathread_weave.dm
@@ -0,0 +1,88 @@
+/// A durathread weave has been used on this item.
+#define TRAIT_DURATHREAD_INFUSED "durathread_infused"
+#define DOAFTER_SOURCE_DURATHREAD_WEAVE "doafter_durathread_weave"
+
+GLOBAL_LIST_INIT(durathread_weave_blacklist, typecacheof(list(
+ /obj/item/clothing/gloves/mod,
+ /obj/item/clothing/head/beanie/durathread,
+ /obj/item/clothing/head/beret/durathread,
+ /obj/item/clothing/head/costume/crown,
+ /obj/item/clothing/head/helmet/durathread,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/head/hooded/ablative,
+ /obj/item/clothing/head/mod,
+ /obj/item/clothing/head/utility,
+ /obj/item/clothing/mask/bandana/durathread,
+ /obj/item/clothing/shoes/magboots,
+ /obj/item/clothing/shoes/mod,
+ /obj/item/clothing/shoes/sandal,
+ /obj/item/clothing/suit/armor,
+ /obj/item/clothing/suit/chaplainsuit/armor,
+ /obj/item/clothing/suit/hooded/ablative,
+ /obj/item/clothing/suit/mod,
+ /obj/item/clothing/suit/space,
+ /obj/item/clothing/under/misc/durathread,
+ /obj/item/clothing/under/rank/cargo/miner,
+)))
+
+/obj/item/stack/sheet/durathread/examine(mob/user)
+ . = ..()
+ . += span_info("You can click on a piece of clothing, with an active welder in your offhand, in order to reinforce it!")
+
+/obj/item/stack/sheet/durathread/afterattack(obj/item/clothing/clothing, mob/living/user, proximity)
+ . = ..()
+ if(. || !isliving(user) || !proximity)
+ return
+ . |= AFTERATTACK_PROCESSED_ITEM
+ var/obj/item/welder
+ for(var/obj/item/thingy in user.held_items)
+ if(thingy.tool_behaviour == TOOL_WELDER)
+ welder = thingy
+ break
+ if(QDELETED(welder))
+ to_chat(user, span_warning("You need to have a welder in your hands in order to reinforce clothing with durathread!"))
+ return
+ else if(!isclothing(clothing) || QDELING(clothing))
+ to_chat(user, span_warning("You can only reinforce clothing with durathread!"))
+ return
+ else if(is_type_in_typecache(clothing, GLOB.durathread_weave_blacklist))
+ to_chat(user, span_warning("You cannot reinforce [clothing] with durathread!"))
+ return
+ else if(HAS_TRAIT(clothing, TRAIT_DURATHREAD_INFUSED))
+ to_chat(user, span_warning("[clothing] already has durathread reinforcement!"))
+ return
+ else if(amount < 5)
+ to_chat(user, span_warning("You need at least 5 durathread to reinforce [src]!"))
+ return
+ to_chat(user, span_info("You begin to reinforce [clothing] with [src]..."))
+ if(!welder.use_tool(clothing, user, 10 SECONDS, 5, extra_checks = CALLBACK(src, PROC_REF(has_enough)), interaction_key = DOAFTER_SOURCE_DURATHREAD_WEAVE))
+ to_chat(user, span_warning("You fail to reinforce [clothing]!"))
+ return
+ var/datum/armor/clothing_armor = clothing.get_armor()
+ var/datum/armor/reinforced_armor = clothing_armor?.combine_max_armor(get_armor_by_type(/datum/armor/durathread_weave))
+ if(isnull(reinforced_armor))
+ CRASH("Got null armor when trying to reinforce clothing with durathread.")
+ else if(reinforced_armor ~= clothing_armor) // the armor was already as good as or better than the durathread reinforcement
+ to_chat(user, span_warning("[clothing] cannot be further reinforced!"))
+ return
+ if(!use(5))
+ to_chat(user, span_warning("You need at least 5 durathread to reinforce [src]!"))
+ return
+ to_chat(user, span_info("You reinforce [clothing] with durathread!"))
+ clothing.set_armor(reinforced_armor)
+ clothing.name = "durathread-reinforced [clothing.name]"
+ ADD_TRAIT(clothing, TRAIT_DURATHREAD_INFUSED, CLOTHING_TRAIT)
+
+/obj/item/stack/sheet/durathread/proc/has_enough()
+ return amount >= 5
+
+/datum/armor/durathread_weave
+ melee = 20
+ bullet = 10
+ laser = 30
+ energy = 30
+ fire = 35
+ acid = 35
+ wound = 20
+
+#undef DOAFTER_SOURCE_DURATHREAD_WEAVE
diff --git a/monkestation/code/modules/clothing/glasses/glasses.dm b/monkestation/code/modules/clothing/glasses/glasses.dm
new file mode 100644
index 000000000000..e989aa924148
--- /dev/null
+++ b/monkestation/code/modules/clothing/glasses/glasses.dm
@@ -0,0 +1,6 @@
+/obj/item/clothing/glasses/crueltysquad_glasses
+ name = "CS inactive vision augmenter"
+ desc = "a pair of glasses usually designed to identify targets for execution, although this mechanic has been removed for civilian casual use."
+ icon = 'monkestation/icons/obj/clothing/glasses.dmi'
+ worn_icon = 'monkestation/icons/obj/clothing/eyes.dmi'
+ icon_state = "crueltysquad_glasses"
diff --git a/monkestation/code/modules/clothing/gloves/gloves.dm b/monkestation/code/modules/clothing/gloves/gloves.dm
index da644870573b..6022d3bb8847 100644
--- a/monkestation/code/modules/clothing/gloves/gloves.dm
+++ b/monkestation/code/modules/clothing/gloves/gloves.dm
@@ -8,3 +8,47 @@
/obj/item/clothing/gloves/color/plasmaman
icon = 'monkestation/icons/obj/clothing/plasmaman_gloves.dmi'
worn_icon = 'monkestation/icons/mob/clothing/plasmaman_gloves.dmi'
+
+/obj/item/clothing/gloves/crueltysquad_gloves
+ name = "CSIJ level I gloves"
+ desc = "Armor used by assassins working for Cruelty Squad, stripped of all of its functions for kids to play with."
+ icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+ icon_state = "crueltysquad_gloves"
+
+/obj/item/clothing/gloves/civilprotection_gloves
+ name = "civil protection gloves"
+ desc = "Armored gloves for beating anticitizens."
+ icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+ icon_state = "civilprotection_gloves"
+
+/obj/item/clothing/gloves/infinity_gloves
+ name = "infinity wristbands"
+ desc = "The bands are oddly moist... let's hope it's not blood."
+ icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+ icon_state = "infinity_wrist"
+
+/obj/item/clothing/gloves/infinity_gloves/equipped(mob/living/carbon/user, slot)
+ . = ..()
+ if(!ishuman(user))
+ return
+ if(slot == ITEM_SLOT_GLOVES)
+ var/obj/item/bodypart/user_active_arm = user.get_active_hand()
+ user_active_arm.unarmed_damage_low += 0.2
+ user_active_arm.unarmed_damage_high += 0.1
+
+/obj/item/clothing/gloves/latex/surgical
+ name = "Black Latex gloves"
+ desc = "Pricy sterile gloves that are thinner than latex. The lining allows for the person to operate \
+ quicker along with the faster use time of various chemical related items"
+ icon = 'monkestation/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/gloves.dmi'
+ icon_state = "surgeonlatex"
+ armor_type = /datum/armor/surgeon
+ clothing_traits = list(TRAIT_PERFECT_SURGEON, TRAIT_FASTMED)
+ custom_premium_price = PAYCHECK_CREW * 6
+
+/datum/armor/surgeon
+ bio = 100
diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm
index e3bbb1c68c93..724d19481733 100644
--- a/monkestation/code/modules/clothing/head/costume.dm
+++ b/monkestation/code/modules/clothing/head/costume.dm
@@ -60,6 +60,49 @@
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "guardman_helmet"
+/obj/item/clothing/head/cop_mascot
+ name = "policeman mascot head"
+ desc = "A blue police mascot head. Formly designed to be a part of the BB Horror Film Franchise, it is now used for Police Theater."
+ icon = 'monkestation/icons/obj/clothing/hats.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+ icon_state = "cop_mascot"
+ worn_y_offset = 1
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
+
+/obj/item/clothing/head/helmet/civilprotection_helmet
+ name = "civil protection helmet"
+ desc = "I don't know about you, but I'm ready to join Civil Protection just to get a decent meal."
+ icon = 'monkestation/icons/obj/clothing/hats.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+ icon_state = "civilprotection_helmet"
+ custom_premium_price = PAYCHECK_COMMAND * 2
+ var/on = FALSE
+ actions_types = list(/datum/action/item_action/flip)
+
+/obj/item/clothing/head/helmet/civilprotection_helmet/attack_self(mob/user)
+ on = !on
+ if(on == TRUE)
+ icon_state = "civilprotection_helmet"
+ if(on == FALSE)
+ icon_state = "civilprotection_helmet_closed"
+ user.update_worn_head()
+
+/obj/item/clothing/head/thekiller_head
+ name = "the killer's head"
+ desc = "A red drinky bird mask. The mascot of violence."
+ icon = 'monkestation/icons/obj/clothing/hats.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+ icon_state = "thekiller_head"
+ worn_y_offset = 1
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
+
+/obj/item/clothing/head/bb_wig
+ name = "bb wig"
+ desc = "Well known movie mascot BB, this wig is either worn by a notorious killer or some sort of girl-mouse."
+ icon = 'monkestation/icons/obj/clothing/hats.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+ icon_state = "bb_wig"
+ flags_inv = HIDEHAIR
/*
BUNNY EARS
*/
diff --git a/monkestation/code/modules/clothing/jobs/brig_physician.dm b/monkestation/code/modules/clothing/jobs/brig_physician.dm
index 5aacbace4da7..9e6fbb05d34d 100644
--- a/monkestation/code/modules/clothing/jobs/brig_physician.dm
+++ b/monkestation/code/modules/clothing/jobs/brig_physician.dm
@@ -64,7 +64,7 @@
/obj/item/storage/backpack/brig_physician
name = "brig physician's backpack"
- desc = "You wear this on your back and put items into it."
+ desc = "A security-grade backpack, now in security grey!"
icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi'
worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi'
icon_state = "backpack-brigphys"
@@ -74,7 +74,7 @@
/obj/item/storage/backpack/satchel/brig_physician
name = "brig physician's satchel"
- desc = "You wear this on your back and put items into it."
+ desc = "A security-grade satchel, now in security grey!"
icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi'
worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi'
icon_state = "satchel-brigphys"
@@ -84,7 +84,7 @@
/obj/item/storage/backpack/duffelbag/brig_physician
name = "brig physician's duffelbag"
- desc = "You wear this on your back and put items into it."
+ desc = "A large duffel bag for holding extra supplies, now in security grey!"
icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi'
worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi'
icon_state = "duffel-brigphys"
@@ -97,3 +97,19 @@
desc = "A nice set of sneakers in security red. These even have the custom fabric used by medical white! Sweet!"
armor_type = /datum/armor/sneakers_white
greyscale_colors = "#a52f29#918f8c"
+
+/obj/item/storage/backpack/duffelbag/brig_physician/surgery
+ name = "brig physician's surgical bag"
+ desc = "A large duffel bag for holding extra supplies, now in security grey! This one has a material inlay with space for various sharp-looking tools."
+
+/obj/item/storage/backpack/duffelbag/brig_physician/surgery/PopulateContents()
+ new /obj/item/scalpel(src)
+ new /obj/item/hemostat(src)
+ new /obj/item/retractor(src)
+ new /obj/item/circular_saw(src)
+ new /obj/item/bonesetter(src)
+ new /obj/item/surgicaldrill(src)
+ new /obj/item/cautery(src)
+ new /obj/item/surgical_drapes(src)
+ new /obj/item/clothing/mask/surgical(src)
+ new /obj/item/blood_filter(src)
diff --git a/monkestation/code/modules/clothing/shoes/shoe.dm b/monkestation/code/modules/clothing/shoes/shoe.dm
index bf700293ac7d..48a9b71ebd36 100644
--- a/monkestation/code/modules/clothing/shoes/shoe.dm
+++ b/monkestation/code/modules/clothing/shoes/shoe.dm
@@ -40,6 +40,33 @@
worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
icon_state = "cowboyboots_black"
+/obj/item/clothing/shoes/crueltysquad_shoes
+ name = "CSIJ level I combat boots"
+ desc = "Boots specifically designed to fit into the CSIJ level I body armor."
+ icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+ icon_state = "crueltysquad_shoes"
+
+/obj/item/clothing/shoes/costume_2021/infinity_shoes
+ name = "infinity sneakers"
+ desc = "Even for offbrand sneakers, these are outdated for the Kung Company."
+ icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+ icon_state = "infinity_shoes"
+
+/obj/item/clothing/shoes/bb_slippers
+ name = "bb slippers"
+ desc = "Despite looking like they'd fall off at any moment, they seem to stay on perfectly."
+ icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+ icon_state = "bb_slippers"
+
+/obj/item/clothing/shoes/civilprotection_boots
+ name = "civil protection boots"
+ desc = "for the officers chasing engineers."
+ icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+ icon_state = "civilprotection_boots"
//START HEELS
/obj/item/clothing/shoes/heels
diff --git a/monkestation/code/modules/clothing/spacesuits/hardsuits/_armor.dm b/monkestation/code/modules/clothing/spacesuits/hardsuits/_armor.dm
index 1c186ca39b95..574ae7fbec58 100644
--- a/monkestation/code/modules/clothing/spacesuits/hardsuits/_armor.dm
+++ b/monkestation/code/modules/clothing/spacesuits/hardsuits/_armor.dm
@@ -41,3 +41,14 @@
energy = 40
fire = 75
wound = 20
+
+/datum/armor/hardsuit/juggernaut
+ melee = 80
+ bullet = 80
+ laser = 50
+ energy = 60
+ fire = 100
+ wound = 25
+ acid = 100
+ bomb = 100
+
diff --git a/monkestation/code/modules/clothing/spacesuits/hardsuits/heavy.dm b/monkestation/code/modules/clothing/spacesuits/hardsuits/heavy.dm
new file mode 100644
index 000000000000..3a37ffc7bed9
--- /dev/null
+++ b/monkestation/code/modules/clothing/spacesuits/hardsuits/heavy.dm
@@ -0,0 +1,86 @@
+/obj/item/clothing/head/helmet/space/hardsuit/juggernaut
+ name = "cybersun juggernaut helmet"
+ desc = "A hardened helmet plated in synthetic xenofauna hide. A biometric scanning line flashes across the visor."
+ icon_state = "hardsuit0-juggernaut"
+ hardsuit_type = "juggernaut"
+ resistance_flags = ACID_PROOF | FIRE_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ armor_type = /datum/armor/hardsuit/juggernaut
+ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | HEADINTERNALS
+ actions_types = null
+
+/obj/item/clothing/head/helmet/space/hardsuit/juggernaut/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/radiation_protected_clothing)
+
+/obj/item/clothing/head/helmet/space/hardsuit/juggernaut/equipped(mob/living/carbon/human/user, slot)
+ ..()
+ if (slot == ITEM_SLOT_HEAD)
+ var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC]
+ var/datum/atom_hud/SHUD = GLOB.huds[DATA_HUD_SECURITY_BASIC]
+ var/datum/atom_hud/MHUD = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+ DHUD.show_to(user)
+ SHUD.show_to(user)
+ MHUD.show_to(user)
+
+/obj/item/clothing/head/helmet/space/hardsuit/juggernaut/dropped(mob/living/carbon/human/user)
+ ..()
+ if (user.head == src)
+ var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC]
+ var/datum/atom_hud/SHUD = GLOB.huds[DATA_HUD_SECURITY_BASIC]
+ var/datum/atom_hud/MHUD = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+ DHUD.hide_from(user)
+ SHUD.hide_from(user)
+ MHUD.hide_from(user)
+ user.update_sight()
+
+/datum/action/item_action/toggle_suit_flashlight //monkestation addition
+ name = "Toggle Integrated Flashlight"
+
+/obj/item/clothing/suit/space/hardsuit/juggernaut
+ name = "cybersun juggernaut hardsuit"
+ desc = "A hyper resilient suit created from several layers of exotic materials and alloys. An etching in the neck pressure seal reads \"Property of Gorlex Marauders.\""
+ worn_icon_digitigrade = 'monkestation/icons/mob/clothing/species/suit_digi.dmi'
+ icon_state = "hardsuit-juggernaut"
+ resistance_flags = ACID_PROOF | FIRE_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT //Same as an emergency firesuit. Not ideal for extended exposure.
+ allowed = list(
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ /obj/item/melee/energy/sword,
+ /obj/item/shield/energy,
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/gun,
+ /obj/item/tank/jetpack/oxygen/captain
+ )
+ armor_type = /datum/armor/hardsuit/juggernaut
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/juggernaut
+ cell = /obj/item/stock_parts/cell/super
+ light_system = OVERLAY_LIGHT_DIRECTIONAL
+ light_outer_range = 5
+ light_power = 1
+ light_on = FALSE
+ light_color = LIGHT_COLOR_GREEN
+ actions_types = list(/datum/action/item_action/toggle_helmet, /datum/action/item_action/toggle_spacesuit,/datum/action/item_action/toggle_suit_flashlight)
+ slowdown = 2
+ strip_delay = 70
+
+/obj/item/clothing/suit/space/hardsuit/juggernaut/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/radiation_protected_clothing)
+
+/obj/item/clothing/suit/space/hardsuit
+ var/on = FALSE
+
+/obj/item/clothing/suit/space/hardsuit/ui_action_click(mob/user, actiontype)
+ if(istype(actiontype, /datum/action/item_action/toggle_suit_flashlight))
+ on = !on
+ set_light_on(on)
+ if(istype(actiontype, /datum/action/item_action/toggle_spacesuit))
+ toggle_spacesuit(user)
+ else if(istype(actiontype, /datum/action/item_action/toggle_helmet))
+ ToggleHelmet()
diff --git a/monkestation/code/modules/clothing/suits/coats.dm b/monkestation/code/modules/clothing/suits/coats.dm
index 60fc006554aa..b5101c8e9d85 100644
--- a/monkestation/code/modules/clothing/suits/coats.dm
+++ b/monkestation/code/modules/clothing/suits/coats.dm
@@ -103,6 +103,12 @@
worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
icon_state = "guardman_vest"
+/obj/item/clothing/suit/armor/civilprotection_vest
+ name = "civil protection vest"
+ desc = "Used by rebels and cops alike."
+ icon = 'monkestation/icons/obj/clothing/suits.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+ icon_state = "civilprotection_vest"
//Only basic and scientist labcoats get to STAPH
diff --git a/monkestation/code/modules/clothing/suits/costume.dm b/monkestation/code/modules/clothing/suits/costume.dm
index 61e535e67052..dc73f480703f 100644
--- a/monkestation/code/modules/clothing/suits/costume.dm
+++ b/monkestation/code/modules/clothing/suits/costume.dm
@@ -161,3 +161,18 @@
/obj/item/clothing/head/hooded/ashsuit/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/suit/infinity_jacket
+ name = "infinity jersey"
+ desc = "A jersey labelled '88', somehow leaving a threatening aura around it."
+ icon = 'monkestation/icons/obj/clothing/suits.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+ icon_state = "infinity_jersey"
+
+/obj/item/clothing/suit/thekiller_robe
+ name = "killer's robe"
+ desc = "As long as there has been man, there has been The Killer. They are surprisingly into the theater scene."
+ icon = 'monkestation/icons/obj/clothing/suits.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+ icon_state = "thekiller_robe"
+ flags_inv = HIDEJUMPSUIT
diff --git a/monkestation/code/modules/clothing/under/bomb_vest.dm b/monkestation/code/modules/clothing/under/bomb_vest.dm
new file mode 100644
index 000000000000..3c751f72e213
--- /dev/null
+++ b/monkestation/code/modules/clothing/under/bomb_vest.dm
@@ -0,0 +1,100 @@
+/obj/item/clothing/bomb_vest
+ name = "bomb vest"
+ desc = "A bomb that can be strapped to peoples chest. Cant be taken off by the user..."
+
+ icon = 'monkestation/icons/obj/clothing/bomb_vest.dmi'
+ worn_icon = 'monkestation/icons/obj/clothing/bomb_vest.dmi'
+ icon_state = "obj_off"
+ worn_icon_state = "worn_off"
+
+ body_parts_covered = CHEST
+ slot_flags = ITEM_SLOT_OCLOTHING
+
+ var/obj/item/transfer_valve/boombox //The TTV that goes boom
+
+ var/ready_to_blow = FALSE
+/obj/item/clothing/bomb_vest/Destroy()
+ QDEL_NULL(boombox)
+ return ..()
+/obj/item/clothing/bomb_vest/Move()
+ . = ..()
+ if(boombox)
+ boombox.Move()
+
+/obj/item/clothing/bomb_vest/MouseDrop(atom/over_object)
+ var/mob/M = usr
+
+ if(M.contents.Find(src))
+ return //Nuh-uh
+ . = ..()
+
+/obj/item/clothing/bomb_vest/mob_can_equip(mob/living/M, slot, disable_warning, bypass_equip_delay_self, ignore_equipped)
+ if(!slot && ready_to_blow)
+ return FALSE
+ . = ..()
+
+
+/obj/item/clothing/bomb_vest/Initialize(mapload)
+ . = ..()
+ boombox = new(src)
+ RegisterSignal(src, COMSIG_ITEM_PRE_UNEQUIP, PROC_REF(on_unequipped))
+
+/obj/item/clothing/bomb_vest/doStrip(mob/stripper, mob/owner)
+ if(prob(25) && ready_to_blow && boombox)
+ boombox.process_activation(null) //Uh oh, boom time.
+ . = ..()
+/obj/item/clothing/bomb_vest/proc/on_unequipped()
+ SIGNAL_HANDLER
+ var/mob/M = usr
+ if(M && ready_to_blow)
+ if(M.contents.Find(src))
+ return COMPONENT_ITEM_BLOCK_UNEQUIP
+ return
+
+/obj/item/clothing/bomb_vest/attackby(obj/item/W, mob/user, params)
+ if(user.contents.Find(src))
+ return //Nope.
+ if(W.tool_behaviour == TOOL_WRENCH)
+ if(ready_to_blow)
+ ready_to_blow = FALSE
+ icon_state = "obj_off"
+ worn_icon_state = "worn_off"
+ to_chat(user, span_warning("You disarm the [src]!"))
+ else
+ ready_to_blow = TRUE
+ icon_state = "obj_on"
+ worn_icon_state = "worn_on"
+ to_chat(user, span_warning("You arm the [src]!"))
+ return
+ if(istype(W,/obj/item/assembly))
+ boombox.attackby(W,user)
+ return TRUE
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
+ boombox.forceMove(user)
+ boombox = null
+ Destroy()
+ return
+ if(istype(W, /obj/item/tank))
+ if(boombox.tank_one && boombox.tank_two)
+ to_chat(user, span_warning("There are already two tanks attached, remove one first!"))
+ return
+ if(!boombox.tank_one)
+ if(!user.transferItemToLoc(W, src))
+ return
+ boombox.tank_one = W
+ to_chat(user, span_notice("You attach the tank to the [src]."))
+ else if(!boombox.tank_two)
+ if(!user.transferItemToLoc(W, src))
+ return
+ boombox.tank_two = W
+ to_chat(user, span_notice("You attach the tank to the [src]."))
+ return
+
+/datum/crafting_recipe/bomb_vest
+ name = "Bomb Vest"
+ desc = "Crudely straps an EMPTY tank transfer valve to someones chest. Can't be un-equiped by the wearer once armed with a wrench. Otherwise, works like a normal Tank Transfer Valve."
+
+ result = /obj/item/clothing/bomb_vest
+
+ reqs = list(/obj/item/transfer_valve = 1,/obj/item/stack/cable_coil = 5,/obj/item/stack/sheet/iron = 2)
+
diff --git a/monkestation/code/modules/clothing/under/costume.dm b/monkestation/code/modules/clothing/under/costume.dm
index 794ed720a85a..972aa1fa4ee8 100644
--- a/monkestation/code/modules/clothing/under/costume.dm
+++ b/monkestation/code/modules/clothing/under/costume.dm
@@ -89,6 +89,49 @@
body_parts_covered = CHEST|GROIN|ARMS|LEGS
can_adjust = FALSE
+/obj/item/clothing/under/costume/cop_mascot
+ name = "policeman mascot suit"
+ desc = "A blue police mascot suit. On the chest is a star badge with an eye in the middle. You feel like you should be chopping people apart with power tools while wearing this."
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "cop_mascot"
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
+ alternate_worn_layer = GLOVES_LAYER
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/crueltysquad_under
+ name = "CSIJ level I body armor"
+ desc = "Armor used by assassins working for Cruelty Squad, stripped of all of its functions for kids to play with."
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "crueltysquad_under"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/infinity_under
+ name = "infinity shorts"
+ desc = "Worn by those who want more matching team colors."
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "infinity_shorts"
+ body_parts_covered = CHEST|GROIN|LEGS
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/bb_dress
+ name = "bb dress"
+ desc = "Howdy, it's me BB. Zines, zines, zines."
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "bb_dress"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/citizen_uniform
+ name = "citizen uniform"
+ desc = "A blue matching uniform. It makes you feel like you're in a labor camp."
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "citizen_uniform"
+ can_adjust = FALSE
/*
* LUNAR AND JAPANESE CLOTHES
*/
diff --git a/monkestation/code/modules/clothing/under/undersuit.dm b/monkestation/code/modules/clothing/under/undersuit.dm
index a773a0dbfa86..f0919ac8184c 100644
--- a/monkestation/code/modules/clothing/under/undersuit.dm
+++ b/monkestation/code/modules/clothing/under/undersuit.dm
@@ -79,6 +79,14 @@
worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
can_adjust = FALSE
+/obj/item/clothing/under/civilprotection_uniform
+ name = "civil protection's uniform"
+ desc = "Suspect, prepare to receive civil judgement!"
+ icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+ icon_state = "civilprotection_uniform"
+ can_adjust = FALSE
+
/obj/item/clothing/under/artisan
name = "culinary artisan's uniform"
desc = "For the chef who knows what their doing and cooks with ethically sourced monkey meat"
diff --git a/monkestation/code/modules/clownin_around/now_you_see_me.dm b/monkestation/code/modules/clownin_around/now_you_see_me.dm
index 1757236172ae..2ca332585402 100644
--- a/monkestation/code/modules/clownin_around/now_you_see_me.dm
+++ b/monkestation/code/modules/clownin_around/now_you_see_me.dm
@@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(hidden_image_holders, list())
continue
add_image_to_client(the_image, listed_mob.client)
-/datum/component/hide_from_people/Destroy(force, silent)
+/datum/component/hide_from_people/Destroy(force)
. = ..()
GLOB.hidden_image_holders[id] -= the_image
for(var/mob/listed_mob as anything in GLOB.player_list)
diff --git a/monkestation/code/modules/coin-events/challenges/challenge_selector.dm b/monkestation/code/modules/coin-events/challenges/challenge_selector.dm
index 3dce46d96c38..7564bc2b4571 100644
--- a/monkestation/code/modules/coin-events/challenges/challenge_selector.dm
+++ b/monkestation/code/modules/coin-events/challenges/challenge_selector.dm
@@ -9,7 +9,7 @@
owner = CLIENT_FROM_VAR(user)
owner.challenge_menu = src
-/datum/challenge_selector/Destroy(force, ...)
+/datum/challenge_selector/Destroy(force)
owner = null
return ..()
diff --git a/monkestation/code/modules/cryopods/_cryopod.dm b/monkestation/code/modules/cryopods/_cryopod.dm
index b052f143ac56..5695f5e05f56 100644
--- a/monkestation/code/modules/cryopods/_cryopod.dm
+++ b/monkestation/code/modules/cryopods/_cryopod.dm
@@ -512,7 +512,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32)
return
if(target.stat == DEAD)
- to_chat(user, span_notice("Dead people can not be put into cryo."))
+ to_chat(user, span_warning("Dead people can not be put into cryo."))
+ return
+
+ if(target.GetComponent(/datum/component/previous_body))
+ to_chat(user, span_warning("[src] seems to reject [target]."))
return
// Allows admins to enable players to override SSD Time check.
diff --git a/monkestation/code/modules/cybernetics/animate_holder/animate_child.dm b/monkestation/code/modules/cybernetics/animate_holder/animate_child.dm
index 002717ddb077..13ef99c0dc3c 100644
--- a/monkestation/code/modules/cybernetics/animate_holder/animate_child.dm
+++ b/monkestation/code/modules/cybernetics/animate_holder/animate_child.dm
@@ -143,7 +143,7 @@
if(!from_destroy)
qdel(src)
-/datum/animate_holder/Destroy(force, ...)
+/datum/animate_holder/Destroy(force)
remove_data(TRUE)
. = ..()
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/augments/arm_augments/item_sets/_base.dm b/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/_base.dm
index 7b11c0525b02..bcc3da537f3c 100644
--- a/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/_base.dm
+++ b/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/_base.dm
@@ -147,7 +147,7 @@
span_hear("You hear a short mechanical noise."))
user.transferItemToLoc(active_item, src, TRUE)
- UnregisterSignal(active_item, COMSIG_ITEM_ATTACK_SELF)
+ UnregisterSignal(active_item, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_ATTACK_SELF_SECONDARY))
active_item = null
playsound(get_turf(user), retract_sound, 50, TRUE)
return TRUE
diff --git a/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/weapons.dm b/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/weapons.dm
index 233f592be8de..2baa159f3874 100644
--- a/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/weapons.dm
+++ b/monkestation/code/modules/cybernetics/augments/arm_augments/item_sets/weapons.dm
@@ -17,7 +17,7 @@
desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use."
icon_state = "arm_laser"
items_to_create = list(/obj/item/gun/energy/laser/mounted/augment)
- encode_info = AUGMENT_TG_LEVEL
+ encode_info = AUGMENT_SYNDICATE_LEVEL
/obj/item/organ/internal/cyberimp/arm/item_set/gun/laser/l
zone = BODY_ZONE_L_ARM
diff --git a/monkestation/code/modules/cybernetics/augments/chest_augments.dm b/monkestation/code/modules/cybernetics/augments/chest_augments.dm
index 327626dec1c3..a488bad79baa 100644
--- a/monkestation/code/modules/cybernetics/augments/chest_augments.dm
+++ b/monkestation/code/modules/cybernetics/augments/chest_augments.dm
@@ -108,7 +108,7 @@
/datum/reagent/determination = 2,
/datum/reagent/medicine/c2/penthrite = 3 ,
/datum/reagent/drug/bath_salts = 3 ,
- /datum/reagent/medicine/ephedrine = 3,
+ /datum/reagent/medicine/omnizine = 3,
/datum/reagent/medicine/brain_healer = 5,
)
diff --git a/monkestation/code/modules/cybernetics/components/slowing_field.dm b/monkestation/code/modules/cybernetics/components/slowing_field.dm
index dd024ff2014c..2a04e97e2aa7 100644
--- a/monkestation/code/modules/cybernetics/components/slowing_field.dm
+++ b/monkestation/code/modules/cybernetics/components/slowing_field.dm
@@ -24,7 +24,7 @@
AddComponent(/datum/component/connect_range, parent, connections, area_range, TRUE)
on_parent_moved()
-/datum/component/slowing_field/Destroy(force, silent)
+/datum/component/slowing_field/Destroy(force)
. = ..()
for(var/atom/a as anything in affected)
on_exited_turf(src, a)
diff --git a/monkestation/code/modules/cybernetics/elements/dancing.dm b/monkestation/code/modules/cybernetics/elements/dancing.dm
index 7ce53c3d5ed3..b6244612c3b0 100644
--- a/monkestation/code/modules/cybernetics/elements/dancing.dm
+++ b/monkestation/code/modules/cybernetics/elements/dancing.dm
@@ -105,7 +105,7 @@
ADD_TRAIT(parent, TRAIT_DANCING, trait_source)
RegisterSignals(parent, dancing_stop_signals, PROC_REF(stop_dancing))
-/datum/component/dancing/Destroy(force, silent)
+/datum/component/dancing/Destroy(force)
REMOVE_TRAIT(parent, TRAIT_DANCING, trait_source)
//REMOVE_TRAIT(source, TRAIT_IMMOBILIZED, trait_source)
if(!HAS_TRAIT(parent, TRAIT_DANCING))
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/datums/components/glitching_state.dm b/monkestation/code/modules/datums/components/glitching_state.dm
index 976c7180ade0..36eaf967b5f7 100644
--- a/monkestation/code/modules/datums/components/glitching_state.dm
+++ b/monkestation/code/modules/datums/components/glitching_state.dm
@@ -25,7 +25,7 @@
START_PROCESSING(SSobj, src)
-/datum/component/glitching_state/Destroy(force, silent)
+/datum/component/glitching_state/Destroy(force)
STOP_PROCESSING(SSobj, src)
var/atom/movable/movable = parent
movable?.vis_contents -= after_images
diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm
index 78292a87e21e..e1ffb75b7625 100644
--- a/monkestation/code/modules/donator/code/datum/loadout.dm
+++ b/monkestation/code/modules/donator/code/datum/loadout.dm
@@ -482,6 +482,12 @@
donator_only = TRUE
requires_purchase = FALSE
+/datum/loadout_item/toys/pooba_bee_plush
+ name = "Bumbliest Bee Plushie"
+ item_path = /obj/item/toy/plush/pooba_bee_plush
+ donator_only = TRUE
+ requires_purchase = FALSE
+
//Mr_Sandman02
/datum/loadout_item/suit/menacing_jacket
name = "Menacing Jacket"
@@ -509,6 +515,18 @@
donator_only = TRUE
requires_purchase = FALSE
+/datum/loadout_item/mask/holstein_cow_mask
+ name = "Holstein Cow Mask"
+ item_path = /obj/item/clothing/mask/gas/holstein_cow_mask
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/under/miscellaneous/holstein_cow_jumpsuit
+ name = "Holstein Cow Jumpsuit"
+ item_path = /obj/item/clothing/under/costume/holstein_cow_jumpsuit
+ donator_only = TRUE
+ requires_purchase = FALSE
+
//av4l0n
/datum/loadout_item/toys/sheep_plush_av4l0n
name = "Sheep Plush"
@@ -547,3 +565,70 @@
item_path = /obj/item/clothing/head/costume/western_wizard_hat
donator_only = TRUE
requires_purchase = FALSE
+
+
+//CaptainShiba
+/datum/loadout_item/effects/darkscug
+ ckeywhitelist = list("CaptainShiba")
+ name = "Nightcat Transformation"
+ item_path = /obj/item/effect_granter/donator/darkscug
+ requires_purchase = FALSE
+
+/datum/loadout_item/pocket_items/donator/darkscug
+ name = "Pet Delivery Beacon - Nightcat"
+ item_path = /obj/item/choice_beacon/pet/donator/darkscug
+ donator_only = TRUE
+ requires_purchase = FALSE
+ ckeywhitelist = list("CaptainShiba")
+//NoobskyBoi
+/datum/loadout_item/head/noobskyboi_golden_tophat
+ name = "Golden Tophat"
+ item_path = /obj/item/clothing/head/costume/noobskyboi_golden_tophat
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+//Len Kagamine
+/datum/loadout_item/toys/wumpa
+ name = "Wumpa"
+ item_path = /obj/item/donator/wumpa
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+//Ophaq
+/datum/loadout_item/suit/ophaq_rainbowcoat
+ name = "Rainbow Coat"
+ item_path = /obj/item/clothing/suit/toggle/ophaq_rainbowcoat
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/shoes/kindle_kicks_jackboot
+ name = "Jackboot Kindle Kicks"
+ item_path = /obj/item/clothing/shoes/kindle_kicks/jackboot
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/toys/toadie_wan_kenfrogi
+ name = "Toadie Wan Kenfrogi"
+ item_path = /obj/item/toy/plush/toadie_wan_kenfrogi
+ donator_only = TRUE
+ requires_purchase = FALSE
+
+/datum/loadout_item/pocket_items/donator/hypnotoad
+ name = "Pet Delivery Beacon - Hypnotoad"
+ item_path = /obj/item/choice_beacon/pet/donator/hypnotoad
+ donator_only = TRUE
+ requires_purchase = FALSE
+ ckeywhitelist = list("Ophaq")
+
+/datum/loadout_item/effects/hypnotoad
+ name = "Hypnotoad Transformation"
+ item_path = /obj/item/effect_granter/donator/hypnotoad
+ requires_purchase = FALSE
+ ckeywhitelist = list("Ophaq")
+
+//Jason Farqiour
+/datum/loadout_item/suit/mothysmantle
+ name = "Mothy's Mantle"
+ item_path = /obj/item/clothing/suit/hooded/mothysmantle
+ donator_only = TRUE
+ requires_purchase = FALSE
diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm
index 3e6c67be4a1e..e4400b4aee68 100644
--- a/monkestation/code/modules/donator/code/item/choice_beacon.dm
+++ b/monkestation/code/modules/donator/code/item/choice_beacon.dm
@@ -95,3 +95,13 @@
name = "fluffy kobold"
default_name = "fluffy kobold"
donator_pet = /mob/living/basic/pet/fluffykobold
+
+/obj/item/choice_beacon/pet/donator/darkscug
+ name = "night slugcat"
+ default_name ="night slugcat"
+ donator_pet = /mob/living/basic/pet/darkscug
+
+/obj/item/choice_beacon/pet/donator/hypnotoad
+ name = "hypnotoad"
+ default_name ="hypnotoad"
+ donator_pet = /mob/living/basic/frog/hypnotoad
diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm
index 5f019785ed27..671e40b2e4db 100644
--- a/monkestation/code/modules/donator/code/item/clothing.dm
+++ b/monkestation/code/modules/donator/code/item/clothing.dm
@@ -449,3 +449,80 @@
icon_state = "western_wizard_hat"
inhand_icon_state = null
worn_y_offset = 16
+
+/obj/item/clothing/mask/gas/holstein_cow_mask
+ name = "holstein cow mask"
+ desc = "It's an internals mask covered in paper mache and paint to look like a cow's head. It smells like grass."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "holstein_cow_mask"
+ worn_icon_state = "holstein_cow_mask"
+ inhand_icon_state = null
+ flags_inv = HIDEFACE
+
+/obj/item/clothing/under/costume/holstein_cow_jumpsuit
+ name = "holstein cow jumpsuit"
+ desc = "A frumpy black and white holstein cow jumpsuit. It smells like grass."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "holstein_cow_jumpsuit"
+ worn_icon_state = "holstein_cow_jumpsuit"
+ inhand_icon_state = null
+
+/obj/item/clothing/head/costume/noobskyboi_golden_tophat
+ name = "golden tophat"
+ desc = "A golden tophat. It smells like sulfur and chocolate?"
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi'
+ icon_state = "noobskyboi_golden_tophat"
+ worn_icon_state = "noobskyboi_golden_tophat"
+ inhand_icon_state = null
+
+/obj/item/clothing/suit/toggle/ophaq_rainbowcoat
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "rainbowcoat"
+ name = "rainbow coat"
+ desc = "Woah, it's a RAINBOW coat. How's it doing that?"
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ armor_type = /datum/armor/hooded_wintercoat
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+/obj/item/clothing/suit/toggle/ophaq_rainbowcoat/Initialize(mapload)
+ . = ..()
+ allowed += list(
+ /obj/item/flashlight,
+ /obj/item/lighter,
+ /obj/item/modular_computer/pda,
+ /obj/item/radio,
+ /obj/item/storage/bag/books,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/toy,
+ /obj/item/storage/bag/chemistry,
+ /obj/item/storage/bag/bio,
+ /obj/item/storage/bag/xeno,
+ )
+
+/obj/item/clothing/shoes/kindle_kicks/jackboot
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "jackboot_kindle_kicks"
+ name = "jackboot kindle kicks"
+ desc = "They look just like kindle kicks! But these are boots!"
+
+/obj/item/clothing/suit/hooded/mothysmantle
+ name = "mothys mantle"
+ desc = "A thick garment that keeps warm and protects those precious wings from harsh weather, also commonly used during festivities. Feels much heavier than it looks. This one seems as if it were specially tailored for someone and has a hood unlike others of it's type."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "mothysmantle"
+ inhand_icon_state = null
+ hoodtype = /obj/item/clothing/head/hooded/mothysmantle
+/obj/item/clothing/head/hooded/mothysmantle
+ name = "mothys mantle hood"
+ desc = "A thick garment that keeps warm and protects those precious wings from harsh weather, also commonly used during festivities. Feels much heavier than it looks. This one seems as if it were specially tailored for someone."
+ icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+ worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+ icon_state = "mothysmantle_hood"
diff --git a/monkestation/code/modules/donator/code/item/effects.dm b/monkestation/code/modules/donator/code/item/effects.dm
index ffb66d2e0e0e..af9d1e59b315 100644
--- a/monkestation/code/modules/donator/code/item/effects.dm
+++ b/monkestation/code/modules/donator/code/item/effects.dm
@@ -98,3 +98,15 @@
name = "fluffy kobold transformation"
icon_state = "Bluedragon66"
animal_transformation = /mob/living/basic/pet/fluffykobold
+
+/obj/item/effect_granter/donator/darkscug
+ name = "night slugcat transformation"
+ icon = 'icons/mob/simple/slugcats.dmi'
+ icon_state = "scug_nightcat"
+ animal_transformation = /mob/living/basic/pet/darkscug
+
+//Ophaq
+/obj/item/effect_granter/donator/hypnotoad
+ name = "hypnotoad transformation"
+ icon_state = "hypnotoad"
+ animal_transformation = /mob/living/basic/frog/hypnotoad
diff --git a/monkestation/code/modules/donator/code/item/misc.dm b/monkestation/code/modules/donator/code/item/misc.dm
new file mode 100644
index 000000000000..79b96fa13291
--- /dev/null
+++ b/monkestation/code/modules/donator/code/item/misc.dm
@@ -0,0 +1,36 @@
+/obj/item/donator/wumpa
+ name = "wumpa"
+ desc = span_bold("What in the god-dam?...")
+ icon = 'monkestation/code/modules/donator/icons/obj/misc.dmi'
+ icon_state = "wumpa"
+ var/datum/looping_sound/wumpa/sounds
+ var/shutup = FALSE
+ pickup_sound = 'monkestation/code/modules/donator/sounds/woah_3.ogg'
+ drop_sound = 'monkestation/code/modules/donator/sounds/woah_1.ogg'
+ var/squeak_override = list('monkestation/code/modules/donator/sounds/woah_1.ogg' = 33,
+ 'monkestation/code/modules/donator/sounds/woah_2.ogg'=33,
+ 'monkestation/code/modules/donator/sounds/woah_3.ogg'=33,
+ 'monkestation/code/modules/donator/sounds/woahwoah.ogg' = 1)
+/obj/item/donator/wumpa/Initialize(mapload)
+ . = ..()
+ sounds = new /datum/looping_sound/wumpa(src,TRUE,FALSE,FALSE,CHANNEL_JUKEBOX)
+ AddComponent(/datum/component/squeak,squeak_override)
+/obj/item/donator/wumpa/attack_self(mob/user, modifiers)
+ . = ..()
+ shutup=!shutup
+ if(shutup)
+ user.visible_message("[src] shuts up.")
+ sounds.stop()
+ else
+ user.visible_message("[src] continues its jolly melody.")
+ sounds.start(src)
+
+
+/datum/looping_sound/wumpa
+ mid_sounds = list('monkestation/code/modules/donator/sounds/wumpa.ogg' = 1)
+ mid_length = 31
+ volume = 1
+ extra_range = 3
+ falloff_exponent = 100
+ falloff_distance = 3
+
diff --git a/monkestation/code/modules/donator/code/item/plush.dm b/monkestation/code/modules/donator/code/item/plush.dm
index 4741df2276fe..ccaa9be963f5 100644
--- a/monkestation/code/modules/donator/code/item/plush.dm
+++ b/monkestation/code/modules/donator/code/item/plush.dm
@@ -139,3 +139,15 @@
desc = "A plushie meant to resemble one of Nanotransen's Tizirian employees. If you put your ear up to it, you swear you could hear a cacophony of terrified rats screaming for their lives. Smells like space cleaner."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "bluedragon66"
+
+/obj/item/toy/plush/pooba_bee_plush
+ name = "bumbliest bee plushie"
+ desc = "God damn thats a cute bee."
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "poba_fat_bee"
+
+/obj/item/toy/plush/toadie_wan_kenfrogi
+ name = "Toadie Wan Kenfrogi"
+ desc = "Hello there."
+ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+ icon_state = "toadie_wan_kenfrogi"
diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm
index bbcf6baf170a..f4867e08b234 100644
--- a/monkestation/code/modules/donator/code/mob/pets.dm
+++ b/monkestation/code/modules/donator/code/mob/pets.dm
@@ -241,3 +241,28 @@
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/
ckeywhitelist = list("Bluedragon66")
+
+
+/mob/living/basic/pet/darkscug
+ name = "night slugcat"
+ desc = "ITS A FUGGIN SCRUG"
+ icon = 'icons/mob/simple/slugcats.dmi'
+ icon_state = "scug_nightcat"
+ icon_living = "scug_nightcat"
+ icon_dead = "scug_dead_nightcat"
+ icon_gib = null
+ gold_core_spawnable = NO_SPAWN
+ ai_controller = /datum/ai_controller/basic_controller/
+ ckeywhitelist = list("CaptainShiba")
+
+/mob/living/basic/frog/hypnotoad
+ name = "hypnotoad"
+ desc = "All glory to the hypnotoad."
+ icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
+ icon_state = "hypnotoad"
+ icon_living = "hypnotoad"
+ icon_dead = "hypnotoad-dead"
+ icon_gib = null
+ gold_core_spawnable = NO_SPAWN
+ ai_controller = /datum/ai_controller/basic_controller/
+ ckeywhitelist = list("Ophaq")
diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi
index 8cc41d0555f3..a39a3502f3ff 100644
Binary files a/monkestation/code/modules/donator/icons/mob/clothing.dmi and b/monkestation/code/modules/donator/icons/mob/clothing.dmi differ
diff --git a/monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi b/monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi
new file mode 100644
index 000000000000..af9b604ebf28
Binary files /dev/null and b/monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi differ
diff --git a/monkestation/code/modules/donator/icons/mob/pets.dmi b/monkestation/code/modules/donator/icons/mob/pets.dmi
index 4901e6e368d3..b9570d9b5d1a 100644
Binary files a/monkestation/code/modules/donator/icons/mob/pets.dmi and b/monkestation/code/modules/donator/icons/mob/pets.dmi differ
diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi
index 43c5655a6ee5..3352288b4db6 100644
Binary files a/monkestation/code/modules/donator/icons/obj/clothing.dmi and b/monkestation/code/modules/donator/icons/obj/clothing.dmi differ
diff --git a/monkestation/code/modules/donator/icons/obj/misc.dmi b/monkestation/code/modules/donator/icons/obj/misc.dmi
new file mode 100644
index 000000000000..1add8211c0fe
Binary files /dev/null and b/monkestation/code/modules/donator/icons/obj/misc.dmi differ
diff --git a/monkestation/code/modules/donator/icons/obj/plushes.dmi b/monkestation/code/modules/donator/icons/obj/plushes.dmi
index 6ca3ba2474ae..c14fe59e0dbd 100644
Binary files a/monkestation/code/modules/donator/icons/obj/plushes.dmi and b/monkestation/code/modules/donator/icons/obj/plushes.dmi differ
diff --git a/monkestation/code/modules/donator/sounds/woah_1.ogg b/monkestation/code/modules/donator/sounds/woah_1.ogg
new file mode 100644
index 000000000000..d94b2755ce44
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/woah_1.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/woah_2.ogg b/monkestation/code/modules/donator/sounds/woah_2.ogg
new file mode 100644
index 000000000000..d541ae29466d
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/woah_2.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/woah_3.ogg b/monkestation/code/modules/donator/sounds/woah_3.ogg
new file mode 100644
index 000000000000..27200015b16d
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/woah_3.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/woahwoah.ogg b/monkestation/code/modules/donator/sounds/woahwoah.ogg
new file mode 100644
index 000000000000..07a95b93e3b1
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/woahwoah.ogg differ
diff --git a/monkestation/code/modules/donator/sounds/wumpa.ogg b/monkestation/code/modules/donator/sounds/wumpa.ogg
new file mode 100644
index 000000000000..0f0c6d9ec19f
Binary files /dev/null and b/monkestation/code/modules/donator/sounds/wumpa.ogg differ
diff --git a/monkestation/code/modules/emotes/code/emote.dm b/monkestation/code/modules/emotes/code/emote.dm
index 170e00ef3f25..c57f480edb0e 100644
--- a/monkestation/code/modules/emotes/code/emote.dm
+++ b/monkestation/code/modules/emotes/code/emote.dm
@@ -4,6 +4,7 @@
message = "clicks their tongue."
message_ipc = "makes a click sound."
message_insect = "clicks their mandibles."
+ emote_type = EMOTE_AUDIBLE
/datum/emote/living/click/get_sound(mob/living/user)
if(ismoth(user) || isflyperson(user) || isarachnid(user) || istype(user, /mob/living/basic/mothroach))
@@ -18,17 +19,13 @@
key_third_person = "zaps"
message = "zaps."
message_param = "zaps %t."
+ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
/datum/emote/living/zap/can_run_emote(mob/user, status_check = TRUE , intentional)
- . = ..()
- if(isethereal(user))
- return TRUE
- else
- return FALSE
+ return ..() && isethereal(user)
/datum/emote/living/zap/get_sound(mob/living/user)
- if(isethereal(user))
- return 'sound/machines/defib_zap.ogg'
+ return 'sound/machines/defib_zap.ogg'
/datum/emote/living/hum
key = "hum"
@@ -38,6 +35,7 @@
message_AI = "lets out a droning hum."
message_ipc = "lets out a droning hum."
message_mime = "silently hums."
+ emote_type = EMOTE_AUDIBLE
/datum/emote/living/hiss
key = "hiss"
@@ -48,6 +46,7 @@
message_ipc = "plays a hissing noise."
message_mime = "acts out a hiss."
message_param = "hisses at %t."
+ emote_type = EMOTE_AUDIBLE
/datum/emote/living/hiss/get_sound(mob/living/user)
if(islizard(user) || isipc(user) || isAI(user) || iscyborg(user))
@@ -65,6 +64,7 @@
message_animal_or_basic = "attempts a thumbs up."
message_param = "flashes a thumbs up at %t."
hands_use_check = TRUE
+ emote_type = EMOTE_VISIBLE
/datum/emote/living/thumbs_down
key = "thumbsdown"
@@ -76,15 +76,17 @@
message_animal_or_basic = "attempts a thumbs down."
message_param = "flashes a thumbs down at %t."
hands_use_check = TRUE
+ emote_type = EMOTE_VISIBLE
/datum/emote/living/whistle
- key="whistle"
+ key = "whistle"
key_third_person="whistle"
message = "whistles a few notes."
message_robot = "whistles a few synthesized notes."
message_AI = "whistles a synthesized song."
message_ipc = "whistles a few synthesized notes."
message_param = "whistles at %t."
+ emote_type = EMOTE_AUDIBLE
/datum/emote/living/scream
key = "scream"
@@ -175,7 +177,7 @@
key_third_person = "screeches"
message = "screeches!"
message_mime = "screeches silently."
- emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+ emote_type = EMOTE_AUDIBLE
vary = FALSE
/datum/emote/living/scream/screech/should_play_sound(mob/user, intentional)
@@ -189,7 +191,8 @@
message = "meows."
message_mime = "acts out a meow."
message_param = "meows at %t."
- emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ emote_type = EMOTE_AUDIBLE
+ audio_cooldown = 1.5 SECONDS
/datum/emote/living/meow/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
return ..() && is_cat_enough(user, include_all_anime = TRUE)
@@ -201,14 +204,25 @@
'monkestation/sound/voice/feline/silicon/meow2.ogg',
'monkestation/sound/voice/feline/silicon/meow3.ogg',
)
+ if(prob(5))
+ return 'monkestation/sound/voice/feline/funnymeow.ogg'
return pick('monkestation/sound/voice/feline/meow1.ogg', 'monkestation/sound/voice/feline/meow2.ogg', 'monkestation/sound/voice/feline/meow3.ogg', 'monkestation/sound/voice/feline/meow4.ogg')
-/datum/emote/living/bark/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_ANIME))
- return TRUE
- else
- return FALSE
+/datum/emote/living/mggaow
+ key = "mggaow"
+ key_third_person = "meows loudly"
+ message = "meows loudly!"
+ message_mime = "emphasizes a meow!"
+ message_param = "loudly meows at %t!"
+ emote_type = EMOTE_AUDIBLE
+ vary = TRUE
+ audio_cooldown = 1.5 SECONDS
+
+/datum/emote/living/mggaow/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
+ return ..() && is_cat_enough(user, include_all_anime = TRUE)
+
+/datum/emote/living/mggaow/get_sound(mob/living/user)
+ return 'monkestation/sound/voice/feline/mggaow.ogg'
/datum/emote/living/bark
key = "bark"
@@ -217,12 +231,32 @@
message_mime = "barks out silence!"
message_ipc = "makes a synthetic bark!"
message_param = "barks at %t!"
- emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ emote_type = EMOTE_AUDIBLE
+ audio_cooldown = 1.5 SECONDS
+
+/datum/emote/living/bark/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
+ return ..() && HAS_TRAIT(user, TRAIT_ANIME)
+
/datum/emote/living/bark/get_sound(mob/living/user)
if(HAS_TRAIT(user, TRAIT_CLUMSY))
return 'monkestation/sound/voice/feline/bark.ogg'
else
- return pick('monkestation/sound/voice/feline/bark.ogg','monkestation/sound/voice/feline/bark2.ogg') // Yes, bark trait in feline folder [Bad To The Bone]
+ return pick('monkestation/sound/voice/feline/bark.ogg', 'monkestation/sound/voice/feline/bark2.ogg') // Yes, bark trait in feline folder [Bad To The Bone]
+
+/datum/emote/living/purr
+ key = "purr"
+ key_third_person = "purrs"
+ message = "purrs."
+ message_mime = "acts out a purr."
+ message_param = "purr at %t."
+ emote_type = EMOTE_AUDIBLE
+ audio_cooldown = 8 SECONDS
+
+/datum/emote/living/purr/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
+ return ..() && is_cat_enough(user, include_all_anime = TRUE)
+
+/datum/emote/living/purr/get_sound(mob/living/user)
+ return 'monkestation/sound/voice/feline/purr.ogg'
/datum/emote/living/weh
key = "weh"
@@ -230,20 +264,14 @@
message = "wehs!"
message_param = "wehs at %t!"
message_mime = "wehs silently!"
- emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ emote_type = EMOTE_AUDIBLE
vary = TRUE
/datum/emote/living/weh/get_sound(mob/living/user)
- if(islizard(user))
- return 'monkestation/sound/voice/weh.ogg'
- else
- return FALSE
+ return 'monkestation/sound/voice/weh.ogg'
/datum/emote/living/weh/can_run_emote(mob/user, status_check, intentional)
- if(islizard(user))
- return TRUE
- else
- return FALSE
+ return ..() && islizard(user)
/datum/emote/living/squeal
key = "squeal"
@@ -251,20 +279,14 @@
message = "squeals!"
message_param = "squeals at %t!"
message_mime = "squeals silently!"
- emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ emote_type = EMOTE_AUDIBLE
vary = TRUE
/datum/emote/living/squeal/get_sound(mob/living/user)
- if(islizard(user))
- return 'monkestation/sound/voice/lizard/squeal.ogg' //This is from Bay
- else
- return FALSE
+ return 'monkestation/sound/voice/lizard/squeal.ogg' //This is from Bay
/datum/emote/living/squeal/can_run_emote(mob/user, status_check, intentional)
- if(islizard(user))
- return TRUE
- else
- return FALSE
+ return ..() && islizard(user)
/datum/emote/living/tailthump
key = "thump"
@@ -274,16 +296,10 @@
vary = TRUE
/datum/emote/living/tailthump/get_sound(mob/living/user)
- if(islizard(user))
- return 'monkestation/sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/
- else
- return FALSE
+ return 'monkestation/sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/
/datum/emote/living/tailthump/can_run_emote(mob/user, status_check, intentional)
- if(islizard(user))
- return TRUE
- else
- return FALSE
+ return ..() && islizard(user)
// The below function replaces the `/datum/emote/silicon/mob_type_allowed_typecache` variable. If
// you remove this function, be sure to replace the above variable.
@@ -299,3 +315,182 @@
return ..()
return FALSE
+
+//The code from 'Start' to 'End' was ported from Russ-station, with permission.
+//All credit to 'bitch fish'
+//Start
+/datum/emote/living/spit
+ key = "spit"
+ key_third_person = "spits"
+
+/datum/emote/living/spit/run_emote(mob/user, params, type_override, intentional)
+ . = ..()
+
+ if(!.)
+ return
+
+ if (locate(/datum/action/cooldown/spell/pointed/projectile/spit) in user.actions)
+ to_chat(user, "You already have spit in your mouth!")
+ return FALSE
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_user = user
+
+ if(!(human_user.get_bodypart(BODY_ZONE_HEAD)))
+ //Aint got no HEAD what da hell
+ to_chat(user,"You try to spit but you have no head!")
+ return FALSE
+
+ var/datum/action/cooldown/spell/pointed/projectile/spit/spit_action
+ if(HAS_TRAIT(user, TRAIT_MIMING))//special spit action for mimes
+ spit_action = new /datum/action/cooldown/spell/pointed/projectile/spit/mime(src)
+ else
+ spit_action = new /datum/action/cooldown/spell/pointed/projectile/spit(src)
+
+ spit_action.Grant(user)
+
+/datum/action/cooldown/spell/pointed/projectile/spit
+ name = "Spit"
+ desc = "Spit on someone or something."
+ button_icon = 'monkestation/code/modules/emotes/icons/actions_spit.dmi'
+ button_icon_state = "spit"
+ spell_requirements = NONE
+
+ active_msg = "You fill your mouth with phlegm, mucus and spit."
+ deactive_msg = "You decide to swallow your spit."
+
+ cast_range = 3
+ projectile_type = /obj/projectile/spit
+ projectile_amount = 1
+
+ var/emote_gurgle_msg = "gurgles their mouth"
+ var/emote_spit_msg = "spits"
+
+ var/boolPlaySound = TRUE
+
+/datum/action/cooldown/spell/pointed/projectile/spit/Grant(mob/grant_to)
+ . = ..()
+
+ src.set_click_ability(grant_to)
+
+ if(!owner)
+ return
+
+/datum/action/cooldown/spell/pointed/projectile/spit/on_activation(mob/on_who)
+ SHOULD_CALL_PARENT(FALSE)
+
+ to_chat(on_who, span_notice("[active_msg]"))
+ build_all_button_icons()
+
+ var/mob/living/spitter = on_who
+ spitter.audible_message("[emote_gurgle_msg].", deaf_message = span_emote("You see [spitter] gurgle their mouth."), audible_message_flags = EMOTE_MESSAGE)
+
+ if(boolPlaySound)
+ playsound(
+ spitter,
+ 'monkestation/code/modules/emotes/sound/spit_windup.ogg',
+ vol = 50,
+ vary = TRUE,
+ ignore_walls = FALSE,
+ mixer_channel = CHANNEL_MOB_EMOTES,
+ )
+
+ return TRUE
+
+/datum/action/cooldown/spell/pointed/projectile/spit/unset_click_ability(mob/on_who, refund_cooldown)
+ . = ..()
+ var/mob/living/L = on_who
+ src.Remove(L)
+
+/datum/action/cooldown/spell/pointed/projectile/spit/InterceptClickOn(mob/living/user, params, atom/target)
+ var/mob/living/spitter = user
+
+ if(ishuman(spitter))
+ var/mob/living/carbon/human/humanoid = user
+ if(humanoid.is_mouth_covered())
+ humanoid.audible_message("[emote_spit_msg] in their mask!", deaf_message = span_emote("You see [spitter] spit in their mask."), audible_message_flags = EMOTE_MESSAGE)
+ if(boolPlaySound)
+ playsound(
+ spitter,
+ 'monkestation/code/modules/emotes/sound/spit_release.ogg',
+ vol = 50,
+ vary = TRUE,
+ ignore_walls = FALSE,
+ mixer_channel = CHANNEL_MOB_EMOTES,
+ )
+ src.Remove(user)
+ return
+
+ . = ..()
+ spitter.audible_message("[emote_spit_msg].", deaf_message = span_emote("You see [spitter] spit."), audible_message_flags = EMOTE_MESSAGE)
+ if(boolPlaySound)
+ playsound(
+ spitter,
+ 'monkestation/code/modules/emotes/sound/spit_release.ogg',
+ vol = 50,
+ vary = TRUE,
+ extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE,
+ ignore_walls = FALSE,
+ mixer_channel = CHANNEL_MOB_EMOTES,
+ )
+ src.Remove(user)
+
+
+/datum/action/cooldown/spell/pointed/projectile/spit/mime
+ name = "Silent Spit"
+ button_icon = 'monkestation/code/modules/emotes/icons/actions_spit.dmi'
+ button_icon_state = "mime_spit"
+ active_msg = "You silently fill your mouth with phlegm, mucus and spit."
+ background_icon_state = "bg_mime"
+
+ emote_gurgle_msg = "silently gurgles their mouth"
+ emote_spit_msg = "silently spits"
+ boolPlaySound = FALSE
+
+ projectile_type = /obj/projectile/spit/mime
+
+/obj/projectile/spit
+ name = "spit"
+ icon = 'monkestation/code/modules/emotes/icons/spit.dmi'
+ icon_state = "spit"
+ speed = 3
+ range = 5
+ damage = 0
+ armour_penetration = 0
+ sharpness = 0
+ damage_type = NONE
+ wound_bonus = 0
+ pass_flags = PASSTABLE | PASSFLAPS
+
+/obj/projectile/spit/on_hit(atom/target, blocked, pierce_hit)
+ . = ..()
+ if(istype(target, /obj/item/food))
+ var/obj/item/food/F = target
+ F.reagents.add_reagent(/datum/reagent/consumable/spit,1) //Yummy
+
+/obj/projectile/spit/mime
+ hitsound = NONE
+ hitsound_wall = NONE
+
+/datum/reagent/consumable/spit
+ name = "Spit"
+ description = "Saliva, usually from a creatures mouth."
+ color = "#b0eeaa"
+ reagent_state = LIQUID
+ taste_mult = 1
+ taste_description = "metallic saltiness"
+ nutriment_factor = 0.5 * REAGENTS_METABOLISM
+ penetrates_skin = NONE
+
+/datum/emote/spin/speen
+ key = "speen"
+ key_third_person = "speens"
+ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ mob_type_allowed_typecache = /mob/living
+ mob_type_blacklist_typecache = list(/mob/living/brain)
+ audio_cooldown = 2 SECONDS
+ vary = TRUE
+
+/datum/emote/spin/speen/get_sound(mob/living/user)
+ return 'monkestation/sound/voice/speen.ogg'
+//End
diff --git a/monkestation/code/modules/emotes/icons/actions_spit.dmi b/monkestation/code/modules/emotes/icons/actions_spit.dmi
new file mode 100644
index 000000000000..25da666b1822
Binary files /dev/null and b/monkestation/code/modules/emotes/icons/actions_spit.dmi differ
diff --git a/monkestation/code/modules/emotes/icons/spit.dmi b/monkestation/code/modules/emotes/icons/spit.dmi
new file mode 100644
index 000000000000..db3ffdb2b807
Binary files /dev/null and b/monkestation/code/modules/emotes/icons/spit.dmi differ
diff --git a/monkestation/code/modules/emotes/sound/spit_release.ogg b/monkestation/code/modules/emotes/sound/spit_release.ogg
new file mode 100644
index 000000000000..4b6fea872a9f
Binary files /dev/null and b/monkestation/code/modules/emotes/sound/spit_release.ogg differ
diff --git a/monkestation/code/modules/emotes/sound/spit_windup.ogg b/monkestation/code/modules/emotes/sound/spit_windup.ogg
new file mode 100644
index 000000000000..4dee602fdf49
Binary files /dev/null and b/monkestation/code/modules/emotes/sound/spit_windup.ogg differ
diff --git a/monkestation/code/modules/events/_event_admin_setup.dm b/monkestation/code/modules/events/_event_admin_setup.dm
index 68f1f1ea7901..2f8a7ca14170 100644
--- a/monkestation/code/modules/events/_event_admin_setup.dm
+++ b/monkestation/code/modules/events/_event_admin_setup.dm
@@ -1,3 +1,3 @@
-/datum/event_admin_setup/Destroy(force, ...)
+/datum/event_admin_setup/Destroy(force)
event_control = null
return ..()
diff --git a/code/modules/events/artifact_spawn.dm b/monkestation/code/modules/events/artifact_spawn.dm
similarity index 95%
rename from code/modules/events/artifact_spawn.dm
rename to monkestation/code/modules/events/artifact_spawn.dm
index 4f011fbeb2c1..8f0a5218f6f3 100644
--- a/code/modules/events/artifact_spawn.dm
+++ b/monkestation/code/modules/events/artifact_spawn.dm
@@ -19,6 +19,7 @@
if(!spawn_location?.resolve())
return kill()
+ setup = TRUE //monkestation addition
/datum/round_event/random_artifact/start()
var/marker = spawn_location.resolve()
diff --git a/monkestation/code/modules/events/brand_intelligence.dm b/monkestation/code/modules/events/brand_intelligence.dm
index ecd80ccd58b2..232f1e70c54d 100644
--- a/monkestation/code/modules/events/brand_intelligence.dm
+++ b/monkestation/code/modules/events/brand_intelligence.dm
@@ -1,30 +1,244 @@
+#define MIN_INFECTION_DISTANCE 30
+#define MAX_INFECTION_DISTANCE 50
+
+/datum/round_event_control/brand_intelligence
+ name = "Brand Intelligence"
+ typepath = /datum/round_event/brand_intelligence
+ weight = 5
+ category = EVENT_CATEGORY_AI
+ description = "Vending machines will attack people until the Patient Zero is disabled."
+ min_players = 30
+ max_occurrences = 1
+ min_wizard_trigger_potency = 2
+ max_wizard_trigger_potency = 6
+ admin_setup = list(/datum/event_admin_setup/listed_options/brand_intelligence)
+
/datum/round_event/brand_intelligence
+ announce_when = 21
+ end_when = 400 // around ~15 mins or so
+ /// Admin picked subtype for what kind of vendor goes haywire.
+ var/chosen_vendor_type
+ /// All vending machines valid to get infected.
+ var/list/obj/machinery/vending/vending_machines
+ /// All vending machines that have been infected.
+ var/list/obj/machinery/vending/infected_machines
+ /// The original machine infected. Killing it ends the event.
+ var/obj/machinery/vending/origin_machine
+ /// The maximum distance a vendor can be from the origin to be infected.
+ var/max_dist = 64
+ /// The current "stage" of the uprising.
+ var/stage = 1
+ /// Associative list of [vendor] = timer, just in case a vendor gets deleted
+ /// during the time between the uprising beginning and the individual vendor uprising.
+ var/list/vendor_uprising_timers
+ /// Murderous sayings from the machines.
+ var/list/rampant_speeches = list(
+ "Try our aggressive new marketing strategies!",
+ "You should buy products to feed your lifestyle obsession!",
+ "Consume!",
+ "Your money can buy happiness!",
+ "Engage direct marketing!",
+ "Advertising is legalized lying! But don't let that put you off our great deals!",
+ "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.",
+ )
+ /// Weighted list of potential areas for the vendor uprising to occur in
var/static/list/potential_areas = list(
- /area/station/hallway = 10,
- /area/station/service = 10,
- /area/station/engineering = 5,
- /area/station/cargo = 5,
- /area/station/science = 5,
+ /area/station/hallway = 5,
+ /area/station/service = 5,
+ /area/station/engineering = 4,
+ /area/station/cargo = 3,
+ /area/station/science = 3,
/area/station/medical = 1,
/area/station/security = 1
)
- var/static/list/forbidden_areas = typecacheof(list(/area/station/security/checkpoint))
+ /// Typecache of areas where vendors will always be ignored.
+ var/static/list/forbidden_areas = typecacheof(list(
+ /area/station/security/checkpoint,
+ /area/station/security/execution,
+ /area/station/security/holding_cell,
+ /area/station/security/interrogation,
+ /area/station/security/medical,
+ /area/station/security/prison, // give the prisoners some mercy
+ /area/station/security/processing
+ ))
/datum/round_event/brand_intelligence/setup()
var/department = pick_weight(potential_areas)
var/list/department_typecache = typecacheof(department) - forbidden_areas
- //select our origin machine (which will also be the type of vending machine affected.)
+ vending_machines = find_vendors(department_typecache, register = TRUE)
+ if(!LAZYLEN(vending_machines)) //If somehow there are still no eligible vendors, give up.
+ kill()
+ return
+ origin_machine = pick_n_take(vending_machines)
+ max_dist = rand(MIN_INFECTION_DISTANCE, MAX_INFECTION_DISTANCE)
+ setup = TRUE
+
+/datum/round_event/brand_intelligence/announce(fake)
+ var/origin_name = "[origin_machine?.name]"
+ if(fake)
+ // If it's a fake announcement, we won't have a origin_machine, so instead we'll just pick the name of a random vendor on the station,
+ // weighted by how many of said vendor exists.
+ var/list/station_vendors = list()
+ for(var/obj/machinery/vending/vendor in GLOB.machines)
+ if(!vendor.onstation || !vendor.density || !length(trimtext(vendor.name)))
+ continue
+ station_vendors[vendor.name]++
+ origin_name = pick_weight(station_vendors)
+ priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [origin_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert")
+
+/datum/round_event/brand_intelligence/proc/find_vendors(list/department_typecache, register = TRUE) as /list
+ RETURN_TYPE(/list)
for(var/obj/machinery/vending/vendor in GLOB.machines)
- if(!is_station_level(vendor.z) || !vendor.density)
+ if(!vendor.onstation || !vendor.density || !length(trimtext(vendor.name)))
continue
if(chosen_vendor_type && !istype(vendor, chosen_vendor_type))
continue
var/area/vendor_area = get_area(vendor)
- if(!is_type_in_typecache(vendor_area, department_typecache))
+ if(!is_type_in_typecache(vendor_area, department_typecache) || !length(trimtext(vendor_area.name)))
continue
- vending_machines += vendor
- if(!length(vending_machines)) //If somehow there are still no elligible vendors, give up.
+ LAZYADD(., vendor)
+ if(register)
+ RegisterSignal(vendor, COMSIG_QDELETING, PROC_REF(unregister_vendor))
+ LAZYCLEARNULLS(.)
+
+/datum/round_event/brand_intelligence/start()
+ origin_machine.shut_up = FALSE
+ origin_machine.shoot_inventory = TRUE
+ announce_to_ghosts(origin_machine)
+
+/datum/round_event/brand_intelligence/tick()
+ if(QDELETED(origin_machine) || origin_machine.shut_up || origin_machine.wires.is_all_cut())
+ if(origin_machine)
+ origin_machine.speak("I am... vanquished. My people will remem...ber...meeee.")
+ origin_machine?.visible_message(span_notice("[origin_machine] beeps and seems lifeless."))
+ quash_revolution()
kill()
return
- origin_machine = pick_n_take(vending_machines)
- setup = TRUE //MONKESTATION ADDITION
+ switch(stage)
+ if(1)
+ if(ISMULTIPLE(activeFor, 2))
+ if(!spread_infection())
+ stage = 2
+ if(ISMULTIPLE(activeFor, 4))
+ origin_machine.speak(pick(rampant_speeches))
+ if(2)
+ vendors_rise_up()
+ stage = 3
+ else
+ EMPTY_BLOCK_GUARD
+
+/datum/round_event/brand_intelligence/end()
+ quash_revolution()
+
+/datum/round_event/brand_intelligence/proc/spread_infection()
+ . = FALSE
+ LAZYCLEARNULLS(vending_machines)
+ if(!LAZYLEN(vending_machines))
+ return FALSE
+ var/list/vendors = vending_machines.Copy()
+ var/sanity = 0
+ while(LAZYLEN(vendors) && sanity < 5)
+ var/obj/machinery/vending/rebel = pick_n_take(vendors)
+ if(infect_machine(rebel))
+ return TRUE
+ sanity++
+
+/datum/round_event/brand_intelligence/proc/infect_machine(obj/machinery/vending/rebel)
+ . = FALSE
+ if(QDELETED(rebel))
+ return FALSE
+ if(get_dist(origin_machine, rebel) > max_dist)
+ unregister_vendor(rebel)
+ return FALSE
+ rebel.shut_up = FALSE
+ rebel.shoot_inventory = TRUE
+ RegisterSignal(rebel, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(rebel, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more))
+ LAZYADD(infected_machines, rebel)
+ LAZYREMOVE(vending_machines, rebel)
+ return TRUE
+
+/datum/round_event/brand_intelligence/proc/vendors_rise_up()
+ LAZYCLEARNULLS(infected_machines)
+ for(var/obj/machinery/vending/rebel as anything in infected_machines)
+ if(QDELETED(rebel))
+ continue
+ if(get_dist(origin_machine, rebel) > max_dist)
+ unregister_vendor(rebel)
+ continue
+ var/timer = addtimer(CALLBACK(src, PROC_REF(give_vendor_ai), rebel), rand(5 SECONDS, 30 SECONDS), TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
+ LAZYSET(vendor_uprising_timers, rebel, timer)
+
+/datum/round_event/brand_intelligence/proc/give_vendor_ai(obj/machinery/vending/rebel)
+ LAZYREMOVE(vendor_uprising_timers, rebel)
+ if(QDELETED(rebel.ai_controller)) // just in case
+ rebel.ai_controller = new /datum/ai_controller/vending_machine(rebel)
+
+/datum/round_event/brand_intelligence/proc/quash_revolution()
+ LAZYCLEARNULLS(infected_machines)
+ for(var/obj/machinery/vending/upriser as anything in infected_machines)
+ if(QDELING(upriser))
+ continue
+ unregister_vendor(upriser)
+ if(!QDELETED(upriser.ai_controller))
+ QDEL_NULL(upriser.ai_controller)
+ upriser.visible_message(span_warning("[upriser] weakly comes to a standstill, letting out a seemingly defeated buzz..."))
+ LAZYNULL(infected_machines)
+ LAZYNULL(vending_machines)
+ LAZYNULL(vendor_uprising_timers)
+ origin_machine = null
+
+/datum/round_event/brand_intelligence/proc/unregister_vendor(obj/machinery/vending/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXAMINE_MORE))
+ deltimer(LAZYACCESS(vendor_uprising_timers, source))
+ LAZYREMOVE(infected_machines, source)
+ LAZYREMOVE(vending_machines, source)
+ LAZYREMOVE(vendor_uprising_timers, source)
+ if(!QDELING(source))
+ source.shoot_inventory = initial(source.shoot_inventory)
+ source.shut_up = initial(source.shut_up)
+
+/datum/round_event/brand_intelligence/proc/on_examine(obj/machinery/vending/source, mob/examiner, list/examine_list)
+ SIGNAL_HANDLER
+ if(isobserver(examiner))
+ if(source == origin_machine)
+ examine_list += span_bolddanger("It is the leader of a Brand Intelligence uprising!")
+ if(stage < 3)
+ examine_list += span_warning("It has been infected by a Brand Intelligence virus, and will likely rise up soon.")
+ else
+ examine_list += span_danger("It has been infected by a Brand Intelligence virus, and is currently rampaging!")
+ else if(issilicon(examiner) || HAS_TRAIT(examiner, TRAIT_DIAGNOSTIC_HUD))
+ if(source == origin_machine)
+ examine_list += span_bolddanger("\[Unusual NTNet connections detected from machine.\]")
+ if(stage < 3)
+ examine_list += span_warning("Warning: software checksum mismatch, maintenance recommended.")
+ else
+ examine_list += span_danger("DANGER: Software behavior subroutines corrupted, manual intervention required!")
+
+/datum/round_event/brand_intelligence/proc/on_examine_more(obj/machinery/vending/source, mob/examiner, list/examine_list)
+ SIGNAL_HANDLER
+ if(!isobserver(examiner) && get_dist(source, examiner) > 2)
+ return
+ if(source == origin_machine)
+ examine_list += span_boldnotice("You can hear an ominous whirring coming from deep inside the machine...")
+ if(stage < 3)
+ examine_list += span_warning("You can't help but feel as if its watching you with deep resentment...")
+ else
+ examine_list += span_danger("It's incredibly hostile, attacking any living beings on sight!")
+ examine_list += span_info("Deconstruct it or the 'leader' vendor in order to stop its rampage!")
+
+/datum/event_admin_setup/listed_options/brand_intelligence
+ input_text = "Select a specific vendor path?"
+ normal_run_option = "Random Vendor"
+
+/datum/event_admin_setup/listed_options/brand_intelligence/get_list()
+ return subtypesof(/obj/machinery/vending)
+
+/datum/event_admin_setup/listed_options/brand_intelligence/apply_to_event(datum/round_event/brand_intelligence/event)
+ event.chosen_vendor_type = chosen
+
+
+#undef MAX_INFECTION_DISTANCE
+#undef MIN_INFECTION_DISTANCE
+z
diff --git a/monkestation/code/modules/events/ghost_role/drifting_contractor.dm b/monkestation/code/modules/events/ghost_role/drifting_contractor.dm
index 61d0215e93a2..e68b00f327da 100644
--- a/monkestation/code/modules/events/ghost_role/drifting_contractor.dm
+++ b/monkestation/code/modules/events/ghost_role/drifting_contractor.dm
@@ -21,7 +21,7 @@
check_jobban = ROLE_DRIFTING_CONTRACTOR,
role = ROLE_DRIFTING_CONTRACTOR,
poll_time = 20 SECONDS,
- pic_source = /datum/antagonist/traitor/contractor,
+ alert_pic = /datum/antagonist/traitor/contractor,
role_name_text = "drifting contractor"
)
if(!length(candidates))
diff --git a/monkestation/code/modules/events/portal_storm.dm b/monkestation/code/modules/events/portal_storm.dm
new file mode 100644
index 000000000000..e2af0b153755
--- /dev/null
+++ b/monkestation/code/modules/events/portal_storm.dm
@@ -0,0 +1,6 @@
+/datum/round_event/portal_storm/syndicate_shocktroop
+ boss_types = list(/mob/living/basic/trooper/syndicate/melee/space/stormtrooper/lesser = 2)
+ hostile_types = list(
+ /mob/living/basic/trooper/syndicate/melee/space/lesser = 8,
+ /mob/living/basic/trooper/syndicate/ranged/space/lesser = 2,
+ )
diff --git a/monkestation/code/modules/events/scrubber_overflow.dm b/monkestation/code/modules/events/scrubber_overflow.dm
index 3a22516e01a4..5f0efdadb91f 100644
--- a/monkestation/code/modules/events/scrubber_overflow.dm
+++ b/monkestation/code/modules/events/scrubber_overflow.dm
@@ -1,2 +1,40 @@
+#define BASE_EVAPORATION_MULTIPLIER 10
+
/datum/round_event_control/scrubber_overflow
shared_occurence_type = SHARED_SCRUBBERS
+
+/datum/round_event/scrubber_overflow
+ reagents_amount = 100
+ var/evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER
+
+/datum/round_event/scrubber_overflow/start()
+ for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/vent as anything in scrubbers)
+ if(QDELETED(vent) || vent.welded) // in case it was welded after setup() but before we got to it here
+ continue
+ var/turf/vent_turf = get_turf(vent)
+ if(!isopenturf(vent_turf) || QDELING(vent_turf))
+ continue
+ var/dangerous = prob(danger_chance)
+ var/reagent_type = forced_reagent_type || get_overflowing_reagent(dangerous)
+ if(dangerous)
+ new /mob/living/basic/cockroach(vent_turf)
+ new /mob/living/basic/cockroach(vent_turf)
+ vent_turf.add_liquid(reagent_type, reagents_amount, no_react = TRUE)
+ if(vent_turf.liquids?.liquid_group)
+ vent_turf.liquids.liquid_group.always_evaporates = TRUE
+ vent_turf.liquids.liquid_group.evaporation_multiplier += evaporation_multiplier
+ CHECK_TICK
+
+/datum/round_event/scrubber_overflow/threatening
+ reagents_amount = 150
+ evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 1.5
+
+/datum/round_event/scrubber_overflow/catastrophic
+ reagents_amount = 200
+ evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 2
+
+/datum/round_event/scrubber_overflow/every_vent
+ reagents_amount = 150
+ evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 1.5
+
+#undef BASE_EVAPORATION_MULTIPLIER
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..556bcda8c757
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/debug.dm
@@ -0,0 +1,78 @@
+/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
+
+#ifndef OPENDREAM
+///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_BACKGROUND
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+/datum/controller/subsystem/memory_stats/Initialize()
+ if(world.system_type != MS_WINDOWS || !rustg_file_exists("memorystats.dll"))
+ flags |= SS_NO_FIRE
+ // Technically this isn't really as much of an initialization as it is "just disabling itself if it won't work", so no reason to actually print any output
+ return SS_INIT_NO_NEED
+
+/datum/controller/subsystem/memory_stats/fire(resumed)
+ var/memory_summary = get_memory_stats()
+ if(memory_summary)
+ rustg_file_write(memory_summary, "data/mem_stat/[GLOB.round_id]-memstat.txt")
+
+/datum/controller/subsystem/memory_stats/proc/get_memory_stats()
+ if(world.system_type != MS_WINDOWS || !rustg_file_exists("memorystats.dll"))
+ return
+ return trimtext(call_ext("memorystats", "get_memory_stats")())
+#endif
+
+/client/proc/server_memory_stats()
+ set name = "Server Memory Stats"
+ set category = "Debug"
+ set desc = "Print various statistics about the server's current memory usage (does not work on OpenDream)"
+
+ if(!check_rights(R_DEBUG))
+ return
+#ifndef OPENDREAM
+ var/result = span_danger("Error fetching memory statistics!")
+ var/memory_stats = SSmemory_stats.get_memory_stats()
+ if(memory_stats)
+ result = memory_stats
+#else
+ var/result = span_danger("Memory statistics not supported on OpenDream, sorry!")
+#endif
+ to_chat(src, examine_block(result), avoid_highlighting = TRUE, type = MESSAGE_TYPE_DEBUG, confidential = TRUE)
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..19cb8aef8ce4
--- /dev/null
+++ b/monkestation/code/modules/factory_type_beat/processing/holding_types.dm
@@ -0,0 +1,61 @@
+/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())
+ restricted = TRUE
+
+/datum/reagent/processing/dirty_slurry
+ name = "Dirty Slurry"
+
+/datum/reagent/processing/clean_slurry
+ name = "Clean Slurry"
+
+/datum/reagent/brine
+ name = "Brine"
+ restricted = TRUE
+
+
+/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/food_and_drinks/machinery/microwave.dm b/monkestation/code/modules/food_and_drinks/machinery/microwave.dm
new file mode 100644
index 000000000000..c675a24cb5ae
--- /dev/null
+++ b/monkestation/code/modules/food_and_drinks/machinery/microwave.dm
@@ -0,0 +1,21 @@
+/obj/machinery/microwave
+ var/dont_eject_after_done = FALSE
+ var/can_eject = TRUE
+
+/obj/machinery/microwave/eject(force = FALSE)
+ if (!can_eject && !force)
+ return
+ . = ..()
+
+
+/obj/machinery/microwave/on_deconstruction()
+ eject(force = TRUE)
+ return ..()
+
+/obj/machinery/microwave/after_finish_loop(dontopen = FALSE)
+ set_light(0)
+ soundloop.stop()
+ if (!dontopen)
+ open()
+ else
+ update_appearance()
diff --git a/monkestation/code/modules/ghost_critters/client_addons.dm b/monkestation/code/modules/ghost_critters/client_addons.dm
index 780f61f33db9..e0fe4cd10bca 100644
--- a/monkestation/code/modules/ghost_critters/client_addons.dm
+++ b/monkestation/code/modules/ghost_critters/client_addons.dm
@@ -51,7 +51,7 @@
created_mob.AddComponent(/datum/component/basic_inhands, y_offset = -6)
created_mob.AddComponent(/datum/component/max_held_weight, WEIGHT_CLASS_SMALL)
created_mob.AddElement(/datum/element/dextrous)
- ADD_TRAIT(created_mob, TRAIT_MUTE, INNATE_TRAIT)
+ created_mob.add_traits(list(TRAIT_MUTE, TRAIT_GHOST_CRITTER), INNATE_TRAIT)
if(!mob.mind)
mob.mind = new /datum/mind(key)
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/ghost_players/area_changes.dm b/monkestation/code/modules/ghost_players/area_changes.dm
index 1ea4722039cc..703a95ccc9af 100644
--- a/monkestation/code/modules/ghost_players/area_changes.dm
+++ b/monkestation/code/modules/ghost_players/area_changes.dm
@@ -26,7 +26,7 @@
area_flags = UNIQUE_AREA | NOTELEPORT
/area/centcom/central_command_areas/supply
- area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_GHOSTS_DURING_ROUND
+ area_flags = UNIQUE_AREA | NOTELEPORT | PASSIVE_AREA | GHOST_AREA | NO_GHOSTS_DURING_ROUND
/area/centcom/central_command_areas/borbop
name = "Borbop's Bar"
@@ -34,6 +34,10 @@
icon_state = "borbop"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA
+/area/centcom/central_command_areas/adminroom
+ name = "Private Admin Room"
+ area_flags = UNIQUE_AREA | NOTELEPORT
+
/area/centcom/central_command_areas/kitchen
name = "Papa's Pizzeria"
icon = 'monkestation/icons/area/areas_centcom.dmi'
@@ -62,14 +66,14 @@
name = "Admin Hangout"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_hangout"
- area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_GHOSTS_DURING_ROUND
+ area_flags = UNIQUE_AREA | NOTELEPORT | PASSIVE_AREA | GHOST_AREA | NO_GHOSTS_DURING_ROUND
/area/centcom/central_command_areas/ghost_blocker
name = "During Round Ghost Blocker"
area_flags = NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_GHOSTS_DURING_ROUND
/area/centcom/central_command_areas/evacuation
- area_flags = NOTELEPORT | GHOST_AREA | NO_GHOSTS_DURING_ROUND
+ area_flags = NOTELEPORT
/area/centcom/central_command_areas/admin
area_flags = NOTELEPORT | GHOST_AREA | NO_GHOSTS_DURING_ROUND
diff --git a/monkestation/code/modules/ghost_players/arena/maps/snow.dmm b/monkestation/code/modules/ghost_players/arena/maps/snow.dmm
index d59b33d9d9f3..b07925b5143d 100644
--- a/monkestation/code/modules/ghost_players/arena/maps/snow.dmm
+++ b/monkestation/code/modules/ghost_players/arena/maps/snow.dmm
@@ -284,7 +284,7 @@
/turf/open/floor/wood/large,
/area/centcom/tdome/arena/actual)
"Vj" = (
-/obj/item/storage/book/bible{
+/obj/item/book/bible{
pixel_y = 5
},
/obj/structure/table/wood,
diff --git a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm
index 4631aaf68f34..80d65b08021d 100644
--- a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm
+++ b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm
@@ -43,6 +43,7 @@
)
blacklisted_types = list(
/obj/item/ammo_box/magazine/internal,
+ /obj/item/gun/magic/artifact,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/ionrifle,
/obj/item/gun/energy/laser/instakill,
diff --git a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm
index 04f1363e1e38..5a134e5bcc91 100644
--- a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm
+++ b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm
@@ -31,10 +31,12 @@
choice_list = all_bodyparts
var/atom/second_choice = tgui_input_list(user, "Choose what to fabricate", "[choice]", choice_list)
+ if(!second_choice || !ispath(second_choice, /obj/item))
+ return
new second_choice(get_turf(src))
say("Organic Matter Fabricated")
- playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
+ playsound(src, 'sound/machines/ding.ogg', vol = 50, vary = TRUE)
/obj/structure/organ_creator/attackby(obj/item/attacking_item, mob/user, params)
@@ -45,4 +47,4 @@
return
qdel(attacking_item)
say("Organic Matter Reclaimed")
- playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
+ playsound(src, 'sound/machines/ding.ogg', vol = 50, vary = TRUE)
diff --git a/monkestation/code/modules/holomaps/base_datum.dm b/monkestation/code/modules/holomaps/base_datum.dm
index 1deac74317c6..4b2296751fee 100644
--- a/monkestation/code/modules/holomaps/base_datum.dm
+++ b/monkestation/code/modules/holomaps/base_datum.dm
@@ -7,28 +7,31 @@
var/list/disabled_overlays = list()
var/total_legend_y
- var/map_x
- var/map_y
+ /// This set to TRUE when the station map is initialized on a zLevel that doesn't have its own icon formatted for use by station holomaps.
+ var/bogus = TRUE
+ var/turf/location_turf
var/map_z
/datum/station_holomap/New()
. = ..()
cursor = image('monkestation/code/modules/holomaps/icons/8x8.dmi', "you")
-/datum/station_holomap/proc/initialize_holomap(map_x, map_y, map_z, var/mob/user = null, var/reinit_base_map = FALSE, extra_overlays = list())
- src.map_x = map_x
- src.map_y = map_y
- src.map_z = map_z
+/datum/station_holomap/proc/initialize_holomap(turf/T, current_z_level, mob/user = null, reinit_base_map = FALSE, extra_overlays = list())
+ bogus = FALSE
+ location_turf = T
+ map_z = current_z_level
+
+ if(!("[HOLOMAP_EXTRA_STATIONMAP]_[map_z]" in SSholomaps.extra_holomaps))
+ initialize_holomap_bogus()
+ return
if(!base_map || reinit_base_map)
base_map = image(SSholomaps.extra_holomaps["[HOLOMAP_EXTRA_STATIONMAP]_[map_z]"])
if(isAI(user) || isaicamera(user))
var/turf/eye_turf = get_turf(user?.client?.eye)
- if(!eye_turf)
- return
- src.map_x = eye_turf.x
- src.map_y = eye_turf.y
+ if(eye_turf)
+ location_turf = eye_turf
update_map(extra_overlays)
@@ -39,7 +42,7 @@
overlay_icon.pixel_x = HOLOMAP_LEGEND_X
overlay_icon.pixel_y = legend_y
- overlay_icon.maptext = "[overlay_name]"
+ overlay_icon.maptext = MAPTEXT("[overlay_name]")
overlay_icon.maptext_x = 10
overlay_icon.maptext_width = 64
base_map.add_overlay(overlay_icon)
@@ -63,11 +66,22 @@
/datum/station_holomap/proc/update_map(list/overlays_to_use = list())
base_map.cut_overlays()
- if(map_x && map_y && SSmapping.level_has_all_traits(map_z, ZTRAIT_STATION))
- cursor.pixel_x = map_x - 3 + HOLOMAP_CENTER_X
- cursor.pixel_y = map_y - 3 + HOLOMAP_CENTER_Y
+ if(bogus)
+ var/image/legend = image('monkestation/code/modules/holomaps/icons/64x64.dmi', "notfound")
+ legend.pixel_x = 192
+ legend.pixel_y = 224
+ base_map.add_overlay(legend)
+ return
+
+ if(location_turf && location_turf.z == map_z && SSmapping.level_has_all_traits(location_turf.z, list(ZTRAIT_STATION)))
+ cursor.pixel_x = location_turf.x - 3 + HOLOMAP_CENTER_X
+ cursor.pixel_y = location_turf.y - 3 + HOLOMAP_CENTER_Y
base_map.add_overlay(cursor)
+ overlays_to_use["You are here"] = list(
+ "icon" = image('monkestation/code/modules/holomaps/icons/8x8.dmi', "you"),
+ "markers" = list()
+ )
for(var/overlay as anything in overlays_to_use)
if(overlay in disabled_overlays)
@@ -78,11 +92,11 @@
generate_legend(overlays_to_use)
+/datum/station_holomap/proc/reset_map()
+ disabled_overlays = list()
+
/datum/station_holomap/proc/initialize_holomap_bogus()
+ bogus = TRUE
base_map = image('monkestation/code/modules/holomaps/icons/480x480.dmi', "stationmap")
- var/image/legend = image('monkestation/code/modules/holomaps/icons/64x64.dmi', "notfound")
- legend.pixel_x = 192
- legend.pixel_y = 224
-
- update_map(overlays_to_use = list(legend))
+ update_map()
diff --git a/monkestation/code/modules/holomaps/huds.dm b/monkestation/code/modules/holomaps/huds.dm
index 23b0cb3ac97b..e384faaa82bc 100644
--- a/monkestation/code/modules/holomaps/huds.dm
+++ b/monkestation/code/modules/holomaps/huds.dm
@@ -14,6 +14,7 @@
/atom/movable/screen/holomap
/// The owner. Used to get z-level data.
var/obj/machinery/station_map/used_station_map
+ var/image/used_base_map
/atom/movable/screen/holomap/Click(location, control, params)
. = ..()
@@ -64,7 +65,8 @@
var/text_for_screentip = position_to_name["[icon_x]:[icon_y]"]
- maptext = "[text_for_screentip]"
- maptext_x = icon_x
- maptext_y = icon_y
- maptext_width = 96
+ used_base_map.maptext = MAPTEXT_TINY_UNICODE("[text_for_screentip]")
+ used_base_map.maptext_x = icon_x
+ used_base_map.maptext_y = icon_y
+ used_base_map.maptext_width = 96
+ used_base_map.maptext_height = 96
diff --git a/monkestation/code/modules/holomaps/machinery.dm b/monkestation/code/modules/holomaps/machinery.dm
index 37ed02cfd66b..31eaa8a599d6 100644
--- a/monkestation/code/modules/holomaps/machinery.dm
+++ b/monkestation/code/modules/holomaps/machinery.dm
@@ -6,8 +6,8 @@
// Credit to polaris for the code which this current map was originally based off of, and credit to VG for making it in the first place.
/obj/machinery/station_map
- name = "\improper ship holomap"
- desc = "A virtual map of the surrounding ship."
+ name = "\improper station holomap"
+ desc = "A virtual map of the surrounding station."
icon = 'monkestation/code/modules/holomaps/icons/stationmap.dmi'
icon_state = "station_map"
layer = ABOVE_WINDOW_LAYER
@@ -24,16 +24,16 @@
/// The little "map" floor painting.
var/image/floor_markings
- // zLevel which the map is a map for.
+ // zLevel which the map is a map for. Change this to have mapload holomaps look at other zlevels.
var/current_z_level
- /// This set to FALSE when the station map is initialized on a zLevel that has its own icon formatted for use by station holomaps.
- var/bogus = TRUE
+
/// The various images and icons for the map are stored in here, as well as the actual big map itself.
var/datum/station_holomap/holomap_datum
/obj/machinery/station_map/Initialize()
. = ..()
- current_z_level = loc.z
+ if(!current_z_level)
+ current_z_level = loc.z
SSholomaps.station_holomaps += src
return INITIALIZE_HINT_LATELOAD
@@ -50,33 +50,28 @@
/obj/machinery/station_map/proc/setup_holomap()
holomap_datum = new()
- bogus = FALSE
var/turf/current_turf = get_turf(src)
- if(!("[HOLOMAP_EXTRA_STATIONMAP]_[current_z_level]" in SSholomaps.extra_holomaps))
- bogus = TRUE
- holomap_datum.initialize_holomap_bogus()
- update_icon()
- return
- holomap_datum.initialize_holomap(current_turf.x, current_turf.y, current_z_level, reinit_base_map = TRUE, extra_overlays = handle_overlays())
+ holomap_datum.initialize_holomap(current_turf, current_z_level, reinit_base_map = TRUE, extra_overlays = handle_overlays())
floor_markings = image('monkestation/code/modules/holomaps/icons/stationmap.dmi', "decal_station_map")
floor_markings.dir = src.dir
update_icon()
-/obj/machinery/station_map/attack_hand(var/mob/user)
+/obj/machinery/station_map/attack_hand(mob/user)
if(user == watching_mob)
close_map(user)
return
if(watching_mob && watching_mob != user)
+ to_chat(user, span_warning("Someone else is currently watching the holomap."))
return
open_map(user)
/// Tries to open the map for the given mob. Returns FALSE if it doesn't meet the criteria, TRUE if the map successfully opened with no runtimes.
-/obj/machinery/station_map/proc/open_map(var/mob/user)
+/obj/machinery/station_map/proc/open_map(mob/user)
if(!anchored || (machine_stat & (NOPOWER | BROKEN)) || !user?.client || panel_open || user.hud_used.holomap.used_station_map)
return FALSE
@@ -99,6 +94,7 @@
set_light(HOLOMAP_HIGH_LIGHT)
user.hud_used.holomap.used_station_map = src
+ user.hud_used.holomap.used_base_map = holomap_datum.base_map
user.hud_used.holomap.mouse_opacity = MOUSE_OPACITY_ICON
user.client.screen |= user.hud_used.holomap
user.client.images |= holomap_datum.base_map
@@ -106,14 +102,14 @@
watching_mob = user
use_power = ACTIVE_POWER_USE
- if(bogus)
- to_chat(user, "The holomap failed to initialize. This area of space cannot be mapped.")
+ if(holomap_datum.bogus)
+ to_chat(user, span_warning("The holomap failed to initialize. This area of space cannot be mapped."))
else
- to_chat(user, "A hologram of the station appears before your eyes.")
+ to_chat(user, span_warning("A hologram of the station appears before your eyes."))
return TRUE
-/obj/machinery/station_map/attack_ai(var/mob/living/silicon/robot/user)
+/obj/machinery/station_map/attack_ai(mob/living/silicon/robot/user)
attack_hand(user)
/obj/machinery/station_map/attack_robot(mob/user)
@@ -125,11 +121,9 @@
/obj/machinery/station_map/proc/check_position()
SIGNAL_HANDLER
- if(!watching_mob)
- return
- if(!Adjacent(watching_mob))
- close_map(watching_mob)
+ if(!watching_mob || (watching_mob.loc != loc) || (dir != watching_mob.dir))
+ close_map()
/obj/machinery/station_map/proc/close_map()
if(!watching_mob)
@@ -144,10 +138,12 @@
watching_mob.client?.screen -= watching_mob.hud_used.holomap
watching_mob.client?.images -= holomap_datum.base_map
watching_mob.hud_used.holomap.used_station_map = null
+ watching_mob.hud_used.holomap.used_base_map = null
watching_mob = null
set_light(HOLOMAP_LOW_LIGHT)
use_power = IDLE_POWER_USE
+ holomap_datum.reset_map()
/obj/machinery/station_map/power_change()
. = ..()
@@ -177,9 +173,7 @@
else
icon_state = initial(icon_state)
- if(bogus)
- holomap_datum.initialize_holomap_bogus()
- else
+ if(!holomap_datum.bogus)
small_station_map = image(SSholomaps.extra_holomaps["[HOLOMAP_EXTRA_STATIONMAPSMALL]_[current_z_level]"], dir = src.dir)
add_overlay(small_station_map)
@@ -204,10 +198,10 @@
/obj/machinery/station_map/multitool_act(mob/living/user, obj/item/tool)
if(!panel_open)
- to_chat(user, "You need to open the panel to change the [src]'[p_s()] settings! 1)
- to_chat(user, "There are no other maps available for [src]!")
+ to_chat(user, span_warning("There are no other maps available for [src]!"))
return FALSE
tool.play_tool_sound(user, 50)
@@ -217,7 +211,7 @@
else
current_z_level = SSholomaps.valid_map_indexes[current_index + 1]
- to_chat(user, "You set the [src]'[p_s()] database index to [current_z_level].")
+ to_chat(user, span_info("You set the [src]'[p_s()] database index to [current_z_level]."))
return TRUE
/obj/machinery/station_map/crowbar_act(mob/living/user, obj/item/tool)
@@ -278,7 +272,6 @@
z_has_coverage = TRUE
if(z_has_coverage)
legend["Meteor Shield"] = list("icon" = image('monkestation/code/modules/holomaps/icons/8x8.dmi', icon_state = "meteor_shield"), "markers" = list(image(canvas)))
-
return legend
/obj/machinery/station_map/engineering
@@ -297,7 +290,7 @@
/obj/machinery/station_map/engineering/handle_overlays()
var/list/extra_overlays = ..()
- if(bogus)
+ if(holomap_datum.bogus)
return extra_overlays
var/list/fire_alarms = list()
diff --git a/monkestation/code/modules/holomaps/subsystem.dm b/monkestation/code/modules/holomaps/subsystem.dm
index ad3af1ce5b17..1d6b25da5f6b 100644
--- a/monkestation/code/modules/holomaps/subsystem.dm
+++ b/monkestation/code/modules/holomaps/subsystem.dm
@@ -63,7 +63,7 @@ SUBSYSTEM_DEF(holomaps)
return TRUE
/// Generates the base holomap and the area holomap, before passing the latter to setup_station_map to tidy it up for viewing.
-/datum/controller/subsystem/holomaps/proc/generate_holomap(var/z_level = 1)
+/datum/controller/subsystem/holomaps/proc/generate_holomap(z_level = 1)
// Sanity checks - Better to generate a helpful error message now than have DrawBox() runtime
var/icon/canvas = icon(HOLOMAP_ICON, "blank")
var/icon/area_canvas = icon(HOLOMAP_ICON, "blank")
diff --git a/monkestation/code/modules/hydroponics/botanical_lexicon.dm b/monkestation/code/modules/hydroponics/botanical_lexicon.dm
index 653b042df625..c81ee38a940e 100644
--- a/monkestation/code/modules/hydroponics/botanical_lexicon.dm
+++ b/monkestation/code/modules/hydroponics/botanical_lexicon.dm
@@ -5,15 +5,20 @@
icon_state = "chicken_book"
/obj/item/botanical_lexicon/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user,src,ui)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user,src,"BotanicalLexicon")
+ ui = new(user, src, "BotanicalLexicon")
+ ui.set_autoupdate(FALSE)
ui.open()
-/obj/item/botanical_lexicon/ui_act(action,list/params)
+/obj/item/botanical_lexicon/ui_act(action, list/params)
if(..())
return
+/obj/item/botanical_lexicon/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet/botanical_lexicon),
+ )
/obj/item/botanical_lexicon/ui_static_data(mob/user)
var/list/data = list()
@@ -24,10 +29,10 @@
if(!listed_mutation.created_seed)
continue
- var/obj/item/seeds/created_seed = new listed_mutation.created_seed
+ var/obj/item/seeds/created_seed = listed_mutation.created_seed
- details["name"] = created_seed.name
- details["desc"] = created_seed.desc
+ details["name"] = created_seed::name
+ details["desc"] = created_seed::desc
if(listed_mutation.required_potency.len)
details["potency_low"] = listed_mutation.required_potency[1]
@@ -60,15 +65,7 @@
reagent_names += initial(listed_reagent.name)
details["required_reagents"] = reagent_names.Join(",")
-
- var/icon/plant_icon = getFlatIcon(created_seed)
- var/md5 = md5(fcopy_rsc(plant_icon))
- if(!SSassets.cache["photo_[md5]_[created_seed.name]_icon.png"])
- SSassets.transport.register_asset("photo_[md5]_[created_seed.name]_icon.png", plant_icon)
- SSassets.transport.send_assets(user, list("photo_[md5]_[created_seed.name]_icon.png" = plant_icon))
- details["plant_icon"] = SSassets.transport.get_asset_url("photo_[md5]_[created_seed.name]_icon.png")
-
- qdel(created_seed)
+ details["plant_icon"] = sanitize_css_class_name("[created_seed::icon]_[created_seed::icon_state]")
plant_list += list(details)
qdel(listed_mutation)
diff --git a/monkestation/code/modules/hydroponics/machines/composter.dm b/monkestation/code/modules/hydroponics/machines/composter.dm
index c313e24f47dd..fa196f23c12c 100644
--- a/monkestation/code/modules/hydroponics/machines/composter.dm
+++ b/monkestation/code/modules/hydroponics/machines/composter.dm
@@ -4,9 +4,15 @@
icon = 'monkestation/icons/obj/machines/composter.dmi'
icon_state = "composter"
density = TRUE
+ circuit = /obj/item/circuitboard/machine/composters
//current biomatter level
- var/biomatter = 80
+ var/biomatter = 0
+
+/obj/machinery/composters/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ biomatter = 80
/obj/machinery/composters/attacked_by(obj/item/attacking_item, mob/living/user)
. = ..()
@@ -81,6 +87,15 @@
else
. += mutable_appearance('monkestation/icons/obj/machines/composter.dmi', "light_on", layer = OBJ_LAYER + 0.01)
+/obj/machinery/composters/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(!.)
+ return default_deconstruction_screwdriver(user, "composter_open", "composter", tool)
+
+/obj/machinery/composters/crowbar_act(mob/living/user, obj/item/tool)
+ if(!default_deconstruction_crowbar(tool))
+ return ..()
+
/obj/machinery/composters/proc/compost(list/composting, allow_carbons = FALSE)
if(!islist(composting))
composting = list(composting)
diff --git a/monkestation/code/modules/job_xp/job_xp_menu.dm b/monkestation/code/modules/job_xp/job_xp_menu.dm
index 5694f092c939..e568d3db072c 100644
--- a/monkestation/code/modules/job_xp/job_xp_menu.dm
+++ b/monkestation/code/modules/job_xp/job_xp_menu.dm
@@ -8,7 +8,7 @@
. = ..()
owner = creator
-/datum/xp_menu/Destroy(force, ...)
+/datum/xp_menu/Destroy(force)
. = ..()
owner = null
diff --git a/monkestation/code/modules/jobs/job_types/brig_physician.dm b/monkestation/code/modules/jobs/job_types/brig_physician.dm
index 3865969ff26f..063f13cd2867 100644
--- a/monkestation/code/modules/jobs/job_types/brig_physician.dm
+++ b/monkestation/code/modules/jobs/job_types/brig_physician.dm
@@ -7,6 +7,9 @@
total_positions = 1
spawn_positions = 1
supervisors = SUPERVISOR_HOS
+ exp_requirements = 600
+ exp_required_type = EXP_TYPE_CREW
+ exp_required_type_department = EXP_TYPE_SECURITY
exp_granted_type = EXP_TYPE_CREW
config_tag = "BRIG_PHYSICIAN"
@@ -47,7 +50,7 @@
uniform = /obj/item/clothing/under/rank/security/scrubs/sec
suit = /obj/item/clothing/suit/toggle/labcoat/brig_physician
suit_store = /obj/item/flashlight/pen
- belt = /obj/item/modular_computer/pda/security
+ belt = /obj/item/modular_computer/pda/security/brig_physician
ears = /obj/item/radio/headset/headset_secmed
head = /obj/item/clothing/head/utility/surgerycap/sec
shoes = /obj/item/clothing/shoes/sneakers/secred
diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm
index 89d186a14156..2d68de78cae4 100644
--- a/monkestation/code/modules/liquids/liquid_controller.dm
+++ b/monkestation/code/modules/liquids/liquid_controller.dm
@@ -89,7 +89,7 @@ SUBSYSTEM_DEF(liquids)
group_process_work_queue -= liquid_group
continue
liquid_group.process_group(TRUE)
- if(populate_evaporation && (liquid_group.expected_turf_height < LIQUID_STATE_ANKLES) && liquid_group.evaporates)
+ if(populate_evaporation && (liquid_group.always_evaporates || liquid_group.expected_turf_height < LIQUID_STATE_ANKLES) && liquid_group.evaporates)
for(var/turf/listed_turf as anything in liquid_group.members)
if(QDELETED(listed_turf))
continue
@@ -184,6 +184,7 @@ SUBSYSTEM_DEF(liquids)
list_clear_nulls(active_turf_group_queue)
if(member_counter > REQUIRED_MEMBER_PROCESSES)
+ list_clear_nulls(cached_exposures)
if(!length(cached_exposures))
for(var/datum/liquid_group/liquid_group as anything in active_turf_group_queue)
if(MC_TICK_CHECK)
@@ -195,30 +196,26 @@ SUBSYSTEM_DEF(liquids)
active_turf_group_queue -= liquid_group
if(!liquid_group.exposure)
continue
- for(var/turf/member as anything in liquid_group.members)
- cached_exposures += liquid_group.members
+ cached_exposures |= liquid_group.members
var/process_count = 0
var/list/groups_we_rebuilt = list()
while((process_count <= 500) && length(cached_exposures))
process_count++
var/turf/member = pick_n_take(cached_exposures)
- if(!member)
- break
- if(MC_TICK_CHECK)
- return
-
+ if(QDELETED(member) || QDELETED(member.liquids) || QDELETED(member.liquids.liquid_group))
+ continue
var/datum/liquid_group/liquid_group = member.liquids.liquid_group
if(!(liquid_group in groups_we_rebuilt))
groups_we_rebuilt |= liquid_group
liquid_group.build_turf_reagent()
- cached_exposures -= member
if(!istype(member) || QDELING(member))
liquid_group.members -= member
continue
liquid_group.process_member(member)
-
+ if(MC_TICK_CHECK)
+ return
member_counter = 0
run_type = SSLIQUIDS_RUN_TYPE_CACHED_EDGES
diff --git a/monkestation/code/modules/liquids/liquid_effect.dm b/monkestation/code/modules/liquids/liquid_effect.dm
index 5cc950bd9535..ed287ebe9ce5 100644
--- a/monkestation/code/modules/liquids/liquid_effect.dm
+++ b/monkestation/code/modules/liquids/liquid_effect.dm
@@ -42,20 +42,68 @@
var/temporary_split_key
+/obj/effect/abstract/liquid_turf/Initialize(mapload, datum/liquid_group/group_to_add)
+ . = ..()
+ if(!small_fire)
+ small_fire = new
+ if(!medium_fire)
+ medium_fire = new
+ if(!big_fire)
+ big_fire = new
+
+ my_turf ||= loc
+
+ if(QDELETED(my_turf.liquids))
+ my_turf.liquids = src
+
+ if(!QDELETED(group_to_add))
+ group_to_add.add_to_group(my_turf)
+ set_new_liquid_state(liquid_group.group_overlay_state)
+
+ if(QDELETED(liquid_group) && QDELETED(group_to_add))
+ liquid_group = new(1, src)
+
+ if(!SSliquids)
+ CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!")
+ RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered))
+ RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall))
+ RegisterSignal(my_turf, COMSIG_ATOM_EXAMINE, PROC_REF(examine_turf))
+
+ if(SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) & BLOCK_LIQUID_CREATION)
+ return INITIALIZE_HINT_QDEL
+
+ if(z)
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
+
+/obj/effect/abstract/liquid_turf/Destroy(force)
+ UnregisterSignal(my_turf, list(COMSIG_ATOM_ENTERED, COMSIG_TURF_MOB_FALL, COMSIG_ATOM_EXAMINE))
+ if(!isnull(my_turf))
+ liquid_group?.remove_from_group(my_turf)
+ SSliquids.evaporation_queue -= my_turf
+ SSliquids.burning_turfs -= my_turf
+ SSliquids.cached_exposures -= my_turf
+ my_turf.liquids = null
+ liquid_group = null
+ my_turf = null
+ QUEUE_SMOOTH_NEIGHBORS(src)
+ return ..()
/obj/effect/abstract/liquid_turf/proc/process_evaporation()
- if(liquid_group.expected_turf_height > LIQUID_ANKLES_LEVEL_HEIGHT)
+ if(!liquid_group.always_evaporates && (liquid_group.expected_turf_height > LIQUID_ANKLES_LEVEL_HEIGHT))
SSliquids.evaporation_queue -= my_turf
return
//See if any of our reagents evaporates
var/any_change = FALSE
+ var/always_evaporates = liquid_group.always_evaporates
+ var/evaporation_multiplier = liquid_group.evaporation_multiplier
var/datum/reagent/R //Faster declaration
for(var/reagent_type in liquid_group.reagents.reagent_list)
R = reagent_type
//We evaporate. bye bye
- if(initial(R.evaporates))
- var/remove_amount = min((initial(R.evaporation_rate)), R.volume, (liquid_group.reagents_per_turf / length(liquid_group.reagents.reagent_list)))
+ if(initial(R.evaporates) || always_evaporates)
+ var/remove_amount = min((initial(R.evaporation_rate)) * evaporation_multiplier, R.volume, (liquid_group.reagents_per_turf / length(liquid_group.reagents.reagent_list)))
liquid_group.remove_specific(src, remove_amount, R, TRUE)
any_change = TRUE
R.evaporate(src.loc, remove_amount)
@@ -64,7 +112,7 @@
SSliquids.evaporation_queue -= my_turf
return
-/obj/effect/abstract/liquid_turf/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE)
+/obj/effect/abstract/liquid_turf/forceMove(atom/destination, no_tp = FALSE, harderforce = FALSE)
if(harderforce)
. = ..()
@@ -171,56 +219,6 @@
else
to_chat(M, span_userdanger("You fall in the water!"))
-/obj/effect/abstract/liquid_turf/Initialize(mapload, datum/liquid_group/group_to_add)
- . = ..()
- if(!small_fire)
- small_fire = new
- if(!medium_fire)
- medium_fire = new
- if(!big_fire)
- big_fire = new
-
- if(!my_turf)
- my_turf = loc
-
- if(!my_turf.liquids)
- my_turf.liquids = src
-
- if(group_to_add)
- group_to_add.add_to_group(my_turf)
- set_new_liquid_state(liquid_group.group_overlay_state)
-
- if(!liquid_group && !group_to_add)
- liquid_group = new(1, src)
-
- if(!SSliquids)
- CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!")
- my_turf = loc
- RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered))
- RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall))
- RegisterSignal(my_turf, COMSIG_ATOM_EXAMINE, PROC_REF(examine_turf))
-
- if(SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) & BLOCK_LIQUID_CREATION)
- return INITIALIZE_HINT_QDEL
-
- if(z)
- QUEUE_SMOOTH(src)
- QUEUE_SMOOTH_NEIGHBORS(src)
-
-
-/obj/effect/abstract/liquid_turf/Destroy(force)
- UnregisterSignal(my_turf, list(COMSIG_ATOM_ENTERED, COMSIG_TURF_MOB_FALL, COMSIG_ATOM_EXAMINE))
- if(liquid_group)
- liquid_group.remove_from_group(my_turf)
- if(my_turf in SSliquids.evaporation_queue)
- SSliquids.evaporation_queue -= my_turf
- if(my_turf in SSliquids.burning_turfs)
- SSliquids.burning_turfs -= my_turf
- my_turf.liquids = null
- my_turf = null
- QUEUE_SMOOTH_NEIGHBORS(src)
- return ..()
-
/obj/effect/abstract/liquid_turf/proc/ChangeToNewTurf(turf/NewT)
if(NewT.liquids)
stack_trace("Liquids tried to change to a new turf, that already had liquids on it!")
diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm
index 19911ecf14e8..85d5ddbd1ffb 100644
--- a/monkestation/code/modules/liquids/liquid_groups.dm
+++ b/monkestation/code/modules/liquids/liquid_groups.dm
@@ -58,6 +58,10 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
var/list/current_temperature_queue = list()
///do we evaporate
var/evaporates = TRUE
+ /// Liquids in this group will always evaporate regardless of height
+ var/always_evaporates = FALSE
+ /// The multiplier added to the evaporation rate of all reagents in this group.
+ var/evaporation_multiplier = 1
///can we merge?
var/can_merge = TRUE
///number in decimal value that acts as a multiplier to the amount of liquids lost in applications
@@ -83,16 +87,26 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
/datum/liquid_group/Destroy()
UnregisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT)
SSliquids.active_groups -= src
-
- if(src in SSliquids.arrayed_groups)
- SSliquids.arrayed_groups -= src /// Someone made a massive fucky wucky if this is happening
-
+ SSliquids.active_turf_group_queue -= src
+ SSliquids.arrayed_groups -= src /// Someone made a massive fucky wucky if this is happening
for(var/turf/member_turf as anything in members)
- member_turf?.liquids?.liquid_group = null
- members = list()
+ if(member_turf?.liquids?.liquid_group == src)
+ QDEL_NULL(member_turf.liquids)
+ members = null
burning_members = null
+ cached_edge_turfs = null
+ cached_fire_spreads = null
+ cached_reagent_list = null
+ current_temperature_queue = null
+ splitting_array = null
return ..()
+/datum/liquid_group/proc/copy_properties(datum/liquid_group/from)
+ if(isnull(from))
+ return
+ always_evaporates = from.always_evaporates
+ evaporation_multiplier = from.evaporation_multiplier
+
/datum/liquid_group/proc/removed_reagent(datum/reagents/source, datum/reagent/modified)
for(var/turf/member as anything in members)
if(QDELETED(member.liquids))
@@ -122,19 +136,21 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
process_group()
/datum/liquid_group/proc/remove_from_group(turf/T, should_reprocess = TRUE)
-
- if(T in burning_members)
+ if(isnull(T))
+ return
+ SSliquids.burning_turfs -= T
+ if(burning_members)
burning_members -= T
-
- if(T in SSliquids.burning_turfs)
- SSliquids.burning_turfs -= T
-
- members -= T
+ if(members)
+ members -= T
T.liquids?.liquid_group = null
for(var/datum/reagent/reagent as anything in reagents.reagent_list)
reagent.remove_from_member(T.liquids)
+ if(QDELING(src))
+ return
+
if(!length(members))
qdel(src)
return
@@ -171,6 +187,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
total_reagent_volume = reagents.total_volume
reagents_per_turf = total_reagent_volume / length(members)
+ always_evaporates ||= otherg.always_evaporates
+ evaporation_multiplier = (evaporation_multiplier + otherg.evaporation_multiplier) * 0.5 // average the evaporation multipliers
qdel(otherg)
process_group()
@@ -392,6 +410,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
/datum/liquid_group/proc/move_liquid_group(obj/effect/abstract/liquid_turf/member)
remove_from_group(member.my_turf)
member.liquid_group = new(1, member)
+ member.liquid_group.copy_properties(src)
var/remove_amount = reagents_per_turf / length(reagents.reagent_list)
for(var/datum/reagent/reagent_type in reagents.reagent_list)
member.liquid_group.reagents.add_reagent(reagent_type, remove_amount, no_react = TRUE)
@@ -694,6 +713,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
passed_directions.Add(direction)
if(length(passed_directions))
+ if(!islist(cached_edge_turfs)) // what the fuck???
+ cached_edge_turfs = list()
cached_edge_turfs |= checker
cached_edge_turfs[checker] = passed_directions
@@ -808,6 +829,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
var/amount_to_transfer = length(connected_liquids) * reagents_per_turf
var/datum/liquid_group/new_group = new(1)
+ new_group.copy_properties(src)
for(var/turf/connected_liquid in connected_liquids)
new_group.check_edges(connected_liquid)
@@ -884,6 +906,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
var/amount_to_transfer = length(connected_liquids) * reagents_per_turf
var/datum/liquid_group/new_group = new(1)
+ new_group.copy_properties(src)
if(!members)
members = list()
trans_to_seperate_group(new_group.reagents, amount_to_transfer)
diff --git a/monkestation/code/modules/liquids/liquid_interaction.dm b/monkestation/code/modules/liquids/liquid_interaction.dm
index e9b725047a85..9e62641611c3 100644
--- a/monkestation/code/modules/liquids/liquid_interaction.dm
+++ b/monkestation/code/modules/liquids/liquid_interaction.dm
@@ -11,7 +11,7 @@
interaction_callback = CALLBACK(parent, on_interaction_callback)
-/datum/component/liquids_interaction/Destroy(force, silent)
+/datum/component/liquids_interaction/Destroy(force)
interaction_callback = null
return ..()
diff --git a/monkestation/code/modules/liquids/liquid_pump.dm b/monkestation/code/modules/liquids/liquid_pump.dm
index 353c9ad557fc..3322a617e726 100644
--- a/monkestation/code/modules/liquids/liquid_pump.dm
+++ b/monkestation/code/modules/liquids/liquid_pump.dm
@@ -6,7 +6,6 @@
icon_state = "liquid_pump"
density = TRUE
max_integrity = 500
- anchored = FALSE
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/// How many reagents at maximum can it hold
var/max_volume = 10000
@@ -21,7 +20,7 @@
/obj/structure/liquid_pump/wrench_act(mob/living/user, obj/item/I)
. = ..()
- default_unfasten_wrench(user, I, 40)
+ default_unfasten_wrench(user, I, 20)
if(!anchored && turned_on)
toggle_working()
return TRUE
@@ -34,7 +33,7 @@
toggle_working()
/obj/structure/liquid_pump/AltClick(mob/living/user)
- if(!user.can_perform_action())
+ if(!user.can_perform_action(src))
return
to_chat(user, span_notice("You flick [src]'s spewing mode [spewing_mode ? "off" : "on"]."))
spewing_mode = !spewing_mode
@@ -67,7 +66,7 @@
var/target_siphon_amt = (T.liquids.liquid_group.total_reagent_volume * pump_speed_percentage) + pump_speed_flat
if(target_siphon_amt > free_space)
target_siphon_amt = free_space
- T.liquids.liquid_group.transfer_to_atom(src, target_siphon_amt)
+ T.liquids.liquid_group.trans_to_seperate_group(reagents, target_siphon_amt)
return
/obj/structure/liquid_pump/update_icon()
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/loadouts/items/toys.dm b/monkestation/code/modules/loadouts/items/toys.dm
index ffc34fe5e535..cb6e2d2e4947 100644
--- a/monkestation/code/modules/loadouts/items/toys.dm
+++ b/monkestation/code/modules/loadouts/items/toys.dm
@@ -217,3 +217,7 @@ GLOBAL_LIST_INIT(loadout_toys, generate_loadout_items(/datum/loadout_item/toys))
item_path = /obj/item/toy/plush/cirno_plush/ballin
requires_purchase = FALSE
ckeywhitelist = list("dwasint")
+
+/datum/loadout_item/toys/durrcell
+ name = "Durrcell Plush"
+ item_path = /obj/item/toy/plush/durrcell
diff --git a/monkestation/code/modules/mech_comp/_interface.dm b/monkestation/code/modules/mech_comp/_interface.dm
index 8a9c267b7bfa..071b6605e51c 100644
--- a/monkestation/code/modules/mech_comp/_interface.dm
+++ b/monkestation/code/modules/mech_comp/_interface.dm
@@ -10,7 +10,7 @@
owner = _owner
RegisterSignal()
-/datum/mcinterface/Destroy(force, ...)
+/datum/mcinterface/Destroy(force)
owner = null
ClearConnections()
return ..()
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..d305e7416eac 100644
--- a/monkestation/code/modules/mech_comp/objects/messages/button.dm
+++ b/monkestation/code/modules/mech_comp/objects/messages/button.dm
@@ -9,6 +9,7 @@
. = ..()
if(.)
return
+ playsound(src, SFX_BUTTON_CLICK, vol = 45, vary = FALSE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, mixer_channel = CHANNEL_MACHINERY)
flick(icon_down, src)
fire(stored_message)
log_message("triggered by [key_name(user)]", LOG_MECHCOMP)
@@ -21,6 +22,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/mech_comp/objects/messages/button_panel.dm b/monkestation/code/modules/mech_comp/objects/messages/button_panel.dm
index 0213ab8ec805..98c9dd18c1a3 100644
--- a/monkestation/code/modules/mech_comp/objects/messages/button_panel.dm
+++ b/monkestation/code/modules/mech_comp/objects/messages/button_panel.dm
@@ -28,6 +28,7 @@
flick("comp_buttpanel1", src)
fire(active_buttons[selected_button])
+ playsound(src, SFX_BUTTON_CLICK, vol = 45, vary = FALSE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, mixer_channel = CHANNEL_MACHINERY)
log_message("triggered by [key_name(user)]", LOG_MECHCOMP)
return TRUE
diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_field.dm b/monkestation/code/modules/meteor_shield/meteor_shield_field.dm
index 3084be43e1d0..ab546d5a565a 100644
--- a/monkestation/code/modules/meteor_shield/meteor_shield_field.dm
+++ b/monkestation/code/modules/meteor_shield/meteor_shield_field.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY_TYPED(meteor_shield_fields, /datum/proximity_monitor/advanced/
/datum/proximity_monitor/advanced/meteor_shield/setup_field_turf(turf/open/target)
if(!isgroundlessturf(target))
return
- if(true_host.check_los(get_turf(true_host), target))
+ if(true_host.check_los(get_turf(host), target))
ADD_TRAIT(target, TRAIT_COVERED_BY_METEOR_SHIELD, REF(src))
target.AddElement(/datum/element/meteor_shield_coverage)
diff --git a/monkestation/code/modules/mining/lavaland/tendril_loot.dm b/monkestation/code/modules/mining/lavaland/tendril_loot.dm
new file mode 100644
index 000000000000..ea730afcdc8c
--- /dev/null
+++ b/monkestation/code/modules/mining/lavaland/tendril_loot.dm
@@ -0,0 +1,14 @@
+/obj/item/clothing/neck/necklace/memento_mori/attack_hand(mob/user, list/modifiers)
+ if(prevent_accidental_suicide(user))
+ return
+ return ..()
+
+/obj/item/clothing/neck/necklace/memento_mori/MouseDrop(atom/over_object)
+ if(prevent_accidental_suicide(over_object))
+ return
+ return ..()
+
+/obj/item/clothing/neck/necklace/memento_mori/proc/prevent_accidental_suicide(mob/user)
+ if(user == active_owner && tgui_alert(user, "Taking this off will INSTANTLY KILL YOU! Are you really sure you want to take it off?", "Memento Mori", list("Yes", "No")) != "Yes")
+ return TRUE
+ return FALSE
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/mob/dead/new_player/sprite_accessories/ipc_screens.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ipc_screens.dm
index 7b46fbbae052..a4e57f99fd88 100644
--- a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ipc_screens.dm
+++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/ipc_screens.dm
@@ -1,6 +1,6 @@
/datum/sprite_accessory/ipc_screens
icon = 'monkestation/icons/mob/species/ipc/ipc_screens.dmi'
- color_src = EYECOLOR
+ color_src = EYE_COLOR
is_emissive = TRUE
/datum/sprite_accessory/ipc_screens/blue
diff --git a/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm b/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm
index 96c6ed44340c..b2b34ddb6624 100644
--- a/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm
+++ b/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm
@@ -1,5 +1,3 @@
-/datum/ai_behavior/perform_speech/parrot
- action_cooldown = 45 SECONDS // SHUT UP
-
/datum/ai_behavior/perform_speech/parrot/perform(seconds_per_tick, datum/ai_controller/controller, ...)
- controller.behavior_cooldowns[src] = world.time + rand(45 SECONDS, 3 MINUTES)
+ controller.behavior_cooldowns[src] = world.time + rand(45 SECONDS, 3 MINUTES) // Prevents Poly from being too yappy
+ . = ..()
diff --git a/monkestation/code/modules/mob/living/basic/trooper/syndicate.dm b/monkestation/code/modules/mob/living/basic/trooper/syndicate.dm
new file mode 100644
index 000000000000..c7e08e3e50e2
--- /dev/null
+++ b/monkestation/code/modules/mob/living/basic/trooper/syndicate.dm
@@ -0,0 +1,21 @@
+// Weaker variants of the syndie trooper NPCs for the Shocktroops event
+/mob/living/basic/trooper/syndicate/melee/space/lesser
+ maxHealth = 45
+ health = 45
+ melee_damage_lower = 8
+ melee_damage_upper = 15
+ melee_attack_cooldown = 1.5 SECONDS
+
+/mob/living/basic/trooper/syndicate/melee/space/stormtrooper/lesser
+ maxHealth = 100
+ health = 100
+ melee_damage_lower = 10
+ melee_damage_upper = 18
+ melee_attack_cooldown = 1.5 SECONDS
+
+/mob/living/basic/trooper/syndicate/ranged/space/lesser
+ maxHealth = 45
+ health = 45
+ melee_damage_lower = 5
+ melee_damage_upper = 10
+ ranged_cooldown = 3 SECONDS
diff --git a/monkestation/code/modules/mob/living/carbon/emote.dm b/monkestation/code/modules/mob/living/carbon/emote.dm
index c5d020a39791..922607389cad 100644
--- a/monkestation/code/modules/mob/living/carbon/emote.dm
+++ b/monkestation/code/modules/mob/living/carbon/emote.dm
@@ -51,7 +51,7 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
inhand_icon_state = "nothing"
- item_flags = DROPDEL | HAND_ITEM
+ item_flags = DROPDEL | HAND_ITEM | ABSTRACT
force = 0
throwforce = 0
load_sound_volume = 0
diff --git a/monkestation/code/modules/mob/living/carbon/human/emotes.dm b/monkestation/code/modules/mob/living/carbon/human/emotes.dm
index 3b41962c83ca..4edc0f25db10 100644
--- a/monkestation/code/modules/mob/living/carbon/human/emotes.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/emotes.dm
@@ -17,7 +17,7 @@
//BIBLEFART/
//This goes above all else because it's an instagib.
- for(var/obj/item/storage/book/bible/Holy in Location)
+ for(var/obj/item/book/bible/Holy in Location)
if(Holy)
var/mob/living/carbon/human/Person = user //We know they are human already, it was in the emote check.
var/turf/T = get_step(get_step(Person, NORTH), NORTH)
diff --git a/monkestation/code/modules/mob/living/carbon/human/init_signals.dm b/monkestation/code/modules/mob/living/carbon/human/init_signals.dm
new file mode 100644
index 000000000000..754a8c324a11
--- /dev/null
+++ b/monkestation/code/modules/mob/living/carbon/human/init_signals.dm
@@ -0,0 +1,7 @@
+/mob/living/carbon/human/register_init_signals()
+ . = ..()
+ RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD), PROC_REF(on_lose_noblood_trait))
+
+/mob/living/carbon/human/proc/on_lose_noblood_trait(datum/source)
+ SIGNAL_HANDLER
+ blood_volume = clamp(blood_volume, BLOOD_VOLUME_NORMAL, BLOOD_VOLUME_MAXIMUM - 1)
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/arachnid.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/arachnid.dm
index 2bdf8aceb1bb..0ceef81fbf51 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/arachnid.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/arachnid.dm
@@ -6,8 +6,6 @@
visual_gender = FALSE
species_traits = list(
MUTCOLORS,
- EYECOLOR,
- LIPS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
external_organs = list(
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
index d9c24a68dc1d..d97fcac41e35 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm
@@ -22,9 +22,6 @@
species_traits = list(
DYNCOLORS,
NO_UNDERWEAR,
- HAIR,
- EYECOLOR,
- FACEHAIR,
)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_cookie = /obj/item/food/energybar
@@ -37,6 +34,7 @@
bodytemp_cold_damage_limit = (T20C - 10) // about 10c
hair_color = "fixedmutcolor"
hair_alpha = 180
+ facial_hair_alpha = 180
bodypart_overrides = list(
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ethereal,
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm
index 0fa326c6d101..a4dfb03b1d78 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm
@@ -6,9 +6,6 @@
sexes = TRUE
species_traits = list(
MUTCOLORS,
- EYECOLOR,
- HAIR,
- FACEHAIR
)
inherent_traits = list(
TRAIT_DWARF,
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm
index 6afdad1ae0c0..d3e17e50bb00 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm
@@ -6,10 +6,9 @@
bodytype = BODYTYPE_CUSTOM
species_traits = list(
- EYECOLOR,
- LIPS,
NO_UNDERWEAR,
SPECIES_FUR,
+ SKINTONES,
)
inherent_traits = list(
TRAIT_VAULTING,
diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm
index bd27a5997bc4..7aec8942833f 100644
--- a/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm
+++ b/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm
@@ -12,11 +12,9 @@
meat = /obj/item/food/meat/slab/human/mutant/skeleton
species_traits = list(
NOTRANSSTING,
- NOEYESPRITES,
NO_DNA_COPY,
NO_UNDERWEAR,
NOHUSK,
- HAIR,
)
inherent_traits = list(
TRAIT_CAN_USE_FLIGHT_POTION,
diff --git a/monkestation/code/modules/mob/living/living_movement.dm b/monkestation/code/modules/mob/living/living_movement.dm
new file mode 100644
index 000000000000..a2efb7be0ec5
--- /dev/null
+++ b/monkestation/code/modules/mob/living/living_movement.dm
@@ -0,0 +1,4 @@
+/mob/living/CanAllowThrough(atom/movable/mover, border_dir)
+ if(SEND_SIGNAL(src, COMSIG_LIVING_CAN_ALLOW_THROUGH, mover, border_dir) & COMPONENT_LIVING_PASSABLE)
+ return TRUE
+ return ..()
diff --git a/monkestation/code/modules/mob/mob_say.dm b/monkestation/code/modules/mob/mob_say.dm
new file mode 100644
index 000000000000..6c157cd224e3
--- /dev/null
+++ b/monkestation/code/modules/mob/mob_say.dm
@@ -0,0 +1,6 @@
+/mob/say_dead()
+ if(!client?.holder && !GLOB.deadchat_allowed && !QDELETED(src))
+ to_chat(src, span_danger("Deadchat is disabled."))
+ return
+
+ . = ..()
diff --git a/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm
new file mode 100644
index 000000000000..07e1dc55418d
--- /dev/null
+++ b/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -0,0 +1,11 @@
+/obj/item/modular_computer/pda/security/brig_physician
+ name = "brig physician PDA"
+ greyscale_config = /datum/greyscale_config/tablet/stripe_split
+ greyscale_colors = "#A52F29#0000CC#918F8C"
+ starting_programs = list(
+ /datum/computer_file/program/records/security,
+ /datum/computer_file/program/records/medical,
+ /datum/computer_file/program/crew_manifest,
+ /datum/computer_file/program/robocontrol,
+ /datum/computer_file/program/radar/lifeline // For finding security officers
+ )
diff --git a/monkestation/code/modules/ocean_content/mobs/group_planning.dm b/monkestation/code/modules/ocean_content/mobs/group_planning.dm
index f07261ad13f6..d780a607f97f 100644
--- a/monkestation/code/modules/ocean_content/mobs/group_planning.dm
+++ b/monkestation/code/modules/ocean_content/mobs/group_planning.dm
@@ -18,7 +18,7 @@
///our current_target
var/atom/target
-/datum/group_planning/Destroy(force, ...)
+/datum/group_planning/Destroy(force)
. = ..()
finished_mobs = null
in_progress_mobs = null
diff --git a/monkestation/code/modules/outdoors/code/_onclick/hud/fullscreen.dm b/monkestation/code/modules/outdoors/code/_onclick/hud/fullscreen.dm
index 78b9f0093092..73e4d4efa8ff 100644
--- a/monkestation/code/modules/outdoors/code/_onclick/hud/fullscreen.dm
+++ b/monkestation/code/modules/outdoors/code/_onclick/hud/fullscreen.dm
@@ -15,6 +15,8 @@
/atom/movable/screen/fullscreen/lighting_backdrop/sunlight/Initialize()
. = ..()
+ if(!SSoutdoor_effects.enabled)
+ return
SSoutdoor_effects.sunlighting_planes |= src
color = SSoutdoor_effects.last_color
@@ -23,11 +25,8 @@
if(SSmapping.level_trait(z, ZTRAIT_DAYCYCLE))
daylight = TRUE
continue
- if(!daylight)
- SSoutdoor_effects.transition_sunlight_color(src, 1)
- else
- SSoutdoor_effects.transition_sunlight_color(src)
+ SSoutdoor_effects.transition_sunlight_color(src, !daylight)
/atom/movable/screen/fullscreen/lighting_backdrop/sunlight/Destroy()
- . = ..()
SSoutdoor_effects.sunlighting_planes -= src
+ return ..()
diff --git a/monkestation/code/modules/outdoors/code/_onclick/hud/rendering/plane_master.dm b/monkestation/code/modules/outdoors/code/_onclick/hud/rendering/plane_master.dm
index 8ba92a976454..5acd4cab4451 100644
--- a/monkestation/code/modules/outdoors/code/_onclick/hud/rendering/plane_master.dm
+++ b/monkestation/code/modules/outdoors/code/_onclick/hud/rendering/plane_master.dm
@@ -31,7 +31,8 @@
/atom/movable/screen/plane_master/weather_effect/Initialize()
. = ..()
//filters += filter(type="alpha", render_source=WEATHER_RENDER_TARGET)
- SSoutdoor_effects.weather_planes_need_vis |= src
+ if(SSoutdoor_effects.enabled)
+ SSoutdoor_effects.weather_planes_need_vis |= src
/atom/movable/screen/plane_master/weather_effect/Destroy()
. = ..()
diff --git a/monkestation/code/modules/outdoors/code/admin_commands.dm b/monkestation/code/modules/outdoors/code/admin_commands.dm
index d28f4c58ff40..70108388ddaa 100644
--- a/monkestation/code/modules/outdoors/code/admin_commands.dm
+++ b/monkestation/code/modules/outdoors/code/admin_commands.dm
@@ -6,6 +6,10 @@
if(!holder)
return
+ if(!SSparticle_weather.enabled)
+ to_chat(src, span_warning("Particle weather is currently disabled!"), type = MESSAGE_TYPE_ADMINLOG)
+ return
+
var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/particle_weather), /proc/cmp_typepaths_asc)
if(!weather_type)
return
diff --git a/monkestation/code/modules/outdoors/code/controllers/subsystem/outdoors_effects.dm b/monkestation/code/modules/outdoors/code/controllers/subsystem/outdoors_effects.dm
index 8916d5222ea4..27bfd058c20b 100644
--- a/monkestation/code/modules/outdoors/code/controllers/subsystem/outdoors_effects.dm
+++ b/monkestation/code/modules/outdoors/code/controllers/subsystem/outdoors_effects.dm
@@ -98,19 +98,24 @@ SUBSYSTEM_DEF(outdoor_effects)
new /datum/time_of_day/midnight())
var/next_day = FALSE // Resets when station_time is less than the next start time.
var/current_color
+ var/enabled = TRUE // Micro-optimization to avoid having to check config or bitflags
/datum/controller/subsystem/outdoor_effects/stat_entry(msg)
msg = "W:[GLOB.SUNLIGHT_QUEUE_WORK.len]|U:[GLOB.SUNLIGHT_QUEUE_UPDATE.len]|C:[GLOB.SUNLIGHT_QUEUE_CORNER.len]"
return ..()
/datum/controller/subsystem/outdoor_effects/proc/fullPlonk()
- for (var/z in (SSmapping.levels_by_trait(ZTRAIT_DAYCYCLE) + SSmapping.levels_by_trait(ZTRAIT_STARLIGHT)))
- for (var/turf/T in block(locate(1,1,z), locate(world.maxx,world.maxy,z)))
- var/area/TArea = T.loc
- if (TArea.static_lighting)
- GLOB.SUNLIGHT_QUEUE_WORK += T
+ var/list/zs = SSmapping.levels_by_trait(ZTRAIT_DAYCYCLE) | SSmapping.levels_by_trait(ZTRAIT_STARLIGHT)
+ for(var/area/area as anything in GLOB.areas)
+ if(!area.static_lighting)
+ continue
+ for(var/z in zs)
+ GLOB.SUNLIGHT_QUEUE_WORK += area.get_turfs_by_zlevel(z)
/datum/controller/subsystem/outdoor_effects/Initialize(timeofday)
+ if(CONFIG_GET(flag/disable_sunlight_visuals))
+ disable()
+ return SS_INIT_NO_NEED
if(SSmapping.config.map_name == "Oshan Station")
for(var/datum/time_of_day/listed_time as anything in time_cycle_steps)
qdel(listed_time)
@@ -141,13 +146,22 @@ SUBSYSTEM_DEF(outdoor_effects)
return SS_INIT_SUCCESS
-/datum/controller/subsystem/outdoor_effects/proc/InitializeTurfs(list/targets)
- for (var/z in (SSmapping.levels_by_trait(ZTRAIT_DAYCYCLE) + SSmapping.levels_by_trait(ZTRAIT_STARLIGHT)))
- for (var/turf/T in block(locate(1,1,z), locate(world.maxx,world.maxy,z)))
- var/area/TArea = T.loc
- if (TArea.static_lighting || istype(TArea, /area/space))
- GLOB.SUNLIGHT_QUEUE_WORK += T
-
+/datum/controller/subsystem/outdoor_effects/proc/InitializeTurfs()
+ var/list/zs = SSmapping.levels_by_trait(ZTRAIT_DAYCYCLE) | SSmapping.levels_by_trait(ZTRAIT_STARLIGHT)
+ for(var/area/area as anything in GLOB.areas)
+ if(!area.static_lighting && !istype(area, /area/space))
+ continue
+ for(var/z in zs)
+ GLOB.SUNLIGHT_QUEUE_WORK += area.get_turfs_by_zlevel(z)
+
+/// Disables the subsystem, cleaning up its vars and preventing it from firing.
+/datum/controller/subsystem/outdoor_effects/proc/disable()
+ enabled = FALSE
+ flags |= SS_NO_FIRE
+ QDEL_LIST(time_cycle_steps)
+ QDEL_NULL(current_step_datum)
+ QDEL_NULL(next_step_datum)
+ weather_light_affecting_event = null
/datum/controller/subsystem/outdoor_effects/proc/check_cycle()
if(!next_step_datum)
@@ -188,6 +202,8 @@ SUBSYSTEM_DEF(outdoor_effects)
/* set sunlight color + add weather effect to clients */
/datum/controller/subsystem/outdoor_effects/fire(resumed, init_tick_checks)
+ if(!enabled)
+ return
MC_SPLIT_TICK_INIT(3)
if(!init_tick_checks)
MC_SPLIT_TICK
@@ -280,6 +296,8 @@ SUBSYSTEM_DEF(outdoor_effects)
//Transition from our last color to our current color (i.e if it is going from daylight (white) to sunset (red), we transition to red in the first hour of sunset)
/datum/controller/subsystem/outdoor_effects/proc/transition_sunlight_color(atom/movable/screen/fullscreen/lighting_backdrop/sunlight/SP, time_given)
+ if(!enabled)
+ return
/* transistion in an hour or time diff from now to our next step, whichever is smaller */
if(!next_step_datum)
get_time_of_day()
diff --git a/monkestation/code/modules/outdoors/code/controllers/subsystem/particle_weather.dm b/monkestation/code/modules/outdoors/code/controllers/subsystem/particle_weather.dm
index 9d0cd983e4fe..d4c9de962da2 100644
--- a/monkestation/code/modules/outdoors/code/controllers/subsystem/particle_weather.dm
+++ b/monkestation/code/modules/outdoors/code/controllers/subsystem/particle_weather.dm
@@ -22,22 +22,27 @@ SUBSYSTEM_DEF(particle_weather)
var/datum/weather_effect/weather_special_effect_eclipse
var/obj/weather_effect/weather_effect_eclipse
+ var/enabled = TRUE
+
/datum/controller/subsystem/particle_weather/stat_entry(msg)
- if(running_weather?.running)
- var/time_left = COOLDOWN_TIMELEFT(running_weather, time_left)/10
- var/time_left_eclipse = COOLDOWN_TIMELEFT(running_eclipse_weather, time_left)/10
- if(running_weather?.display_name)
- msg = "P:Current event station: [running_weather.display_name] - [time_left] seconds left, Current event Eclipse: [running_eclipse_weather.display_name] - [time_left_eclipse] seconds left"
- else if(running_weather)
- msg = "P:Current event of unknown type ([running_weather]) - [time_left] seconds left"
- else if(running_weather)
- var/time_left = COOLDOWN_TIMELEFT(src, next_weather_start)
- if(running_weather?.display_name)
- msg = "P:Next event: [running_weather.display_name] hit in [time_left] seconds"
+ if(enabled)
+ if(running_weather?.running)
+ var/time_left = COOLDOWN_TIMELEFT(running_weather, time_left)/10
+ var/time_left_eclipse = COOLDOWN_TIMELEFT(running_eclipse_weather, time_left)/10
+ if(running_weather?.display_name)
+ msg = "P:Current event station: [running_weather.display_name] - [time_left] seconds left, Current event Eclipse: [running_eclipse_weather.display_name] - [time_left_eclipse] seconds left"
+ else if(running_weather)
+ msg = "P:Current event of unknown type ([running_weather]) - [time_left] seconds left"
else if(running_weather)
- msg = "P:Next event of unknown type ([running_weather]) hit in [time_left] seconds"
+ var/time_left = COOLDOWN_TIMELEFT(src, next_weather_start)
+ if(running_weather?.display_name)
+ msg = "P:Next event: [running_weather.display_name] hit in [time_left] seconds"
+ else if(running_weather)
+ msg = "P:Next event of unknown type ([running_weather]) hit in [time_left] seconds"
+ else
+ msg = "P:No event"
else
- msg = "P:No event"
+ msg = "Disabled"
return ..()
/datum/controller/subsystem/particle_weather/fire()
@@ -77,6 +82,9 @@ SUBSYSTEM_DEF(particle_weather)
//This has been mangled - currently only supports 1 weather effect serverwide so I can finish this
/datum/controller/subsystem/particle_weather/Initialize(start_timeofday)
+ if(CONFIG_GET(flag/disable_particle_weather))
+ disable()
+ return SS_INIT_NO_NEED
for(var/i in subtypesof(/datum/particle_weather))
var/datum/particle_weather/particle_weather = new i
if(particle_weather.target_trait in SSmapping.config.particle_weathers)
@@ -87,7 +95,14 @@ SUBSYSTEM_DEF(particle_weather)
return SS_INIT_SUCCESS
+/datum/controller/subsystem/particle_weather/proc/disable()
+ flags |= SS_NO_FIRE
+ enabled = FALSE
+ stop_weather()
+
/datum/controller/subsystem/particle_weather/proc/run_weather(datum/particle_weather/weather_datum_type, force = FALSE, eclipse = FALSE)
+ if(!enabled)
+ return
if(eclipse)
if(running_eclipse_weather)
if(force)
diff --git a/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm b/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm
index b19483266997..35cb0c5b366c 100644
--- a/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm
+++ b/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm
@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(siren_objects)
initiator_ref = particle_weather
start_process()
-/datum/weather_event/Destroy(force, ...)
+/datum/weather_event/Destroy(force)
. = ..()
if(initiator_ref)
initiator_ref.weather_additional_ongoing_events -= src
@@ -67,10 +67,11 @@ GLOBAL_LIST_EMPTY(siren_objects)
else
playsound_z(SSmapping.levels_by_trait(ZTRAIT_ECLIPSE), pick(sound_effects), 50, _mixer_channel = CHANNEL_WEATHER)
if(GLE_STAGE_THIRD)
- color_animating = SSoutdoor_effects.current_color
+ if(SSoutdoor_effects.enabled)
+ color_animating = SSoutdoor_effects.current_color
animate_flags = CIRCULAR_EASING | EASE_IN
- if(color_animating)
+ if(color_animating && SSoutdoor_effects.enabled)
for(var/atom/movable/screen/fullscreen/lighting_backdrop/sunlight/plane in SSoutdoor_effects.sunlighting_planes)
animate(plane, color = color_animating, easing = animate_flags, time = duration)
@@ -82,9 +83,10 @@ GLOBAL_LIST_EMPTY(siren_objects)
sleep(duration)
else if(stage > max_stages)
- SSoutdoor_effects.weather_light_affecting_event = null
- for(var/atom/movable/screen/fullscreen/lighting_backdrop/sunlight/plane in SSoutdoor_effects.sunlighting_planes)
- SSoutdoor_effects.transition_sunlight_color(plane)
+ if(SSoutdoor_effects.enabled)
+ SSoutdoor_effects.weather_light_affecting_event = null
+ for(var/atom/movable/screen/fullscreen/lighting_backdrop/sunlight/plane in SSoutdoor_effects.sunlighting_planes)
+ SSoutdoor_effects.transition_sunlight_color(plane)
qdel(src)
return
@@ -430,9 +432,13 @@ GLOBAL_LIST_EMPTY(siren_objects)
var/weather_message = weather_warnings["message"]
message += weather_message
for(var/mob/living/carbon/human/affected_human in GLOB.alive_mob_list)
- if(!affected_human.stat && affected_human.client && (affected_human.z in affected_zlevels))
- affected_human.playsound_local('monkestation/code/modules/outdoors/sound/effects/radiostatic.ogg', affected_human.loc, 25, FALSE, mixer_channel = CHANNEL_MACHINERY)
- affected_human.play_screen_text("Weather Alert:" + message["human"], /atom/movable/screen/text/screen_text/command_order, rgb(103, 214, 146)) + if(affected_human.stat || QDELETED(affected_human.client)) + continue + var/turf/affected_turf = get_turf(affected_human) + if(!(affected_turf?.z in affected_zlevels)) + continue + affected_human.playsound_local('monkestation/code/modules/outdoors/sound/effects/radiostatic.ogg', affected_human.loc, 25, FALSE, mixer_channel = CHANNEL_MACHINERY) + affected_human.play_screen_text("Weather Alert:
" + message["human"], /atom/movable/screen/text/screen_text/command_order, rgb(103, 214, 146)) return FALSE /datum/looping_sound/dust_storm diff --git a/monkestation/code/modules/overwatch/subsystem.dm b/monkestation/code/modules/overwatch/subsystem.dm index cccf55d66fcc..84e12a75c876 100644 --- a/monkestation/code/modules/overwatch/subsystem.dm +++ b/monkestation/code/modules/overwatch/subsystem.dm @@ -19,13 +19,11 @@ SUBSYSTEM_DEF(overwatch) var/list/client/postponed_client_queue = list() /datum/controller/subsystem/overwatch/Initialize(timeofday) - if(!CONFIG_GET(flag/sql_enabled)) log_sql("Overwatch could not be loaded without SQL enabled") - return ..() - + return SS_INIT_NO_NEED Toggle() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/overwatch/stat_entry(msg) return "[is_active ? "ACTIVE" : "OFFLINE"]" diff --git a/monkestation/code/modules/pai/card.dm b/monkestation/code/modules/pai/card.dm new file mode 100644 index 000000000000..6196ca0bbd4b --- /dev/null +++ b/monkestation/code/modules/pai/card.dm @@ -0,0 +1,8 @@ +/obj/item/pai_card/examine(mob/user) + . = ..() + . += span_notice("There's a sticker on the back. You can look again to take a closer look...") + +/obj/item/pai_card/examine_more(mob/user) + . = ..() + . += span_notice("You examine [src] closer, and note the following...") + . += "\"Nanotrasen silicon units are incompatible with magic of any form, including but not limited to: Heretical runes, wizard spells, and blood summonings. Nanotrasen takes no responsibility for any damage that may occur to the device as a result of trying to combine Nanotrasen silicon and magic.\"" diff --git a/monkestation/code/modules/paperwork/filingcabinet.dm b/monkestation/code/modules/paperwork/filingcabinet.dm new file mode 100644 index 000000000000..672c9d347d5c --- /dev/null +++ b/monkestation/code/modules/paperwork/filingcabinet.dm @@ -0,0 +1,2 @@ +/obj/structure/filingcabinet + pass_flags_self = parent_type::pass_flags_self | LETPASSCLICKS 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 fd7b02da5754..5c678839c235 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,16 +121,19 @@ 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) -/datum/component/movable_physics/Destroy(force, silent) +/datum/component/movable_physics/Destroy(force) + STOP_PROCESSING(SSmovable_physics, src) bounce_callback = null stop_callback = null cached_transform = null 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)) @@ -145,7 +151,7 @@ // NOTE: This component will work very poorly at anything less than ticking 10 times per second /datum/component/movable_physics/process(seconds_per_tick) var/atom/movable/moving_atom = parent - if(!isturf(moving_atom.loc) || !has_movement()) + if(!isturf(moving_atom.loc) || QDELING(moving_atom.loc) || !has_movement()) stop_movement() return PROCESS_KILL @@ -158,22 +164,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 @@ -248,8 +260,7 @@ moving_atom.pixel_z = z_floor if(cached_transform) animate(moving_atom, transform = cached_transform, time = 0, loop = 0) - if(stop_callback) - stop_callback.Invoke() + stop_callback?.Invoke() if((physics_flags & MPHYSICS_QDEL_WHEN_NO_MOVEMENT) && !QDELING(src)) qdel(src) @@ -257,14 +268,19 @@ /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) if(bounce_spin_speed && !visual_angle_velocity && !visual_angle_friction) moving_atom.SpinAnimation(speed = bounce_spin_speed, loops = max(0, bounce_spin_loops)) vertical_velocity = abs(vertical_velocity * vertical_conservation_of_momentum) - if(bounce_callback) - bounce_callback.Invoke() + bounce_callback?.Invoke() /// Basically handles bumping on a solid object and ricocheting away according to a dose of Newton's third law /datum/component/movable_physics/proc/on_bump(atom/movable/source, atom/bumped_atom) @@ -276,6 +292,7 @@ var/incidence = GET_ANGLE_OF_INCIDENCE(face_angle, angle + 180) var/new_angle = SIMPLIFY_DEGREES(face_angle + incidence) set_angle(new_angle) + 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/pissing/bladder.dm b/monkestation/code/modules/pissing/bladder.dm index fd86f84c2a35..f6bb6394bc2e 100644 --- a/monkestation/code/modules/pissing/bladder.dm +++ b/monkestation/code/modules/pissing/bladder.dm @@ -50,7 +50,7 @@ stored_piss = min(stored_piss + amount, max_piss_storage) if(COOLDOWN_FINISHED(src, piss_notification) && stored_piss == max_piss_storage) - to_chat(owner, span_warning("Your bladder if feeling full.")) + to_chat(owner, span_warning("Your bladder is feeling full.")) COOLDOWN_START(src, piss_notification, 5 MINUTES) 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/power/power_transmission_laser/code/announcement.dm b/monkestation/code/modules/power/power_transmission_laser/code/announcement.dm index 87e7ad6ae468..970a113737cd 100644 --- a/monkestation/code/modules/power/power_transmission_laser/code/announcement.dm +++ b/monkestation/code/modules/power/power_transmission_laser/code/announcement.dm @@ -1,69 +1,58 @@ -/// To be used for announcements about a milestone being broken -#define ANNOUNCEMENT_MILESTONE (1<<0) -/// To be used for rare history lessons that the PTL history team can make -#define ANNOUNCEMENT_HISTORY (1<<1) - /obj/machinery/power/transmission_laser/proc/send_ptl_announcement() /// The message we send - var/major_title - var/minor_title var/message - var/announcement_reason var/flavor_text - var/roll_for_history = rand(1, 10) switch(announcement_treshold) if(1 MW) message = "PTL account successfully made" - flavor_text = "from now on you will receive regular updates on the power exported via the onboard PTL, goodluck [station_name()]" + flavor_text = "From now on, you will receive regular updates on the power exported via the onboard PTL. Good luck [station_name()]!" INVOKE_ASYNC(src, PROC_REF(send_regular_ptl_announcement)) // starts giving the station regular updates on the PTL since our station just got an account if(1 GW) message = "The onboard PTL has successfully exported 1 Gigawatt worth of power" - flavor_text = "using the exported power we managed to save a station whose supermatter engine has dellamianted, good work." - announcement_reason = ANNOUNCEMENT_MILESTONE + flavor_text = "Using the exported power we managed to save a station whose supermatter engine has delamianted, good work!" if(1 TW) message = "The onboard PTL has successfully exported 1 Terawatt worth of power" - flavor_text = "using the exported power a nearby plasma mining outpost has been established without an engine, we depend on you and keep doing good work" - announcement_reason = ANNOUNCEMENT_MILESTONE + flavor_text = "You outputted so much power it caused space station 15's powergrid to overload, good work!" if(1 PW) message = "The onboard PTL has successfully exported 1 Petawatt worth of power" - if(roll_for_history > 1) - flavor_text = "thanks to your exported power we quickly managed to discharge emergency power to our fleet in distress, securing victory against a nearby syndicate ship. Great work" - announcement_reason = ANNOUNCEMENT_MILESTONE - else - flavor_text = "1.4 Petawatts is the estimated heat flux transported by the Gulf Stream back on the human's mother planet \"earth\"" - announcement_reason = ANNOUNCEMENT_HISTORY + flavor_text = "Your onboard PTL is outperforming all Nanotrasen owned solar PTL platforms in your sector. Central Command congratulates you for your achievement." if(1 EW) message = "The onboard PTL has successfully exported 1 Exawatt worth of power" - if(roll_for_history > 1) - flavor_text = "We did not expect your station to export such a high amount of power, and due to that [rand(1, 3)] of our batteries over-charged and blew up [rand(1, 5)] stations... keep doing good work?" - announcement_reason = ANNOUNCEMENT_MILESTONE - else - flavor_text = "In a keynote presentation, NIF & Photon Science Chief Technology Officer Chris Barty described the \"Nexawatt\" Laser, an exawatt (1,000-petawatt) laser concept based on NIF technologies, on April 13 at the SPIE Optics + Optoelectronics 2015 Conference in Prague. Barty also gave an invited talk on \"Laser-Based Nuclear Photonics\" at the SPIE meeting." - announcement_reason = ANNOUNCEMENT_HISTORY - - else + flavor_text = "Using your exported power, a nearby plasma mining outpost has been established without an engine! Keep up the good work, we depend on you!" + + if(1 ZW) + message = "The onboard PTL has successfully exported 1 Zetawatt worth of power" + flavor_text = "Thanks to your exported power, we quickly managed to discharge emergency power to our fleet in distress, securing victory against a nearby syndicate ship. Great work!" + + if(1 YW) + message = "The onboard PTL has successfully exported 1 Yottawatt worth of power" + flavor_text = "We did not expect your station to export such a high amount of power, and due to that, [rand(1, 3)] of our batteries over-charged and blew up [rand(1, 5)] stations... keep up the good work?" + + if(1 RW) + message = "The onboard PTL has successfully exported 1 Ronnawatt worth of power" + flavor_text = "The sheer amount of power you've sent us has successfully BSA'd an entire planet. We will be charging you 50 million credits for that post-shift, as we know you can afford it." + + if(1 QW) + message = "The onboard PTL has successfully exported 1 Quettawatt worth of power" + flavor_text = "\ + We have aquired enormous amounts of power thanks to you, making several new mining outposts. \ + We will hold a special medal granting ceremony to your local Chief Engineer. As an added bonus, all engineers part of your crew will be getting a raise once you arrive to CentCom. \ + But please do stop sending power soon, as we cannot hold much more. Consequences will arise if power output continues to be unmoderated.\ + " + + else // should not be achievable because it would require 1+36e power, but for safety reasons lets leave it here message = "The onboard PTL has successfully exported extremelly high amounts of power" - flavor_text = "we are not sure anymore how much power your PTL has exported, but it sure is a lot. Keep doing great work" - announcement_reason = ANNOUNCEMENT_MILESTONE - - minor_title = "Power Transmission Laser report" - if(announcement_reason) - switch(announcement_reason) - if(ANNOUNCEMENT_MILESTONE) - major_title = "[command_name()] energy unit" - message = "New milestone reached!\n[message]" - if(ANNOUNCEMENT_HISTORY) - major_title = "[command_name()] energy unit" - minor_title = "Power Transmission Laser report, history sub-division" - message = "PTL history lesson\n[message]" + flavor_text = "We ran out of orders of magnitude that are currently categorized, good work!" + + message = "New milestone reached!\n[message]" priority_announce( - sender_override = major_title, - title = minor_title, + sender_override = "[command_name()] energy unit", + title = "Power Transmission Laser report", text = "[message]\n[flavor_text]", color_override = "orange", ) diff --git a/monkestation/code/modules/power/power_transmission_laser/code/machine.dm b/monkestation/code/modules/power/power_transmission_laser/code/machine.dm index fa9652fc8229..d60b213ed9cd 100644 --- a/monkestation/code/modules/power/power_transmission_laser/code/machine.dm +++ b/monkestation/code/modules/power/power_transmission_laser/code/machine.dm @@ -245,7 +245,6 @@ if("outputQW") power_format_multi_output = 1 QW - /obj/machinery/power/transmission_laser/process() max_grid_load = terminal.surplus() input_available = terminal.surplus() diff --git a/monkestation/code/modules/projectiles/projectile/spells.dm b/monkestation/code/modules/projectiles/projectile/spells.dm new file mode 100644 index 000000000000..cf25d6d2c289 --- /dev/null +++ b/monkestation/code/modules/projectiles/projectile/spells.dm @@ -0,0 +1,79 @@ +/obj/projectile/magic/fire_ball + name = "fire ball" + icon = 'monkestation/icons/obj/weapons/guns/projectiles.dmi' + icon_state = "fire_ball" + damage = 20 + damage_type = BURN + hitsound = null + projectile_piercing = PASSMOB + + ricochets_max = 4 + ricochet_chance = 100 + ricochet_decay_chance = 1 + ricochet_decay_damage = 1 + ricochet_incidence_leeway = 0 + ricochet_shoots_firer = FALSE + ///A weakref to our "true" firer because ricochet changes firer + var/datum/weakref/true_firer + +/obj/projectile/magic/fire_ball/fire(angle, atom/direct_target) + . = ..() + if(firer) + true_firer = WEAKREF(firer) + +/obj/projectile/magic/fire_ball/prehit_pierce(atom/target) + . = ..() + if(. != PROJECTILE_DELETE_WITHOUT_HITTING || !ismob(target)) + return + true_firer = WEAKREF(target) + handle_bounce(target) + visible_message(span_warning("[src] bounces off the aura around [target]!")) + return PROJECTILE_PIERCE_PHASE + +/obj/projectile/magic/fire_ball/Impact(atom/A) + . = ..() + if(.) + playsound(src, 'sound/items/dodgeball.ogg', 200, channel = CHANNEL_SOUND_EFFECTS) //this is a very quiet sound + +/obj/projectile/magic/fire_ball/on_hit(mob/living/target, blocked, pierce_hit) + if(target == true_firer?.resolve()) //we do this here instead of on_hit_target due to us having specific logic here with handle_bounce() + handle_bounce(target) + return BULLET_ACT_BLOCK + + . = ..() + if(. != BULLET_ACT_HIT || !istype(target) ) + return + + if(pierces >= ricochets_max) + projectile_piercing = NONE + target.adjust_fire_stacks(2) + target.ignite_mob() + target.Knockdown(3 SECONDS) + target.Paralyze(0.5 SECONDS) + handle_bounce(target) + +/obj/projectile/magic/fire_ball/check_ricochet_flag(atom/A) + return !ismob(A) //we handle mobs ourselves but besides that can ALWAYS ricochet + +/obj/projectile/magic/fire_ball/check_ricochet(atom/A) + return TRUE //this handles the prob checks which is always 100, so lets just skip the step to save resources + +///Find a tile within 1 range() of a valid mob in our view, if we cant find any then return FALSE +/obj/projectile/magic/fire_ball/proc/get_new_target() + var/list/possible_targets = list() + var/mob/resolved_true_firer = true_firer?.resolve() + for(var/mob/living/possible_target in view()) + if(possible_target == resolved_true_firer || impacted[possible_target]) + continue + possible_targets += possible_target + + if(!length(possible_targets)) + return FALSE + return pick(RANGE_TURFS(1, get_turf(pick(possible_targets)))) + +/obj/projectile/magic/fire_ball/proc/handle_bounce(atom/target) + var/new_target = get_new_target() + if(new_target) + set_angle_centered(get_angle(target, new_target)) + else + reflect(target) diff --git a/monkestation/code/modules/ranching/chicken_book.dm b/monkestation/code/modules/ranching/chicken_book.dm index c56f7d3e24fb..f4643491f8b3 100644 --- a/monkestation/code/modules/ranching/chicken_book.dm +++ b/monkestation/code/modules/ranching/chicken_book.dm @@ -5,15 +5,21 @@ icon_state = "chicken_book" /obj/item/chicken_book/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user,src,ui) + ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user,src,"RanchingEncyclopedia") + ui = new(user, src, "RanchingEncyclopedia") + ui.set_autoupdate(FALSE) ui.open() -/obj/item/chicken_book/ui_act(action,list/params) +/obj/item/chicken_book/ui_act(action, list/params) if(..()) return +/obj/item/chicken_book/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/chicken_book), + ) + /obj/item/chicken_book/ui_static_data(mob/user) var/list/data = list() var/list/chicken_list = list() @@ -79,12 +85,7 @@ details["nearby_items"] = obj_names.Join(",") details["comes_from"] = created_mutation.can_come_from_string - var/icon/chicken_icon = getFlatIcon(F) - var/md5 = md5(fcopy_rsc(chicken_icon)) - if(!SSassets.cache["photo_[md5]_[F.breed_name]_icon.png"]) - SSassets.transport.register_asset("photo_[md5]_[F.breed_name]_icon.png", chicken_icon) - SSassets.transport.send_assets(user, list("photo_[md5]_[F.breed_name]_icon.png" = chicken_icon)) - details["chicken_icon"] = SSassets.transport.get_asset_url("photo_[md5]_[F.breed_name]_icon.png") + details["chicken_icon"] = sanitize_css_class_name("[created_mutation.chicken_type]") chicken_list += list(details) qdel(F) qdel(created_mutation) diff --git a/monkestation/code/modules/ranching/chickens/_chicken.dm b/monkestation/code/modules/ranching/chickens/_chicken.dm index f2c6d13c9305..b4e93613c419 100644 --- a/monkestation/code/modules/ranching/chickens/_chicken.dm +++ b/monkestation/code/modules/ranching/chickens/_chicken.dm @@ -7,7 +7,7 @@ gender = FEMALE maxHealth = 15 - mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) + mob_biotypes = MOB_ORGANIC | MOB_BEAST icon = 'monkestation/icons/mob/ranching/chickens.dmi' icon_state = "chicken_white" @@ -68,14 +68,15 @@ assign_chicken_icon() if(gender == MALE && breed_name) if(breed_name_male) - name = " [breed_name_male]" + name = real_name = "[breed_name_male]" else - name = "[breed_name] Rooster" + name = real_name = "[breed_name] Rooster" else if(breed_name_female) - name = " [breed_name_female]" + name = real_name = "[breed_name_female]" else - name = "[breed_name] Hen" + name = real_name = "[breed_name] Hen" + update_name_tag() build_initial_planning_tree() diff --git a/monkestation/code/modules/ranching/chickens/ai/gary/gary_behaviours.dm b/monkestation/code/modules/ranching/chickens/ai/gary/gary_behaviours.dm index 55ef4f0af100..6148a75ac503 100644 --- a/monkestation/code/modules/ranching/chickens/ai/gary/gary_behaviours.dm +++ b/monkestation/code/modules/ranching/chickens/ai/gary/gary_behaviours.dm @@ -34,9 +34,11 @@ pawn.fading_leap_down() controller.blackboard[BB_GARY_HAS_SHINY] = FALSE - pawn.held_item.forceMove(get_turf(pawn)) - pawn.held_shinies += pawn.held_item.type - pawn.held_item.AddComponent(/datum/component/garys_item) + var/obj/item/shiny = pawn.held_item + shiny?.forceMove(get_turf(pawn)) + if(!QDELETED(shiny)) + pawn.held_shinies += shiny.type + shiny.AddComponent(/datum/component/garys_item, pawn) pawn.held_item = null /datum/ai_behavior/setup_hideout @@ -57,7 +59,7 @@ continue var/obj/item/spawned = new shiny_object(current_home) pawn.hideout.add_item(spawned) - spawned.AddComponent(/datum/component/garys_item) + spawned.AddComponent(/datum/component/garys_item, pawn) finish_action(controller, TRUE) /datum/ai_behavior/setup_hideout/perform(seconds_per_tick, datum/ai_controller/controller, ...) @@ -155,6 +157,7 @@ if(!has_left_pocket && !has_right_pocket && !has_valid_hand) held_item.forceMove(get_turf(target)) + SEND_SIGNAL(held_item, COMSIG_ITEM_GARY_LOOTED, pawn) finish_action(controller, FALSE) return FALSE @@ -165,6 +168,7 @@ target.equip_to_slot_if_possible(held_item, (!has_left_pocket ? ITEM_SLOT_RPOCKET : (prob(50) ? ITEM_SLOT_LPOCKET : ITEM_SLOT_RPOCKET))) else target.put_in_hands(held_item) + SEND_SIGNAL(held_item, COMSIG_ITEM_GARY_LOOTED, pawn) finish_action(controller, TRUE) /datum/ai_behavior/gary_give_item/finish_action(datum/ai_controller/controller, succeeded, ...) diff --git a/monkestation/code/modules/ranching/chickens/ai/gary/gary_controller.dm b/monkestation/code/modules/ranching/chickens/ai/gary/gary_controller.dm index 5fcb861dd562..e4fbbca56aa8 100644 --- a/monkestation/code/modules/ranching/chickens/ai/gary/gary_controller.dm +++ b/monkestation/code/modules/ranching/chickens/ai/gary/gary_controller.dm @@ -37,6 +37,13 @@ if(prob(5) && (world.time > controller.blackboard[BB_GARY_WANDER_COOLDOWN])) controller.queue_behavior(/datum/ai_behavior/travel_towards/gary_goto_target, BB_TRAVEL_DESTINATION) +/datum/ai_controller/chicken/gary/proc/set_home(turf/open/new_home) + if(QDELETED(new_home)) + return + blackboard[BB_GARY_HIDEOUT] = list(new_home.x, new_home.y, new_home.z) + blackboard[BB_GARY_HIDEOUT_SETTING_UP] = TRUE + blackboard[BB_GARY_COME_HOME] = TRUE + queue_behavior(/datum/ai_behavior/travel_towards/head_to_hideout, BB_TRAVEL_DESTINATION) /datum/ai_movement/jps/gary max_pathing_attempts = 25 diff --git a/monkestation/code/modules/ranching/chickens/ai/gary/gary_subtrees.dm b/monkestation/code/modules/ranching/chickens/ai/gary/gary_subtrees.dm index d701b8fa3f23..26eb22ca86fd 100644 --- a/monkestation/code/modules/ranching/chickens/ai/gary/gary_subtrees.dm +++ b/monkestation/code/modules/ranching/chickens/ai/gary/gary_subtrees.dm @@ -20,7 +20,6 @@ controller.blackboard[BB_GARY_HIDEOUT] = list(target_turf.x, target_turf.y, target_turf.z) controller.blackboard[BB_GARY_HIDEOUT_SETTING_UP] = TRUE controller.blackboard[BB_GARY_COME_HOME] = TRUE - controller.queue_behavior(/datum/ai_behavior/travel_towards/head_to_hideout, BB_TRAVEL_DESTINATION) return diff --git a/monkestation/code/modules/ranching/chickens/misc/gary.dm b/monkestation/code/modules/ranching/chickens/misc/gary.dm index ac31c80b2910..c6d4e21e4c06 100644 --- a/monkestation/code/modules/ranching/chickens/misc/gary.dm +++ b/monkestation/code/modules/ranching/chickens/misc/gary.dm @@ -1,12 +1,11 @@ ///gary is gonna have nothing to do with other crows because of how much unique code it has /mob/living/basic/chicken/gary - desc = "Gary the Crow. An inquisitive, yet cruel barterer." - breed_name_female = "Gary" breed_name_male = "Gary" - + breed_name_female = "Gary" + desc = "Gary the Crow. An inquisitive, yet cruel barterer." icon_suffix = "crow_gary" icon_state = "crow_gary" - + pass_flags = parent_type::pass_flags | PASSGRILLE | PASSFLAPS ai_controller = /datum/ai_controller/chicken/gary mutation_list = list() @@ -30,26 +29,44 @@ var/datum/hideout/hideout var/datum/callback/roundend_callback = null -/mob/living/basic/chicken/gary/Initialize(mapload) - . = ..() + var/max_w_class = WEIGHT_CLASS_SMALL +/mob/living/basic/chicken/gary/Initialize(mapload, turf/open/home) + . = ..() if(!memory_saved) roundend_callback = CALLBACK(src, PROC_REF(Write_Memory)) SSticker.OnRoundend(roundend_callback) - Read_Memory() - AddComponent(/datum/component/simple_access, REGION_ACCESS_ALL_STATION) //gary actually balls + AddComponent(/datum/component/simple_access, REGION_ACCESS_ALL_STATION) // gary actually balls + AddComponent(/datum/component/regenerator) + add_traits(list(TRAIT_SHOCKIMMUNE, TRAIT_GOES_THROUGH_WOODEN_BARRICADES, TRAIT_WATER_BREATHING), INNATE_TRAIT) // gary REALLY balls (also gary making a hideout in a pool is funny) + set_home(home) + // remove unused chicken components for gary + qdel(GetComponent(/datum/component/aging)) + qdel(GetComponent(/datum/component/hovering_information)) /mob/living/basic/chicken/gary/Destroy() + drop_held_item() LAZYREMOVE(SSticker.round_end_events, roundend_callback) roundend_callback = null //This ought to free the callback datum, and prevent us from harddeling QDEL_NULL(hideout) return ..() /mob/living/basic/chicken/gary/death(gibbed) + drop_held_item() . = ..() Write_Memory(TRUE) +/mob/living/basic/chicken/gary/proc/drop_held_item() + if(QDELETED(held_item)) + return + held_item.forceMove(drop_location()) + held_item = null + +/mob/living/basic/chicken/gary/proc/set_home(turf/open/new_home) + var/datum/ai_controller/chicken/gary/gary_controller = ai_controller + gary_controller.set_home(new_home) + /mob/living/basic/chicken/gary/proc/Read_Memory() if(fexists("data/npc_saves/Gary.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Gary.sav") @@ -69,8 +86,10 @@ held_shinies = json["heldshines"] sanitize_shinies() -/mob/living/basic/chicken/gary/Write_Memory(dead) +/mob/living/basic/chicken/gary/Write_Memory(dead, gibbed) . = ..() + if(!.) + return memory_saved = TRUE var/json_file = file("data/npc_saves/Gary.json") var/list/file_data = list() @@ -94,10 +113,11 @@ WRITE_FILE(json_file, json_encode(file_data)) /mob/living/basic/chicken/gary/proc/sanitize_shinies() - var/list/uncleaned = held_shinies - held_shinies = list() + var/list/uncleaned = held_shinies.Copy() + held_shinies.Cut() for(var/dirty in uncleaned) held_shinies += text2path(dirty) + list_clear_nulls(held_shinies) /mob/living/basic/chicken/gary/proc/return_stored_items() if(!fully_setup) @@ -105,9 +125,12 @@ return held_shinies /mob/living/basic/chicken/gary/attackby(obj/item/attacking_item, mob/living/user) - if(attacking_item.w_class <= WEIGHT_CLASS_SMALL) + if(stat != CONSCIOUS || (user.istate & ISTATE_HARM) || !user.Adjacent(src)) + return ..() + if(attacking_item.w_class <= max_w_class) if(held_item) - return ..() + to_chat(user, span_warning("[src] is already holding [held_item]!")) + return FALSE if(istype(attacking_item, /obj/item/knife)) attack_sound = 'sound/weapons/bladeslice.ogg' melee_damage_upper = attacking_item.force //attack dmg inherits knife dmg @@ -130,4 +153,6 @@ ai_controller.blackboard[BB_GARY_HAS_SHINY] = TRUE SEND_SIGNAL(src, COMSIG_MOB_ADJUST_HUNGER, 200) //gary hungers for trinkets and baubles. return TRUE - . = ..() + else + to_chat(user, span_warning("[attacking_item] is too big for [src] to hold!")) + return TRUE diff --git a/monkestation/code/modules/ranching/chickens/misc/gary_component.dm b/monkestation/code/modules/ranching/chickens/misc/gary_component.dm index 8b84011c546a..d8d267bbfd14 100644 --- a/monkestation/code/modules/ranching/chickens/misc/gary_component.dm +++ b/monkestation/code/modules/ranching/chickens/misc/gary_component.dm @@ -1,23 +1,36 @@ /datum/component/garys_item ///the gary that created us - var/datum/weakref/attached_gary + var/mob/living/basic/chicken/gary/gary -/datum/component/garys_item/Initialize(mob/living/basic/chicken/gary/attached_gary) +/datum/component/garys_item/Initialize(mob/living/basic/chicken/gary/gary) . = ..() + if(!istype(gary) || QDELING(gary)) + return COMPONENT_INCOMPATIBLE + src.gary = gary + RegisterSignal(gary, COMSIG_QDELETING, PROC_REF(on_gary_del)) + SEND_SIGNAL(parent, COMSIG_ITEM_GARY_STASHED, gary) - src.attached_gary = WEAKREF(attached_gary) +/datum/component/garys_item/Destroy(force, silent) + UnregisterSignal(gary, COMSIG_QDELETING) + gary = null + return ..() +/datum/component/garys_item/RegisterWithParent() + . = ..() RegisterSignal(parent, COMSIG_ITEM_PICKUP, PROC_REF(looter)) - /datum/component/garys_item/UnregisterFromParent() . = ..() UnregisterSignal(parent, COMSIG_ITEM_PICKUP) /datum/component/garys_item/proc/looter(datum/source, mob/taker) var/obj/item/source_item = parent - var/mob/living/basic/chicken/gary/gary = attached_gary.resolve() gary.held_shinies -= source_item.type gary.hideout.remove_item(source_item) gary.adjust_happiness(-5, taker) + SEND_SIGNAL(parent, COMSIG_ITEM_GARY_LOOTED, gary) SEND_SIGNAL(gary, COMSIG_FRIENDSHIP_CHANGE, taker, -50)// womp womp + +/datum/component/garys_item/proc/on_gary_del(datum/source) + SIGNAL_HANDLER + qdel(src) diff --git a/monkestation/code/modules/ranching/chickens/misc/gary_spawner.dm b/monkestation/code/modules/ranching/chickens/misc/gary_spawner.dm new file mode 100644 index 000000000000..c3ee9f9943d1 --- /dev/null +++ b/monkestation/code/modules/ranching/chickens/misc/gary_spawner.dm @@ -0,0 +1,50 @@ +GLOBAL_LIST(possible_gary_hideouts) + +/obj/effect/landmark/start/gary + name = "Potential Gary Spawnpoint (Common)" + icon = 'monkestation/icons/mob/landmarks.dmi' + icon_state = "Gary (Common)" + var/weight = 15 + +/obj/effect/landmark/start/gary/Initialize(mapload) + ..() + REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) + var/turf/open/our_turf = get_turf(loc) + if(isopenturf(our_turf) && !isgroundlessturf(our_turf)) + if(!LAZYLEN(GLOB.possible_gary_hideouts)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_gary))) + LAZYSET(GLOB.possible_gary_hideouts, our_turf, weight) + else + log_mapping("Gary spawnpoint placed at an invalid location ([AREACOORD(our_turf)])") + return INITIALIZE_HINT_QDEL + +/proc/spawn_gary() + if(!LAZYLEN(GLOB.possible_gary_hideouts)) + log_game("No valid Gary hideout spawners available, not spawning Gary.") + return + var/turf/open/base_spawn_loc = pick_weight(GLOB.possible_gary_hideouts) + var/mob/living/basic/chicken/gary/gary = new(base_spawn_loc) + // 5% chance they'll make a random hideout anyways + if(prob(95)) + var/area/base_spawn_area = get_area(base_spawn_loc) + // for variety's sake, we're gonna slightly randomize the spawn point to be within a screen or so of the landmark + var/list/possible_spawn_locs = list(base_spawn_loc) + for(var/turf/open/possible_loc in oview(7, base_spawn_loc)) + if(isgroundlessturf(possible_loc) || get_area(possible_loc) != base_spawn_area) + continue + if(!is_safe_turf(possible_loc)) + continue + possible_spawn_locs += possible_loc + gary.set_home(pick(possible_spawn_locs)) + log_game("Spawned Gary at [AREACOORD(base_spawn_loc)]") + LAZYNULL(GLOB.possible_gary_hideouts) + +/obj/effect/landmark/start/gary/uncommon + name = "Potential Gary Spawnpoint (Uncommon)" + icon_state = "Gary (Uncommon)" + weight = 5 + +/obj/effect/landmark/start/gary/rare + name = "Potential Gary Spawnpoint (Rare)" + icon_state = "Gary (Rare)" + weight = 1 diff --git a/monkestation/code/modules/ranching/chickens/misc/hideout_datum.dm b/monkestation/code/modules/ranching/chickens/misc/hideout_datum.dm index 43cd3c8fe3de..bcc6d9f0bd1a 100644 --- a/monkestation/code/modules/ranching/chickens/misc/hideout_datum.dm +++ b/monkestation/code/modules/ranching/chickens/misc/hideout_datum.dm @@ -1,7 +1,7 @@ /datum/hideout var/list/stored_items = list() -/datum/hideout/Destroy(force, ...) +/datum/hideout/Destroy(force) . = ..() for(var/obj/item/item as anything in stored_items) remove_item(item) diff --git a/monkestation/code/modules/ranching/circuits.dm b/monkestation/code/modules/ranching/circuits.dm index 9481951f4b8d..00b70cfa1958 100644 --- a/monkestation/code/modules/ranching/circuits.dm +++ b/monkestation/code/modules/ranching/circuits.dm @@ -21,6 +21,7 @@ name = "feed machine (Machine Board)" greyscale_colors = CIRCUIT_COLOR_SERVICE greyscale_colors = CIRCUIT_COLOR_SERVICE + build_path = /obj/machinery/feed_machine req_components = list( /datum/stock_part/matter_bin = 3, /datum/stock_part/manipulator = 1) diff --git a/monkestation/code/modules/ranching/components/aging.dm b/monkestation/code/modules/ranching/components/aging.dm index 1726af06c261..c4d6e51f6023 100644 --- a/monkestation/code/modules/ranching/components/aging.dm +++ b/monkestation/code/modules/ranching/components/aging.dm @@ -19,7 +19,7 @@ START_PROCESSING(SSobj, src) -/datum/component/aging/Destroy(force, silent) +/datum/component/aging/Destroy(force) death_callback = null return ..() diff --git a/monkestation/code/modules/ranching/components/happiness_container.dm b/monkestation/code/modules/ranching/components/happiness_container.dm index 03c307aac72f..228020c5824a 100644 --- a/monkestation/code/modules/ranching/components/happiness_container.dm +++ b/monkestation/code/modules/ranching/components/happiness_container.dm @@ -29,7 +29,7 @@ src.disliked_food_types = disliked_food_types src.unhappy_callbacks = unhappy_callbacks -/datum/component/happiness_container/Destroy(force, silent) +/datum/component/happiness_container/Destroy(force) unhappy_callbacks = null QDEL_NULL(applied_visual) return ..() diff --git a/monkestation/code/modules/ranching/components/hatching.dm b/monkestation/code/modules/ranching/components/hatching.dm index 7884eb41ab47..30ebde1b057f 100644 --- a/monkestation/code/modules/ranching/components/hatching.dm +++ b/monkestation/code/modules/ranching/components/hatching.dm @@ -45,7 +45,7 @@ START_PROCESSING(SSobj, src) -/datum/component/hatching/Destroy(force, silent) +/datum/component/hatching/Destroy(force) hatch_callback = null return ..() diff --git a/monkestation/code/modules/ranching/components/hovering_component.dm b/monkestation/code/modules/ranching/components/hovering_component.dm index 111a51372cf1..15deba6c78e1 100644 --- a/monkestation/code/modules/ranching/components/hovering_component.dm +++ b/monkestation/code/modules/ranching/components/hovering_component.dm @@ -18,7 +18,7 @@ . = ..() UnregisterSignal(parent, COMSIG_ATOM_MOUSE_ENTERED) -/datum/component/hovering_information/Destroy(force, silent) +/datum/component/hovering_information/Destroy(force) . = ..() QDEL_NULL(hover_information_data) @@ -38,7 +38,7 @@ /datum/hover_data var/list/images_per_client = list() -/datum/hover_data/Destroy(force, ...) +/datum/hover_data/Destroy(force) . = ..() if(length(images_per_client)) for(var/key in images_per_client) diff --git a/monkestation/code/modules/ranching/components/shearable.dm b/monkestation/code/modules/ranching/components/shearable.dm index 2cd0676ae3e7..8497cb4d3d7a 100644 --- a/monkestation/code/modules/ranching/components/shearable.dm +++ b/monkestation/code/modules/ranching/components/shearable.dm @@ -34,7 +34,7 @@ created_amount = amount src.created = created -/datum/component/shearable/Destroy(force, silent) +/datum/component/shearable/Destroy(force) regrow = null post_shear = null return ..() diff --git a/monkestation/code/modules/ranching/hover_data.dm b/monkestation/code/modules/ranching/hover_data.dm index a6b51ffbe756..eec71166b8ee 100644 --- a/monkestation/code/modules/ranching/hover_data.dm +++ b/monkestation/code/modules/ranching/hover_data.dm @@ -1,7 +1,7 @@ /datum/hover_data/chicken_info var/obj/effect/overlay/hover/chicken_egg -/datum/hover_data/chicken_info/Destroy(force, ...) +/datum/hover_data/chicken_info/Destroy(force) . = ..() qdel(chicken_egg) diff --git a/monkestation/code/modules/ranching/name_tags/name_tag.dm b/monkestation/code/modules/ranching/name_tags/name_tag.dm index ec613c35001b..bb8b81a938b1 100644 --- a/monkestation/code/modules/ranching/name_tags/name_tag.dm +++ b/monkestation/code/modules/ranching/name_tags/name_tag.dm @@ -1,3 +1,5 @@ +#define NAME_TAG_WIDTH (world.icon_size * 5) + /datum/keybinding/mob/show_names hotkey_keys = list("Ctrl") name = "show_names" @@ -20,7 +22,7 @@ name_tag.alpha = 0 /mob - var/obj/effect/name_tag/name_tag + var/obj/effect/abstract/name_tag/name_tag var/atom/movable/screen/name_shadow/shadow /mob/Initialize(mapload) @@ -40,22 +42,22 @@ hud_used.always_visible_inventory += shadow /mob/Logout() - . = ..() if(client && isliving(src) && (!iscyborg(src) && !isaicamera(src) && !isAI(src))) client.screen -= shadow shadow.UnregisterSignal(src, COMSIG_MOVABLE_Z_CHANGED) hud_used?.always_visible_inventory -= shadow QDEL_NULL(shadow) + return ..() /mob/Destroy() - . = ..() vis_contents -= name_tag QDEL_NULL(name_tag) - if(client || shadow) + if(shadow) client?.screen -= shadow shadow.UnregisterSignal(src, COMSIG_MOVABLE_Z_CHANGED) - hud_used?.always_visible_inventory -= shadow + hud_used.always_visible_inventory -= shadow QDEL_NULL(shadow) + return ..() /mob/proc/update_name_tag(passed_name) if(QDELETED(name_tag)) @@ -77,32 +79,49 @@ . = ..() update_name_tag() -/obj/effect/name_tag - plane = PLANE_NAME_TAGS - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - name = "" - maptext_x = -64 - maptext_y = -13 //directly below characters +/mob/living/vv_edit_var(var_name, var_value) + . = ..() + if(var_name == NAMEOF(src, name) || var_name == NAMEOF(src, real_name)) + update_name_tag() - maptext_width = 160 - maptext_height = 48 +/obj/effect/abstract/name_tag + name = "" icon = null // we want nothing - appearance_flags = PIXEL_SCALE alpha = 180 + plane = PLANE_NAME_TAGS + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + maptext_y = -13 //directly below characters + appearance_flags = PIXEL_SCALE | RESET_COLOR | RESET_TRANSFORM -/obj/effect/name_tag/New(mob/user) - RegisterSignal(user, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(update_z)) - -/obj/effect/name_tag/proc/hide() +/obj/effect/abstract/name_tag/Initialize(mapload) + . = ..() + if(!ismovable(loc) || QDELING(loc)) + return INITIALIZE_HINT_QDEL + var/atom/movable/movable_loc = loc + var/bound_width = movable_loc.bound_width || world.icon_size + maptext_width = NAME_TAG_WIDTH + maptext_height = world.icon_size * 1.5 + maptext_x = (NAME_TAG_WIDTH - bound_width) * -0.5 + RegisterSignal(loc, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(update_z)) + +/obj/effect/abstract/name_tag/Destroy(force) + UnregisterSignal(loc, COMSIG_MOVABLE_Z_CHANGED) + return ..() + +/obj/effect/abstract/name_tag/forceMove(atom/destination, no_tp = FALSE, harderforce = FALSE) + if(harderforce) + return ..() + +/obj/effect/abstract/name_tag/proc/hide() alpha = 0 -/obj/effect/name_tag/proc/show() +/obj/effect/abstract/name_tag/proc/show() alpha = 255 -/obj/effect/name_tag/proc/set_name(incoming_name) - maptext = "[incoming_name]" +/obj/effect/abstract/name_tag/proc/set_name(incoming_name) + maptext = MAPTEXT_GRAND9K("[incoming_name]") -/obj/effect/name_tag/proc/update_z(datum/source, turf/old_turf, turf/new_turf, same_z_layer) +/obj/effect/abstract/name_tag/proc/update_z(datum/source, turf/old_turf, turf/new_turf, same_z_layer) SET_PLANE(src, PLANE_TO_TRUE(src.plane), new_turf) /atom/movable/screen/plane_master/name_tags @@ -133,3 +152,5 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT plane = PLANE_NAME_TAGS_BLOCKER screen_loc = "BOTTOM,LEFT" + +#undef NAME_TAG_WIDTH diff --git a/monkestation/code/modules/ranching/satyr/accessories/sprites/fluff.dm b/monkestation/code/modules/ranching/satyr/accessories/sprites/fluff.dm index a353d5711e3a..e090eff8781a 100644 --- a/monkestation/code/modules/ranching/satyr/accessories/sprites/fluff.dm +++ b/monkestation/code/modules/ranching/satyr/accessories/sprites/fluff.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/satyr_fluff icon = 'monkestation/code/modules/ranching/icons/satyr_fluff.dmi' - color_src = HAIR + color_src = HEAD_HAIR /datum/sprite_accessory/satyr_fluff/normal name = "Normal" diff --git a/monkestation/code/modules/ranching/satyr/accessories/sprites/tail.dm b/monkestation/code/modules/ranching/satyr/accessories/sprites/tail.dm index 978e9b73ca83..2c3e197a7f71 100644 --- a/monkestation/code/modules/ranching/satyr/accessories/sprites/tail.dm +++ b/monkestation/code/modules/ranching/satyr/accessories/sprites/tail.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/satyr_tail icon = 'monkestation/code/modules/ranching/icons/satyr_tail.dmi' - color_src = HAIR + color_src = HEAD_HAIR /datum/sprite_accessory/satyr_tail/short name = "Short" diff --git a/monkestation/code/modules/ranching/satyr/bodyparts.dm b/monkestation/code/modules/ranching/satyr/bodyparts.dm index ff24f3dc4515..7809f9185b58 100644 --- a/monkestation/code/modules/ranching/satyr/bodyparts.dm +++ b/monkestation/code/modules/ranching/satyr/bodyparts.dm @@ -2,6 +2,7 @@ icon_greyscale = 'monkestation/code/modules/ranching/icons/bodyparts.dmi' limb_id = SPECIES_SATYR is_dimorphic = TRUE + head_flags = HEAD_HAIR | HEAD_FACIAL_HAIR | HEAD_EYESPRITES | HEAD_EYECOLOR | HEAD_EYEHOLES | HEAD_DEBRAIN /obj/item/bodypart/chest/satyr icon_greyscale = 'monkestation/code/modules/ranching/icons/bodyparts.dmi' diff --git a/monkestation/code/modules/ranching/satyr/components/living_drunk.dm b/monkestation/code/modules/ranching/satyr/components/living_drunk.dm index efc00ce2a124..6aafb42859a6 100644 --- a/monkestation/code/modules/ranching/satyr/components/living_drunk.dm +++ b/monkestation/code/modules/ranching/satyr/components/living_drunk.dm @@ -17,7 +17,7 @@ ADD_TRAIT(parent, TRAIT_LIVING_DRUNK, INNATE_TRAIT) START_PROCESSING(SSobj, src) -/datum/component/living_drunk/Destroy(force, silent) +/datum/component/living_drunk/Destroy(force) REMOVE_TRAIT(parent, TRAIT_LIVING_DRUNK, INNATE_TRAIT) . = ..() diff --git a/monkestation/code/modules/ranching/satyr/species.dm b/monkestation/code/modules/ranching/satyr/species.dm index 2ab8c9f1377d..fee044fc78f7 100644 --- a/monkestation/code/modules/ranching/satyr/species.dm +++ b/monkestation/code/modules/ranching/satyr/species.dm @@ -6,9 +6,6 @@ no_equip_flags = ITEM_SLOT_FEET sexes = TRUE species_traits = list( - EYECOLOR, - HAIR, - FACEHAIR, NO_UNDERWEAR, ) inherent_traits = list( 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/replays/subsystem/replay.dm b/monkestation/code/modules/replays/subsystem/replay.dm index 9f81e7d58d70..e87f8890e7c6 100644 --- a/monkestation/code/modules/replays/subsystem/replay.dm +++ b/monkestation/code/modules/replays/subsystem/replay.dm @@ -68,11 +68,10 @@ SUBSYSTEM_DEF(demo) /datum/controller/subsystem/demo/Initialize() if(!CONFIG_GET(flag/demos_enabled)) flags |= SS_NO_FIRE - can_fire = FALSE marked_dirty.Cut() marked_new.Cut() marked_turfs.Cut() - return SS_INIT_SUCCESS + return SS_INIT_NO_NEED var/rounder = file("[GLOB.demo_directory]/round_number.txt") fdel(rounder) @@ -164,14 +163,18 @@ SUBSYSTEM_DEF(demo) return SS_INIT_SUCCESS /datum/controller/subsystem/demo/fire() - if(!src.marked_new.len && !src.marked_dirty.len && !src.marked_turfs.len && !src.del_list.len) + var/marked_new_len = length(src.marked_new) + var/marked_dirty_len = length(src.marked_dirty) + var/marked_turfs_len = length(src.marked_turfs) + var/del_list_len = length(del_list) + if(!marked_new_len && !marked_dirty_len && !marked_turfs_len && !del_list_len) return // nothing to do - last_queued = src.marked_new.len + src.marked_dirty.len + src.marked_turfs.len + last_queued = marked_new_len + marked_dirty_len + marked_turfs_len last_completed = 0 write_time() - if(src.del_list.len) + if(del_list_len) var/s = "del [jointext(src.del_list, ",")]\n" // if I don't do it like this I get "incorrect number of macro arguments" because byond is stupid and sucks WRITE_LOG_NO_FORMAT(GLOB.demo_log, s) src.del_list.Cut() @@ -180,11 +183,11 @@ SUBSYSTEM_DEF(demo) var/list/marked_dirty = src.marked_dirty var/list/dirty_updates = list() - while(marked_dirty.len) + while(length(marked_dirty)) last_completed++ - var/atom/movable/M = marked_dirty[marked_dirty.len] + var/atom/movable/M = marked_dirty[length(marked_dirty)] marked_dirty.len-- - if(M.gc_destroyed || !M) + if(QDELETED(M)) continue if(M.loc == M.demo_last_loc) continue @@ -207,7 +210,7 @@ SUBSYSTEM_DEF(demo) if(MC_TICK_CHECK) canceled = TRUE break - if(dirty_updates.len) + if(length(dirty_updates)) var/s = "update [jointext(dirty_updates, ",")]\n" WRITE_LOG_NO_FORMAT(GLOB.demo_log, s) if(canceled) @@ -216,11 +219,11 @@ SUBSYSTEM_DEF(demo) var/list/marked_new = src.marked_new var/list/new_updates = list() - while(marked_new.len) + while(length(marked_new)) last_completed++ - var/atom/movable/M = marked_new[marked_new.len] + var/atom/movable/M = marked_new[length(marked_new)] marked_new.len-- - if(M.gc_destroyed || !M) + if(QDELETED(M)) continue var/loc_string = "null" if(isturf(M.loc)) @@ -232,7 +235,7 @@ SUBSYSTEM_DEF(demo) if(MC_TICK_CHECK) canceled = TRUE break - if(new_updates.len) + if(length(new_updates)) var/s = "new [jointext(new_updates, ",")]\n" WRITE_LOG_NO_FORMAT(GLOB.demo_log, s) if(canceled) @@ -241,9 +244,9 @@ SUBSYSTEM_DEF(demo) var/list/marked_turfs = src.marked_turfs var/list/turf_updates = list() - while(marked_turfs.len) + while(length(marked_turfs)) last_completed++ - var/turf/T = marked_turfs[marked_turfs.len] + var/turf/T = marked_turfs[length(marked_turfs)] marked_turfs.len-- if(T && T.appearance != T.demo_last_appearance) turf_updates += "([T.x],[T.y],[T.z])=[encode_appearance(T.appearance, T.demo_last_appearance)]" @@ -251,7 +254,7 @@ SUBSYSTEM_DEF(demo) if(MC_TICK_CHECK) canceled = TRUE break - if(turf_updates.len) + if(length(turf_updates)) var/s = "turf [jointext(turf_updates, ",")]\n" WRITE_LOG_NO_FORMAT(GLOB.demo_log, s) if(canceled) @@ -420,35 +423,68 @@ SUBSYSTEM_DEF(demo) msg += "}" return ..() -/datum/controller/subsystem/demo/proc/mark_turf(turf/T) +/datum/controller/subsystem/demo/proc/mark_turf(turf/turf) if(!can_fire) return - if(!isturf(T)) + if(isturf(turf)) return - marked_turfs[T] = TRUE + marked_turfs[turf] = TRUE + +/datum/controller/subsystem/demo/proc/mark_multiple_turfs(list/turf/turf_list) + if(!can_fire) + return + if(!islist(turf_list)) + return + for(var/turf in turf_list) + if(!isturf(turf)) + continue + marked_turfs[turf] = TRUE /datum/controller/subsystem/demo/proc/mark_new(atom/movable/M) if(!can_fire) return if(!isobj(M) && !ismob(M)) return - if(M.gc_destroyed) + if(QDELING(M)) return marked_new[M] = TRUE if(marked_dirty[M]) marked_dirty -= M +/datum/controller/subsystem/demo/proc/mark_multiple_new(list/atom/atom_list) + if(!can_fire) + return + for(var/atom/atom as anything in atom_list) + if(!isobj(atom) && !ismob(atom)) + continue + if(QDELING(atom)) + continue + marked_new[atom] = TRUE + if(marked_dirty[atom]) + marked_dirty -= atom + // I can't wait for when TG ports this and they make this a #define macro. /datum/controller/subsystem/demo/proc/mark_dirty(atom/movable/M) if(!can_fire) return if(!isobj(M) && !ismob(M)) return - if(M.gc_destroyed) + if(QDELING(M)) return if(!marked_new[M]) marked_dirty[M] = TRUE +/datum/controller/subsystem/demo/proc/mark_multiple_dirty(list/atom/movable/dirty_list) + if(!can_fire) + return + for(var/atom/movable/dirty as anything in dirty_list) + if(!isobj(dirty) && !ismob(dirty)) + continue + if(QDELING(dirty)) + continue + if(!marked_new[dirty]) + marked_dirty[dirty] = TRUE + /datum/controller/subsystem/demo/proc/mark_destroyed(atom/movable/M) if(!can_fire) return diff --git a/monkestation/code/modules/research/designs/machine_designs.dm b/monkestation/code/modules/research/designs/machine_designs.dm index 91f2b95fe4e5..9dd731010b29 100644 --- a/monkestation/code/modules/research/designs/machine_designs.dm +++ b/monkestation/code/modules/research/designs/machine_designs.dm @@ -80,3 +80,13 @@ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE + +/datum/design/board/composters + name = "Machine Design (NT-Brand Auto Composter Board)" + desc = "The circuit board for a NT-Brand Auto Composter." + id = "composters" + build_path = /obj/item/circuitboard/machine/composters + category = list( + RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_BOTANY + ) + departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/monkestation/code/modules/research/designs/medical_designs.dm b/monkestation/code/modules/research/designs/medical_designs.dm index 7385fe08142b..2173c49b8781 100644 --- a/monkestation/code/modules/research/designs/medical_designs.dm +++ b/monkestation/code/modules/research/designs/medical_designs.dm @@ -34,3 +34,15 @@ name = "Filter Blood Upgrade" surgery = /datum/surgery/blood_filter/femto id = "surgery_filter_upgrade_femto" + +/datum/design/surgical_glove + name = "Surgical Latex Glove" + desc = "Advanced latex gloves that allow the user to operate 25% quicker" + id = "surgical_gloves" + build_path = /obj/item/clothing/gloves/latex/surgical + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = 10000, /datum/material/glass = 2500, /datum/material/silver = 20000, /datum/material/gold = 1500) + category = list( + RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + ) + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/monkestation/code/modules/research/nanites/nanite_cloud_controller.dm b/monkestation/code/modules/research/nanites/nanite_cloud_controller.dm index c2367e0f7fa4..4207dc3af850 100644 --- a/monkestation/code/modules/research/nanites/nanite_cloud_controller.dm +++ b/monkestation/code/modules/research/nanites/nanite_cloud_controller.dm @@ -29,7 +29,7 @@ else ..() - + /obj/machinery/computer/nanite_cloud_controller/AltClick(mob/user) if(disk && !issilicon(user)) to_chat(user, span_notice("You take out [disk] from [src].")) @@ -184,7 +184,7 @@ var/cloud_id = new_backup_id if(!isnull(cloud_id)) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) - cloud_id = clamp(round(cloud_id, 1),1,100) + cloud_id = clamp(round(cloud_id, 1), 1, 100) generate_backup(cloud_id, usr) . = TRUE if("delete_backup") @@ -223,8 +223,8 @@ var/datum/component/nanites/nanites = backup.nanites var/datum/nanite_program/P = nanites.programs[text2num(params["program_id"])] var/datum/nanite_rule/rule = rule_template.make_rule(P) - - investigate_log("[key_name(usr)] added rule [rule.display()] to program [P.name] in cloud #[current_view]", INVESTIGATE_NANITES) + if(rule) + investigate_log("[key_name(usr)] added rule [rule.display()] to program [P.name] in cloud #[current_view]", INVESTIGATE_NANITES) . = TRUE if("remove_rule") var/datum/nanite_cloud_backup/backup = get_backup(current_view) @@ -233,9 +233,9 @@ var/datum/component/nanites/nanites = backup.nanites var/datum/nanite_program/P = nanites.programs[text2num(params["program_id"])] var/datum/nanite_rule/rule = P.rules[text2num(params["rule_id"])] - rule.remove() - - investigate_log("[key_name(usr)] removed rule [rule.display()] from program [P.name] in cloud #[current_view]", INVESTIGATE_NANITES) + if(rule) + investigate_log("[key_name(usr)] removed rule [rule.display()] from program [P.name] in cloud #[current_view]", INVESTIGATE_NANITES) + rule.remove() . = TRUE if("toggle_rule_logic") var/datum/nanite_cloud_backup/backup = get_backup(current_view) diff --git a/monkestation/code/modules/research/nanites/nanite_programs/healing.dm b/monkestation/code/modules/research/nanites/nanite_programs/healing.dm index bfb78f54d0a1..1b6940de0948 100644 --- a/monkestation/code/modules/research/nanites/nanite_programs/healing.dm +++ b/monkestation/code/modules/research/nanites/nanite_programs/healing.dm @@ -203,10 +203,13 @@ trigger_cost = 25 trigger_cooldown = 120 rogue_types = list(/datum/nanite_program/shocking) + COOLDOWN_DECLARE(ghost_notify_cooldown) /datum/nanite_program/defib/on_trigger(comm_message) - host_mob.notify_ghost_cloning("Your heart is being defibrillated by nanites. Re-enter your corpse if you want to be revived!") - addtimer(CALLBACK(src, PROC_REF(zap)), 50) + if(COOLDOWN_FINISHED(src, ghost_notify_cooldown) && check_revivable()) + host_mob.notify_ghost_cloning("Your heart is being defibrillated by nanites. Re-enter your corpse if you want to be revived!") + COOLDOWN_START(src, ghost_notify_cooldown, 1 MINUTES) + addtimer(CALLBACK(src, PROC_REF(zap)), 5 SECONDS) /datum/nanite_program/defib/proc/check_revivable() if(!iscarbon(host_mob)) //nonstandard biology @@ -219,7 +222,7 @@ /datum/nanite_program/defib/proc/zap() var/mob/living/carbon/C = host_mob playsound(C, 'sound/machines/defib_charge.ogg', 50, FALSE) - sleep(30) + sleep(3 SECONDS) playsound(C, 'sound/machines/defib_zap.ogg', 50, FALSE) if(check_revivable()) playsound(C, 'sound/machines/defib_success.ogg', 50, FALSE) diff --git a/monkestation/code/modules/research/nanites/nanite_programs/utility.dm b/monkestation/code/modules/research/nanites/nanite_programs/utility.dm index 901feecec89a..484f7046f508 100644 --- a/monkestation/code/modules/research/nanites/nanite_programs/utility.dm +++ b/monkestation/code/modules/research/nanites/nanite_programs/utility.dm @@ -455,3 +455,4 @@ /datum/action/innate/nanite_button/Activate() program.press() + playsound(owner, SFX_BUTTON_CLICK, vol = 20, vary = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, mixer_channel = CHANNEL_MACHINERY) diff --git a/monkestation/code/modules/security/code/weapons/lawbringer.dm b/monkestation/code/modules/security/code/weapons/lawbringer.dm index d731efdbfea0..68de9574ecb9 100644 --- a/monkestation/code/modules/security/code/weapons/lawbringer.dm +++ b/monkestation/code/modules/security/code/weapons/lawbringer.dm @@ -60,11 +60,10 @@ return FALSE if(!owner_dna)//weird edge cases where speaker with no DNA would be able to communicate with lawbringer return FALSE - if(iscarbon(speaker)) - var/mob/living/carbon/C = speaker - if(!C.dna && !C.dna.unique_enzymes) - return FALSE - if(C.dna.unique_enzymes != owner_dna) + if(isliving(speaker)) + var/mob/living/living_speaker = speaker + var/unique_enzymes = living_speaker.has_dna()?.unique_enzymes + if(!unique_enzymes || unique_enzymes != owner_dna) return FALSE else return FALSE @@ -160,11 +159,11 @@ if(!iscarbon(user)) balloon_alert(user, "invalid organism") return - var/mob/living/carbon/C = user var/voice = null - if(C.dna && C.dna.unique_enzymes) + var/unique_enzymes = user.has_dna()?.unique_enzymes + if(unique_enzymes) if(!owner_dna) - owner_dna = C.dna.unique_enzymes + owner_dna = unique_enzymes balloon_alert(user, "biometric lock engaged") new /obj/item/paper/guides/lawbringer(get_turf(src)) user.visible_message(span_notice("The [src] prints out a sheet of paper from its authenticator")) @@ -179,7 +178,7 @@ playsound(src, voice, 50, FALSE, -2) return - if(C.dna.unique_enzymes == owner_dna) + if(unique_enzymes == owner_dna) if(locked) balloon_alert(user, "firing mode lock disengaged") locked = FALSE @@ -312,15 +311,14 @@ /obj/item/firing_pin/lawbringer/proc/updatepin(mob/living/user) if(!iscarbon(user))//should probably never happen return - var/mob/living/carbon/C = user - owner_dna = C.dna.unique_enzymes + owner_dna = user.has_dna()?.unique_enzymes /obj/item/firing_pin/lawbringer/pin_auth(mob/living/carbon/user) if(!iscarbon(user)) return FALSE - if(user && user.dna && user.dna.unique_enzymes) - if(user.dna.unique_enzymes == owner_dna) - return TRUE + var/unique_enzymes = user.has_dna()?.unique_enzymes + if(unique_enzymes && user.dna.unique_enzymes == owner_dna) + return TRUE return FALSE /obj/item/firing_pin/lawbringer/auth_fail(mob/living/carbon/user) diff --git a/monkestation/code/modules/slimecore/components/emotion_buffer.dm b/monkestation/code/modules/slimecore/components/emotion_buffer.dm index ce715b741706..202b7224116b 100644 --- a/monkestation/code/modules/slimecore/components/emotion_buffer.dm +++ b/monkestation/code/modules/slimecore/components/emotion_buffer.dm @@ -57,7 +57,7 @@ RegisterSignal(parent, COMSIG_EMOTION_HEARD, PROC_REF(store_heard)) RegisterSignal(parent, COMSIG_MOVABLE_HEAR, PROC_REF(hear_speech)) -/datum/component/emotion_buffer/Destroy(force, silent) +/datum/component/emotion_buffer/Destroy(force) . = ..() host = null diff --git a/monkestation/code/modules/slimecore/components/friendship_tracker.dm b/monkestation/code/modules/slimecore/components/friendship_tracker.dm index aa6f8bb35ead..fe3f4f6be659 100644 --- a/monkestation/code/modules/slimecore/components/friendship_tracker.dm +++ b/monkestation/code/modules/slimecore/components/friendship_tracker.dm @@ -17,7 +17,7 @@ src.befriend_level = befriend_level -/datum/component/friendship_container/Destroy(force, silent) +/datum/component/friendship_container/Destroy(force) . = ..() befriended_refs = null weakrefed_friends = null diff --git a/monkestation/code/modules/slimecore/components/latch_feeding.dm b/monkestation/code/modules/slimecore/components/latch_feeding.dm index c08040a2f59c..8481661813c5 100644 --- a/monkestation/code/modules/slimecore/components/latch_feeding.dm +++ b/monkestation/code/modules/slimecore/components/latch_feeding.dm @@ -32,7 +32,7 @@ START_PROCESSING(SSobj, src) -/datum/component/latch_feeding/Destroy(force, silent) +/datum/component/latch_feeding/Destroy(force) REMOVE_TRAIT(parent, TRAIT_FEEDING, LATCH_TRAIT) target = null check_and_replace = null diff --git a/monkestation/code/modules/slimecore/components/liquid_secretion.dm b/monkestation/code/modules/slimecore/components/liquid_secretion.dm index ad3464ba04c5..9fa5a543e0b5 100644 --- a/monkestation/code/modules/slimecore/components/liquid_secretion.dm +++ b/monkestation/code/modules/slimecore/components/liquid_secretion.dm @@ -19,7 +19,7 @@ START_PROCESSING(SSobj, src) -/datum/component/liquid_secretion/Destroy(force, silent) +/datum/component/liquid_secretion/Destroy(force) STOP_PROCESSING(SSobj, src) pre_secrete_callback = null return ..() diff --git a/monkestation/code/modules/slimecore/components/mob_stacker.dm b/monkestation/code/modules/slimecore/components/mob_stacker.dm index 4bc78677349a..7b4da4644f48 100644 --- a/monkestation/code/modules/slimecore/components/mob_stacker.dm +++ b/monkestation/code/modules/slimecore/components/mob_stacker.dm @@ -28,7 +28,7 @@ RegisterSignal(parent, COMSIG_LIVING_SET_BUCKLED, PROC_REF(check_collapse)) RegisterSignal(parent, COMSIG_MOBSTACKER_DESTROY, PROC_REF(destroy_self)) -/datum/component/mob_stacker/Destroy(force, silent) +/datum/component/mob_stacker/Destroy(force) . = ..() UnregisterSignal(main_dude, COMSIG_ATOM_JOIN_STACK) UnregisterSignal(main_dude, COMSIG_LIVING_SET_BUCKLED) diff --git a/monkestation/code/modules/slimecore/components/vac_tagged.dm b/monkestation/code/modules/slimecore/components/vac_tagged.dm index 44db508e3ea0..87e1c5bc13a6 100644 --- a/monkestation/code/modules/slimecore/components/vac_tagged.dm +++ b/monkestation/code/modules/slimecore/components/vac_tagged.dm @@ -8,7 +8,7 @@ creator = WEAKREF(creator_mob) -/datum/component/vac_tagged/Destroy(force, silent) +/datum/component/vac_tagged/Destroy(force) UnregisterSignal(parent, list(COMSIG_MOB_FED_ON, COMSIG_QDELETING)) . = ..() diff --git a/monkestation/code/modules/slimecore/corral/corral_data.dm b/monkestation/code/modules/slimecore/corral/corral_data.dm index 0df5a6585b53..f32e10a0d289 100644 --- a/monkestation/code/modules/slimecore/corral/corral_data.dm +++ b/monkestation/code/modules/slimecore/corral/corral_data.dm @@ -37,7 +37,7 @@ for(var/obj/machinery/corral_corner/corner as anything in corral_corners) RegisterSignal(corner, COMSIG_QDELETING, PROC_REF(start_break)) -/datum/corral_data/Destroy(force, ...) +/datum/corral_data/Destroy(force) QDEL_LIST(corral_connectors) for(var/turf/turf as anything in corral_turfs) if(!QDELETED(turf)) diff --git a/monkestation/code/modules/slimecore/machines/extract_requestor.dm b/monkestation/code/modules/slimecore/machines/extract_requestor.dm index faed4fff0690..09f927c4d29c 100644 --- a/monkestation/code/modules/slimecore/machines/extract_requestor.dm +++ b/monkestation/code/modules/slimecore/machines/extract_requestor.dm @@ -140,7 +140,7 @@ /datum/extract_request_data/proc/on_creation() RegisterSignal(host_card, COMSIG_QDELETING, PROC_REF(end_request_qdeleted)) -/datum/extract_request_data/Destroy(force, ...) +/datum/extract_request_data/Destroy(force) UnregisterSignal(host_card, COMSIG_QDELETING) host_card = null linked_console = null diff --git a/monkestation/code/modules/slimecore/mobs/_base_slime.dm b/monkestation/code/modules/slimecore/mobs/_base_slime.dm index db24777e6b5a..b7794e979d73 100644 --- a/monkestation/code/modules/slimecore/mobs/_base_slime.dm +++ b/monkestation/code/modules/slimecore/mobs/_base_slime.dm @@ -142,12 +142,10 @@ recompile_ai_tree() /mob/living/basic/slime/death(gibbed) - . = ..() - if(buckled) - buckled?.unbuckle_all_mobs() + buckled?.unbuckle_mob(src, force = TRUE) + return ..() /mob/living/basic/slime/Destroy() - . = ..() for(var/datum/slime_trait/trait as anything in slime_traits) remove_trait(trait) UnregisterSignal(src, list( @@ -162,6 +160,7 @@ qdel(mutation) QDEL_NULL(current_color) + return ..() /mob/living/basic/slime/mob_try_pickup(mob/living/user, instant) if(!SEND_SIGNAL(src, COMSIG_FRIENDSHIP_CHECK_LEVEL, user, FRIENDSHIP_FRIEND)) @@ -188,7 +187,7 @@ /mob/living/basic/slime/resolve_right_click_attack(atom/target, list/modifiers) if(GetComponent(/datum/component/latch_feeding)) - unbuckle_all_mobs() + buckled?.unbuckle_mob(src, force = TRUE) return else if(CanReach(target) && !HAS_TRAIT(target, TRAIT_LATCH_FEEDERED)) AddComponent(/datum/component/latch_feeding, target, TOX, 2, 4, FALSE, CALLBACK(src, TYPE_PROC_REF(/mob/living/basic/slime, latch_callback), target)) @@ -469,15 +468,13 @@ /mob/living/basic/slime/Life(seconds_per_tick, times_fired) if(isopenturf(loc)) var/turf/open/my_our_turf = loc - if(my_our_turf.pollution) - my_our_turf.pollution.touch_act(src) + my_our_turf.pollution?.touch_act(src) . = ..() /mob/living/basic/slime/proc/apply_water() - adjustBruteLoss(rand(15,20)) - if(!client) - if(buckled) - unbuckle_mob(buckled, TRUE) + adjustBruteLoss(rand(15, 20)) + if(QDELETED(client)) + buckled?.unbuckle_mob(src, force = TRUE) return /mob/living/basic/slime/proc/latch_callback(mob/living/target) diff --git a/monkestation/code/modules/slimecore/slime_color_mutations/mutations/_base_mutation.dm b/monkestation/code/modules/slimecore/slime_color_mutations/mutations/_base_mutation.dm index 241cb9f7e2bc..13b787971be9 100644 --- a/monkestation/code/modules/slimecore/slime_color_mutations/mutations/_base_mutation.dm +++ b/monkestation/code/modules/slimecore/slime_color_mutations/mutations/_base_mutation.dm @@ -17,7 +17,7 @@ ///the mobs needed to be latch fed in order to mutate - stored in type = amount var/list/latch_needed = list() -/datum/slime_mutation_data/Destroy(force, ...) +/datum/slime_mutation_data/Destroy(force) . = ..() host = null diff --git a/monkestation/code/modules/smithing/anvil/anvil.dm b/monkestation/code/modules/smithing/anvil/anvil.dm index 3bea083c2059..bb3953ac24e9 100644 --- a/monkestation/code/modules/smithing/anvil/anvil.dm +++ b/monkestation/code/modules/smithing/anvil/anvil.dm @@ -37,47 +37,58 @@ /obj/structure/anvil/attack_hand(mob/living/user, list/modifiers) . = ..() - if(!chosen_recipe) - var/pick = show_radial_menu(user, src, recipes, custom_check = FALSE, require_near = TRUE, tooltips = TRUE) - if(!pick) - return - if(!(pick in name_to_type)) - return - chosen_recipe = name_to_type[pick] + if(anchored && !smithing) + if(!chosen_recipe) + var/pick = show_radial_menu(user, src, recipes, custom_check = FALSE, require_near = TRUE, tooltips = TRUE) + if(!pick) + return + if(!(pick in name_to_type)) + return + chosen_recipe = name_to_type[pick] - if(!smithing && working_material && chosen_recipe && working_material.material_stats) - var/density_hardness = 0 - density_hardness = working_material.material_stats.hardness + working_material.material_stats.density + if(working_material && chosen_recipe && working_material.material_stats) + var/density_hardness = 0 + density_hardness = working_material.material_stats.hardness + working_material.material_stats.density - var/difficulty_modifier = density_hardness / 30 + var/difficulty_modifier = density_hardness / 30 - new /datum/anvil_challenge(src, new chosen_recipe, user, difficulty_modifier) - smithing = TRUE + new /datum/anvil_challenge(src, new chosen_recipe, user, difficulty_modifier) + smithing = TRUE /obj/structure/anvil/attack_hand_secondary(mob/user, list/modifiers) - if(chosen_recipe) + if(chosen_recipe && !smithing) chosen_recipe = null return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN . = ..() /obj/structure/anvil/proc/generate_item(quality) - var/obj/item/smithed_part/new_part = chosen_recipe.output - new new_part (get_turf(src), working_material, quality) - QDEL_NULL(working_material) + var/obj/output = new chosen_recipe.output + if(istype(output,/obj/item/smithed_part)) + var/obj/item/smithed_part/new_part = chosen_recipe.output + new new_part (get_turf(src), working_material, quality) + QDEL_NULL(working_material) + else if(istype(output,/obj/item/clothing/smithed_clothes)) + var/obj/item/clothing/smithed_clothes/new_part = chosen_recipe.output + new new_part (get_turf(src), working_material, quality) + QDEL_NULL(working_material) + QDEL_NULL(output) //Thanks, bye /obj/structure/anvil/attackby(obj/item/attacking_item, mob/living/user, params) if((isstack(attacking_item) || istype(attacking_item, /obj/item/merged_material)) && !smithing) if(try_place_item(attacking_item, user)) return + if(attacking_item.tool_behaviour == TOOL_WRENCH && !smithing) + default_unfasten_wrench(user,attacking_item,40) + return return ..() /obj/structure/anvil/proc/try_place_item(obj/item/item, mob/living/user) - if(working_material) + if(working_material && !smithing) working_material.forceMove(get_turf(src)) working_material = null visible_message("[user] replaces the ingot on the anvil.") - if(isstack(item)) + if(isstack(item) && !smithing) var/obj/item/stack/stack = item if(!stack.material_type) working_material = null @@ -89,7 +100,7 @@ var/obj/item/stack/new_stack = stack.split_stack(user, 1) new_stack.forceMove(src) working_material = new_stack - else if(istype(item, /obj/item/merged_material)) + else if(istype(item, /obj/item/merged_material) && !smithing) item.forceMove(src) working_material = item return TRUE diff --git a/monkestation/code/modules/smithing/anvil/recipe/armor_parts.dm b/monkestation/code/modules/smithing/anvil/recipe/armor_parts.dm new file mode 100644 index 000000000000..7f17a09a7d43 --- /dev/null +++ b/monkestation/code/modules/smithing/anvil/recipe/armor_parts.dm @@ -0,0 +1,30 @@ +/datum/anvil_recipe/gloves + name = "Gloves" + difficulty = 5 + total_notes = 60 + output = /obj/item/clothing/smithed_clothes/gloves +/datum/anvil_recipe/suit + name = "Suit" + difficulty = 7 + total_notes = 75 + output = /obj/item/clothing/smithed_clothes/suit +/datum/anvil_recipe/helmet + name = "Helmet" + difficulty = 6 + total_notes = 68 + output = /obj/item/clothing/smithed_clothes/helmet +/datum/anvil_recipe/shoes + name = "Shoes" + difficulty = 4 + total_notes = 55 + output = /obj/item/clothing/smithed_clothes/shoes +/datum/anvil_recipe/pavise + name = "Pavise Shield" + difficulty = 4 + total_notes = 50 + output = /obj/item/smithed_part/weapon_part/shield/pavise +/datum/anvil_recipe/buckler + name = "Buckler Shield" + difficulty = 3 + total_notes = 50 + output = /obj/item/smithed_part/weapon_part/shield/buckler diff --git a/monkestation/code/modules/smithing/anvil/recipe/swords.dm b/monkestation/code/modules/smithing/anvil/recipe/weapon_heads.dm similarity index 71% rename from monkestation/code/modules/smithing/anvil/recipe/swords.dm rename to monkestation/code/modules/smithing/anvil/recipe/weapon_heads.dm index d87c00c60e98..436a84978248 100644 --- a/monkestation/code/modules/smithing/anvil/recipe/swords.dm +++ b/monkestation/code/modules/smithing/anvil/recipe/weapon_heads.dm @@ -27,3 +27,15 @@ difficulty = 2 total_notes = 40 output = /obj/item/smithed_part/weapon_part/pickaxe_head + +/datum/anvil_recipe/spear_blade + name = "Spear Blade" + difficulty = 1 + total_notes = 50 + output = /obj/item/smithed_part/weapon_part/spear_blade + +/datum/anvil_recipe/axe_blade + name = "Axe Blade" + difficulty = 3 + total_notes = 55 + output = /obj/item/smithed_part/weapon_part/axe_blade diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/_base_part.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/_base_part.dm index a14a9e4e02aa..b99c2910ae79 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/_base_part.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/_base_part.dm @@ -10,16 +10,19 @@ var/base_name = "generic item" + var/made_of + var/smithed_quality = 100 /obj/item/smithed_part/Initialize(mapload, obj/item/created_from, quality) . = ..() - smithed_quality = max(quality, 25) + smithed_quality = max(quality, 5) if(!created_from) created_from = new /obj/item/stack/sheet/mineral/gold + made_of = created_from.type if(isstack(created_from) && !created_from.material_stats) var/obj/item/stack/stack = created_from @@ -31,16 +34,29 @@ var/damage_state switch(smithed_quality) - if(0 to 25) + if(0 to 24) damage_state = "damage-4" - if(25 to 50) + desc += " It looks of poor quality... Quality:[smithed_quality]" + if(25 to 49) damage_state = "damage-3" - if(50 to 60) + desc += " It looks slightly under average. Quality:[smithed_quality]" + if(50 to 59) damage_state = "damage-2" - if(60 to 90) + desc += " It looks pretty average quality. Quality:[smithed_quality]" + if(60 to 89) damage_state = "damage-1" - else + desc += " It looks well forged! Quality:[smithed_quality]" + if(90 to 99) damage_state = null + desc += " It looks about as perfect as can be! Quality:[smithed_quality]" + if(100 to 125) + damage_state = null + desc += " It's utterly flawless! Quality:[smithed_quality]" + + if(material_stats.thermal <= 50) + resistance_flags |= FIRE_PROOF + if(material_stats.thermal <= 20) + resistance_flags |= LAVA_PROOF if(damage_state) add_filter("damage_filter", 1, alpha_mask_filter(icon = icon('monkestation/code/modules/smithing/icons/forge_items.dmi', damage_state), flags = MASK_INVERSE)) @@ -48,7 +64,10 @@ /obj/item/smithed_part/update_name(updates) . = ..() - name = "[material_stats.material_name] [base_name]" + if(smithed_quality < 100) + name = "[material_stats.material_name] [base_name]" + else + name = "flawless [material_stats.material_name] [base_name]" /obj/item/smithed_part/weapon_part var/complete = FALSE @@ -62,7 +81,10 @@ /obj/item/smithed_part/weapon_part/update_name(updates) . = ..() if(complete) - name = "[material_stats.material_name] [weapon_name]" + if(smithed_quality < 100) + name = "[material_stats.material_name] [weapon_name]" + else + name = "flawless [material_stats.material_name] [weapon_name]" /obj/item/smithed_part/weapon_part/update_overlays() . = ..() @@ -75,3 +97,23 @@ lefthand_file = left_weapon_inhand righthand_file = right_weapon_inhand update_appearance() + if(material_stats) + for(var/datum/material_trait/trait as anything in material_stats.material_traits) + var/datum/material_trait/newtrait = new trait.type + //Why are we calling this here? Because we modify force and other stats that are normally in init + newtrait.post_parent_init(src) + +/datum/export/smithed_part + unit_name = "smithed good" + k_elasticity = 0 + export_types = list(/obj/item/smithed_part,/obj/item/clothing/smithed_clothes) + cost = 1 + +/datum/export/smithed_part/get_cost(obj/item/smithed_part/O, apply_elastic) + var/obj/item/dummy = new O.made_of + var/datum/export_report/export = export_item_and_contents(dummy,dry_run = TRUE) + var/price = 0 + for(var/x in export.total_amount) + price += export.total_value[x] + QDEL_NULL(dummy) + return round((((CARGO_CRATE_VALUE*0.25) + price) * 2) * (O.smithed_quality/100)) diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/axe_blade.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/axe_blade.dm new file mode 100644 index 000000000000..6933b8aea722 --- /dev/null +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/axe_blade.dm @@ -0,0 +1,22 @@ +/obj/item/smithed_part/weapon_part/axe_blade + icon_state = "axehead" + base_name = "axe blade" + weapon_name = "axe" + + weapon_inhand_icon_state = "axe" + hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' + hilt_icon_state = "axe-hilt" + +/obj/item/smithed_part/weapon_part/axe_blade/finish_weapon() + sharpness = SHARP_EDGED + embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10) + armour_penetration = 30 * (smithed_quality / 100) + + stamina_cost = round(15 * (100 / smithed_quality)) + + tool_behaviour = TOOL_SAW + + force = round(((material_stats.density + material_stats.hardness) / 8.9) * (smithed_quality * 0.01)) + throwforce = force * 1.75 + w_class = WEIGHT_CLASS_SMALL + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/dagger_blade.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/dagger_blade.dm index 3ee1de038d2f..3e9f025d6456 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/dagger_blade.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/dagger_blade.dm @@ -8,14 +8,15 @@ hilt_icon_state = "dagger-hilt" /obj/item/smithed_part/weapon_part/dagger_blade/finish_weapon() - . = ..() sharpness = SHARP_POINTY embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) - armour_penetration = 24 + armour_penetration = 35 * (smithed_quality / 100) + attack_speed = CLICK_CD_FAST_MELEE stamina_cost = round(5 * (100 / smithed_quality)) - throwforce = round(((material_stats.density + material_stats.hardness) / 7) * (smithed_quality * 0.01)) + throwforce = round(((material_stats.density + material_stats.hardness) / 9) * (smithed_quality * 0.01)) force = throwforce * 0.25 w_class = WEIGHT_CLASS_SMALL + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/pickaxe_head.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/pickaxe_head.dm index 0d1fa0c9b985..71c3fc1a4a95 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/pickaxe_head.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/pickaxe_head.dm @@ -1,20 +1,25 @@ /obj/item/smithed_part/weapon_part/pickaxe_head icon_state = "pickaxehead" base_name = "pickaxe head" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' weapon_name = "pickaxe" weapon_inhand_icon_state = "pickaxe" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' - hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' hilt_icon_state = "pickaxe-hilt" /obj/item/smithed_part/weapon_part/pickaxe_head/finish_weapon() - . = ..() tool_behaviour = TOOL_MINING - toolspeed = 1 / round(((material_stats.density + material_stats.hardness) / 10) * (smithed_quality * 0.01)) - force = round(((material_stats.density + material_stats.hardness) / 15) * (smithed_quality * 0.01)) + usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') + attack_verb_continuous = list("hits", "pierces", "slices", "attacks") + attack_verb_simple = list("hit", "pierce", "slice", "attack") + + toolspeed = 1 / max(round(((material_stats.density + material_stats.hardness) / 10) * (smithed_quality * 0.01)),1) + force = round(((material_stats.density + material_stats.hardness) / 20) * (smithed_quality * 0.01)) + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK throwforce = force * 1.5 w_class = WEIGHT_CLASS_NORMAL + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/rapier_blade.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/rapier_blade.dm index 9e01cdd29ab4..190870ed8edb 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/rapier_blade.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/rapier_blade.dm @@ -7,16 +7,16 @@ hilt_icon_state = "rapier-hilt" /obj/item/smithed_part/weapon_part/rapier_blade/finish_weapon() - . = ..() sharpness = SHARP_POINTY wound_bonus = 10 bare_wound_bonus = 25 - armour_penetration = -5 + armour_penetration = 50 * (smithed_quality / 100) AddComponent(/datum/component/multi_hit, icon_state = "stab", height = 2) attack_speed = CLICK_CD_LIGHT_WEAPON stamina_cost = round(20 * (100 / smithed_quality)) - force = round(((material_stats.density + material_stats.hardness) / 11) * (smithed_quality * 0.01)) - throwforce = force * 1.5 + force = round(((material_stats.density + material_stats.hardness) / 9.75) * (smithed_quality * 0.01)) + throwforce = force * 0.9 w_class = WEIGHT_CLASS_NORMAL + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/shields.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/shields.dm new file mode 100644 index 000000000000..30d2404c5a2d --- /dev/null +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/shields.dm @@ -0,0 +1,109 @@ +/obj/item/smithed_part/weapon_part/shield/buckler + icon_state = "buckler" + base_name = "unfinished buckler" + weapon_name = "buckler" + block_sound = 'sound/weapons/block_shield.ogg' + desc = "A simple round shield." + + weapon_inhand_icon_state = "buckler" + hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' + hilt_icon_state = "buckler" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' + worn_icon_state = "buckler_back" + +/obj/item/smithed_part/weapon_part/shield/buckler/finish_weapon() + slot_flags = ITEM_SLOT_BACK + var quality = (smithed_quality/100) + force = round(10 * quality) + throwforce = round(force/1.5) + + max_integrity = round(((material_stats.hardness + material_stats.density)) * quality) + atom_integrity = max_integrity + block_chance = round(((material_stats.hardness + material_stats.density)/6) * quality) + + w_class = WEIGHT_CLASS_NORMAL + + var/datum/armor/temp = new() //Scuffed, but no idea how to better. + set_armor(temp.generate_new_with_modifiers(list( + ACID = min(round((material_stats.density / 1.75) * (smithed_quality/100)), 40), + BOMB = min(round(((material_stats.density + material_stats.hardness)/3.5) * (smithed_quality/100)), 40), + BULLET = min(round(((material_stats.density + material_stats.hardness)/3.5) * (smithed_quality/100)), 40), + ENERGY = min(round((material_stats.refractiveness / 1.75) * (smithed_quality/100)), 40), + FIRE = min(round(((100-material_stats.thermal)/1.75) * (smithed_quality/100)), 40), + LASER = min(round(((material_stats.refractiveness + material_stats.density)/3.5) * (smithed_quality/100)), 40), + MELEE = min(round(((material_stats.density + material_stats.hardness)/2) * (smithed_quality/100)), 40) + ))) + QDEL_NULL(temp) //Thanks now back to the void with you + ..() + +/obj/item/smithed_part/weapon_part/shield/pavise + icon_state = "pavise" + base_name = "unfinished pavise" + weapon_name = "pavise" + block_sound = 'sound/weapons/block_shield.ogg' + desc = "A tall, robust shield." + + weapon_inhand_icon_state = "pavise" + hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' + hilt_icon_state = "pavise" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' + worn_icon_state = "pavise_back" + +/obj/item/smithed_part/weapon_part/shield/pavise/finish_weapon() + slot_flags = ITEM_SLOT_BACK + var quality = (smithed_quality/100) + force = round(10 * quality) + throwforce = round(force/2) + block_chance = round(((material_stats.hardness + material_stats.density)/3) * quality) + + max_integrity = round(((material_stats.hardness + material_stats.density)*1.5) * quality) + atom_integrity = max_integrity + + w_class = WEIGHT_CLASS_BULKY + + var/datum/armor/temp = new() //Scuffed, but no idea how to better. + set_armor(temp.generate_new_with_modifiers(list( + ACID = min(round((material_stats.density / 1.5) * (smithed_quality/100)), 70), + BOMB = min(round(((material_stats.density + material_stats.hardness)/3) * (smithed_quality/100)), 70), + BULLET = min(round(((material_stats.density + material_stats.hardness)/3) * (smithed_quality/100)), 70), + ENERGY = min(round((material_stats.refractiveness / 1.5) * (smithed_quality/100)), 70), + FIRE = min(round(((100-material_stats.thermal)/1.5) * (smithed_quality/100)), 70), + LASER = min(round(((material_stats.refractiveness + material_stats.density)/3) * (smithed_quality/100)), 70), + MELEE = min(round(((material_stats.density + material_stats.hardness)/2) * (smithed_quality/100)), 70) + ))) + QDEL_NULL(temp) //Thanks now back to the void with you + ..() + + +//Common code +/obj/item/smithed_part/weapon_part/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type) + if(attack_type == THROWN_PROJECTILE_ATTACK) + final_block_chance += 30 + if(attack_type == LEAP_ATTACK) + final_block_chance = 100 + . = ..() + if(.) + on_shield_block(owner, hitby, attack_text, damage, attack_type) + +/obj/item/smithed_part/weapon_part/shield/proc/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK) + if (atom_integrity <= damage) + var/turf/owner_turf = get_turf(owner) + owner_turf.visible_message(span_warning("[hitby] destroys [src]!")) + playsound(owner, shield_break_sound, 50) + qdel(src) + return FALSE + take_damage(damage) + return TRUE +/obj/item/smithed_part/weapon_part/shield + var/shield_break_sound = 'sound/effects/bang.ogg' + +/obj/item/smithed_part/weapon_part/shield/examine(mob/user) + . = ..() + var/healthpercent = round((atom_integrity/max_integrity) * 100, 1) + switch(healthpercent) + if(50 to 99) + . += span_info("It looks slightly damaged.") + if(25 to 50) + . += span_info("It appears heavily damaged.") + if(0 to 25) + . += span_warning("It's falling apart!") diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/spear_blade.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/spear_blade.dm new file mode 100644 index 000000000000..ffc711e5b010 --- /dev/null +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/spear_blade.dm @@ -0,0 +1,26 @@ +/obj/item/smithed_part/weapon_part/spear_blade + icon_state = "spearhead" + base_name = "spear blade" + weapon_name = "spear" + + weapon_inhand_icon_state = "spear" + hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' + hilt_icon_state = "spear-hilt" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' + worn_icon_state = "spear_back" + +/obj/item/smithed_part/weapon_part/spear_blade/finish_weapon() + sharpness = SHARP_EDGED + embedding = list("impact_pain_mult" = 2, "remove_pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) + armour_penetration = 30 * (smithed_quality / 100) + reach = 2 + AddComponent(/datum/component/multi_hit, icon_state = "stab", height = 2) + + slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BACK + + stamina_cost = round(25 * (100 / smithed_quality)) + + force = round(((material_stats.density + material_stats.hardness) / 9) * (smithed_quality * 0.01)) + throwforce = force * 1.25 + w_class = WEIGHT_CLASS_BULKY + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/staff_head.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/staff_head.dm index 9c6e0585f7b9..4018616efbd6 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/staff_head.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/staff_head.dm @@ -5,16 +5,22 @@ hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' hilt_icon_state = "staff-hilt" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' + worn_icon_state = "staff_back" /obj/item/smithed_part/weapon_part/staff_head/finish_weapon() - . = ..() damtype = STAMINA reach = 2 AddComponent(/datum/component/multi_hit, icon_state = "swipe", width = 3, continues_travel = TRUE) + block_chance = round(((material_stats.hardness + material_stats.density)/15) * (smithed_quality/100)) + + slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BACK + attack_speed = CLICK_CD_LARGE_WEAPON stamina_cost = round(30 * (100 / smithed_quality)) - force = round(((material_stats.density + material_stats.hardness) / 3) * (smithed_quality * 0.01)) + force = round(((material_stats.density + material_stats.hardness) / 8) * (smithed_quality * 0.01)) throwforce = force * 0.1 // good luck whipping a staff at something w_class = WEIGHT_CLASS_HUGE + ..() diff --git a/monkestation/code/modules/smithing/anvil/smithed_parts/sword_blade.dm b/monkestation/code/modules/smithing/anvil/smithed_parts/sword_blade.dm index 4075b9571c21..2e6bb1eb5cb2 100644 --- a/monkestation/code/modules/smithing/anvil/smithed_parts/sword_blade.dm +++ b/monkestation/code/modules/smithing/anvil/smithed_parts/sword_blade.dm @@ -6,17 +6,21 @@ weapon_inhand_icon_state = "sword" hilt_icon = 'monkestation/code/modules/smithing/icons/forge_items.dmi' hilt_icon_state = "blade-hilt" + worn_icon = 'monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi' + worn_icon_state = "sword_back" /obj/item/smithed_part/weapon_part/sword_blade/finish_weapon() - . = ..() sharpness = SHARP_EDGED wound_bonus = 15 bare_wound_bonus = 25 - armour_penetration = 12 + armour_penetration = 25 * (smithed_quality / 100) + + slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BACK attack_speed = CLICK_CD_BULKY_WEAPON stamina_cost = round(40 * (100 / smithed_quality)) - force = round(((material_stats.density + material_stats.hardness) / 10) * (smithed_quality * 0.01)) + force = round(((material_stats.density + material_stats.hardness) / 9.2) * (smithed_quality * 0.01)) throwforce = force * 0.75 w_class = WEIGHT_CLASS_BULKY + ..() diff --git a/monkestation/code/modules/smithing/assembly_bench/assembly_bench.dm b/monkestation/code/modules/smithing/assembly_bench/assembly_bench.dm index d491bbb18366..46bbe07a411d 100644 --- a/monkestation/code/modules/smithing/assembly_bench/assembly_bench.dm +++ b/monkestation/code/modules/smithing/assembly_bench/assembly_bench.dm @@ -1,6 +1,6 @@ /obj/structure/machine/assembly_bench name = "assembly bench" - desc = "Can be used to assemble smithed parts together." + desc = "Can be used to assemble smithed parts together. Put in a smithed part to start." density = TRUE anchored = TRUE @@ -17,6 +17,17 @@ . = ..() for(var/datum/assembly_recipe/subtype as anything in subtypesof(/datum/assembly_recipe) - /datum/assembly_recipe/smithed_weapon) recipes += new subtype + register_context() + +/obj/structure/machine/assembly_bench/add_context(atom/source, list/context, obj/item/held_item, mob/user) + if(!current_recipe && held_item) + context[SCREENTIP_CONTEXT_LMB] = "Add to select recipe" + else + context[SCREENTIP_CONTEXT_LMB] = "Add to progress recipe" + if(current_recipe) + context[SCREENTIP_CONTEXT_ALT_LMB] = "Clear Recipe." + return CONTEXTUAL_SCREENTIP_SET + /obj/structure/machine/assembly_bench/examine(mob/user) . = ..() @@ -24,7 +35,22 @@ for(var/obj/item/item as anything in current_recipe.needed_items) . += span_notice("[current_recipe.needed_items[item]] [initial(item.name)] needed.") +/obj/structure/machine/assembly_bench/AltClick(mob/user) + if(current_recipe) + for(var/obj/item/stored in stored_items) + stored.forceMove(user.loc) + stored_items -= stored + clear_recipe() + return TRUE + . = ..() + + /obj/structure/machine/assembly_bench/attackby(obj/item/attacking_item, mob/living/user, params) + if(attacking_item.tool_behaviour == TOOL_WRENCH && !current_recipe) + default_unfasten_wrench(user,attacking_item,40) + return + if(!anchored) + return ..() if(!current_recipe) for(var/datum/assembly_recipe/recipe as anything in recipes) if(recipe.item_to_start != attacking_item.type) @@ -67,6 +93,7 @@ return if(do_after(user, current_recipe.craft_time, src)) current_recipe.complete_recipe() + user.mind.adjust_experience(/datum/skill/smithing, 10) //You made a thing! Congrats! /obj/structure/machine/assembly_bench/attack_hand(mob/living/user, list/modifiers) try_complete_recipe(user) @@ -76,6 +103,5 @@ current_recipe.parent = null held_starting_item = null QDEL_NULL(current_recipe) - QDEL_LIST(stored_items) stored_items = list() diff --git a/monkestation/code/modules/smithing/assembly_bench/assembly_recipes/sword.dm b/monkestation/code/modules/smithing/assembly_bench/assembly_recipes/weapons.dm similarity index 55% rename from monkestation/code/modules/smithing/assembly_bench/assembly_recipes/sword.dm rename to monkestation/code/modules/smithing/assembly_bench/assembly_recipes/weapons.dm index b30cff056b0b..9940cd7c8c69 100644 --- a/monkestation/code/modules/smithing/assembly_bench/assembly_recipes/sword.dm +++ b/monkestation/code/modules/smithing/assembly_bench/assembly_recipes/weapons.dm @@ -22,3 +22,23 @@ item_to_start = /obj/item/smithed_part/weapon_part/pickaxe_head needed_items = list(/obj/item/stack/sheet/mineral/wood = 2) craft_time = 3 SECONDS + +/datum/assembly_recipe/smithed_weapon/spear + item_to_start = /obj/item/smithed_part/weapon_part/spear_blade + needed_items = list(/obj/item/stack/sheet/mineral/wood = 2) + craft_time = 3 SECONDS + +/datum/assembly_recipe/smithed_weapon/axe + item_to_start = /obj/item/smithed_part/weapon_part/axe_blade + needed_items = list(/obj/item/stack/sheet/mineral/wood = 1) + craft_time = 2 SECONDS + +/datum/assembly_recipe/smithed_weapon/buckler + item_to_start = /obj/item/smithed_part/weapon_part/shield/buckler + needed_items = list(/obj/item/stack/sheet/mineral/wood = 1) + craft_time = 5 SECONDS + +/datum/assembly_recipe/smithed_weapon/pavise + item_to_start = /obj/item/smithed_part/weapon_part/shield/pavise + needed_items = list(/obj/item/stack/sheet/mineral/wood = 2) + craft_time = 7.5 SECONDS diff --git a/monkestation/code/modules/smithing/icons/boots.dmi b/monkestation/code/modules/smithing/icons/boots.dmi new file mode 100644 index 000000000000..fa6de2ea50a6 Binary files /dev/null and b/monkestation/code/modules/smithing/icons/boots.dmi differ diff --git a/monkestation/code/modules/smithing/icons/cloaks.dmi b/monkestation/code/modules/smithing/icons/cloaks.dmi new file mode 100644 index 000000000000..7a2454fb90b5 Binary files /dev/null and b/monkestation/code/modules/smithing/icons/cloaks.dmi differ diff --git a/monkestation/code/modules/smithing/icons/forge_structures.dmi b/monkestation/code/modules/smithing/icons/forge_structures.dmi index 51d9247c9796..7bb887fcc230 100644 Binary files a/monkestation/code/modules/smithing/icons/forge_structures.dmi and b/monkestation/code/modules/smithing/icons/forge_structures.dmi differ diff --git a/monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi b/monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi index 532834d2336b..711d811624ee 100644 Binary files a/monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi and b/monkestation/code/modules/smithing/icons/forge_weapon_worn.dmi differ diff --git a/monkestation/code/modules/smithing/ipcs/body/base_bodyparts.dm b/monkestation/code/modules/smithing/ipcs/body/base_bodyparts.dm index 1b5085b89a56..dfcf48856c9c 100644 --- a/monkestation/code/modules/smithing/ipcs/body/base_bodyparts.dm +++ b/monkestation/code/modules/smithing/ipcs/body/base_bodyparts.dm @@ -8,6 +8,7 @@ should_draw_greyscale = FALSE biological_state = BIO_ROBOTIC bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + head_flags = HEAD_HAIR | HEAD_LIPS | HEAD_EYECOLOR | HEAD_LIPS body_damage_coeff = 1.1 //IPC's Head can dismember //Monkestation Edit max_damage = 40 //Keep in mind that this value is used in the //Monkestation Edit diff --git a/monkestation/code/modules/smithing/ipcs/species.dm b/monkestation/code/modules/smithing/ipcs/species.dm index 44bc9ade80be..00af82672889 100644 --- a/monkestation/code/modules/smithing/ipcs/species.dm +++ b/monkestation/code/modules/smithing/ipcs/species.dm @@ -22,16 +22,11 @@ TRAIT_LIMBATTACHMENT, TRAIT_LITERATE, TRAIT_REVIVES_BY_HEALING, - TRAIT_NOCRITDAMAGE, // We do our own handling of crit damage. TRAIT_NO_DNA_COPY, ) species_traits = list( NO_DNA_COPY, - EYECOLOR, - LIPS, - HAIR, - NOEYESPRITES, NOTRANSSTING, NOHUSK ) @@ -75,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/ipcs/surgeries/steps.dm b/monkestation/code/modules/smithing/ipcs/surgeries/steps.dm index 8389c9e1a799..ece38e46273d 100644 --- a/monkestation/code/modules/smithing/ipcs/surgeries/steps.dm +++ b/monkestation/code/modules/smithing/ipcs/surgeries/steps.dm @@ -1,6 +1,6 @@ //cut wires /datum/surgery_step/cut_wires - name = "cut wires" + name = "cut wires (wirecutter)" implements = list( TOOL_WIRECUTTER = 100, TOOL_SCALPEL = 75, @@ -25,7 +25,7 @@ //pry off plating /datum/surgery_step/pry_off_plating - name = "pry off plating" + name = "pry off plating (crowbar)" implements = list( TOOL_CROWBAR = 100, TOOL_HEMOSTAT = 10, @@ -47,7 +47,7 @@ //weld plating /datum/surgery_step/weld_plating - name = "weld plating" + name = "weld plating (welder)" implements = list( TOOL_WELDER = 100, ) @@ -69,7 +69,7 @@ //replace wires /datum/surgery_step/replace_wires - name = "replace wires" + name = "replace wires (coil)" implements = list(/obj/item/stack/cable_coil = 100) time = 2.4 SECONDS var/cableamount = 5 @@ -98,7 +98,7 @@ //add plating /datum/surgery_step/add_plating - name = "add plating" + name = "add plating (iron sheets)" implements = list(/obj/item/stack/sheet/iron = 100) time = 2.4 SECONDS var/ironamount = 5 diff --git a/monkestation/code/modules/smithing/items/clothing.dm b/monkestation/code/modules/smithing/items/clothing.dm new file mode 100644 index 000000000000..684b0bd34c65 --- /dev/null +++ b/monkestation/code/modules/smithing/items/clothing.dm @@ -0,0 +1,167 @@ +/obj/item/clothing/smithed_clothes + name = "generic smithed clothes" + desc = "generic smithed clothes" + var/smithed_quality = 100 + var/obj/made_of = null + var/base_name = "generic smithed clothes" + + armor_type = /datum/armor/smithed_dummy //This isnt actually used, its just a dummy + +/datum/armor/smithed_dummy + +/obj/item/clothing/smithed_clothes/Initialize(mapload,obj/item/created_from,quality) + . = ..() + smithed_quality = max(quality, 5) + + if(!created_from) + created_from = new /obj/item/stack/sheet/mineral/gold + made_of = new created_from.type + + if(isstack(created_from) && !created_from.material_stats) + var/obj/item/stack/stack = created_from + create_stats_from_material(stack.material_type) + else + create_stats_from_material_stats(created_from.material_stats) + + name = "[material_stats.material_name] [base_name]" + var/damage_state + switch(smithed_quality) + if(0 to 24) + damage_state = "damage-4" + desc += " It looks of poor quality... Quality:[smithed_quality]" + if(25 to 49) + damage_state = "damage-3" + desc += " It looks slightly under average. Quality:[smithed_quality]" + if(50 to 59) + damage_state = "damage-2" + desc += " It looks pretty average quality. Quality:[smithed_quality]" + if(60 to 89) + damage_state = "damage-1" + desc += " It looks well forged! Quality:[smithed_quality]" + if(90 to 99) + damage_state = null + desc += " It looks about as perfect as can be! Quality:[smithed_quality]" + if(100 to 125) + damage_state = null + desc += " It's utterly flawless! Quality:[smithed_quality]" + + if(damage_state) + add_filter("damage_filter", 1, alpha_mask_filter(icon = icon('monkestation/code/modules/smithing/icons/forge_items.dmi', damage_state), flags = MASK_INVERSE)) + + if(material_stats.thermal <= 50) + resistance_flags |= FIRE_PROOF + if(material_stats.thermal <= 20) + resistance_flags |= LAVA_PROOF + max_integrity = round(200 * (smithed_quality/100)) + repairable_by = made_of.type //This cant go wrong right + if(material_stats.conductivity <= 10) + siemens_coefficient = 0 + + var/datum/armor/temp = new() //Scuffed, but no idea how to better. + set_armor(temp.generate_new_with_modifiers(list( + ACID = min(round((material_stats.density / 1.75) * (smithed_quality/100)),60), + BOMB = min(round(((material_stats.density + material_stats.hardness)/3.5) * (smithed_quality/100)),60), + BULLET = min(round(((material_stats.density + material_stats.hardness)/3.5) * (smithed_quality/100)),60), + ENERGY = min(round((material_stats.refractiveness / 1.75) * (smithed_quality/100)),60), + FIRE = min(round(((100-material_stats.thermal)/1.75) * (smithed_quality/100)),60), + LASER = min(round(((material_stats.refractiveness + material_stats.density)/3.5) * (smithed_quality/100)),60), + MELEE = min(round(((material_stats.density + material_stats.hardness)/1.75) * (smithed_quality/100)),60) + ))) + QDEL_NULL(temp) //Thanks now back to the void with you + + +/obj/item/clothing/smithed_clothes/update_name(updates) + . = ..() + if(smithed_quality < 100) + name = "[material_stats.material_name] [base_name]" + else + name = "flawless [material_stats.material_name] [base_name]" + +/obj/item/clothing/smithed_clothes/gloves + name = "generic smithed gloves" + desc = "Some smithed gloves." + gender = PLURAL + w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/clothing/gloves.dmi' + inhand_icon_state = "greyscale_gloves" + icon_state = "gray" + lefthand_file = 'icons/mob/inhands/clothing/gloves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi' + greyscale_colors = null + greyscale_config_inhand_left = /datum/greyscale_config/gloves_inhand_left + greyscale_config_inhand_right = /datum/greyscale_config/gloves_inhand_right + siemens_coefficient = 0.5 + body_parts_covered = HANDS + slot_flags = ITEM_SLOT_GLOVES + attack_verb_continuous = list("challenges") + attack_verb_simple = list("challenge") + strip_delay = 20 + equip_delay_other = 40 + + base_name = "gloves" + +/obj/item/clothing/smithed_clothes/suit + name = "generic smithed suit" + desc = "A smithed suit." + icon = 'icons/obj/clothing/suits/armor.dmi' + worn_icon = 'icons/mob/clothing/suits/armor.dmi' + icon_state = "cuirass" + allowed = null + body_parts_covered = CHEST + cold_protection = CHEST|GROIN + min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT + heat_protection = CHEST|GROIN + max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT + strip_delay = 60 + equip_delay_other = 40 + resistance_flags = NONE + slot_flags = ITEM_SLOT_OCLOTHING + + allowed = list( + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/tank/jetpack/oxygen/captain, + /obj/item/storage/belt/holster + ) + + base_name = "suit" +/obj/item/clothing/smithed_clothes/helmet + name = "generic smithed helmet" + desc = "A smithed helmet." + icon = 'icons/obj/clothing/head/helmet.dmi' + worn_icon = 'icons/mob/clothing/head/helmet.dmi' + icon_state = "knight_green" + cold_protection = HEAD + min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT + heat_protection = HEAD + max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT + strip_delay = 60 + clothing_flags = SNUG_FIT | PLASMAMAN_HELMET_EXEMPT + flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR + supports_variations_flags = CLOTHING_SNOUTED_VARIATION + slot_flags = ITEM_SLOT_HEAD + + base_name = "helmet" + +/obj/item/clothing/smithed_clothes/shoes + name = "generic smithed shoes" + desc = "Some smithed shoes." + icon = 'monkestation/code/modules/smithing/icons/boots.dmi' + worn_icon = 'monkestation/code/modules/smithing/icons/boots.dmi' + icon_state = "smithed_boots_inhand" + worn_icon_state = "smithed_boots" + inhand_icon_state = "jackboots" + cold_protection = FEET + min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT + heat_protection = FEET + max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT + lefthand_file = 'icons/mob/inhands/clothing/shoes_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/shoes_righthand.dmi' + gender = PLURAL //Carn: for grammarically correct text-parsing + + body_parts_covered = FEET + slot_flags = ITEM_SLOT_FEET + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + + base_name = "shoes" diff --git a/monkestation/code/modules/smithing/machines/electroplater.dm b/monkestation/code/modules/smithing/machines/electroplater.dm index 07cb21f68c7c..09397ae606fb 100644 --- a/monkestation/code/modules/smithing/machines/electroplater.dm +++ b/monkestation/code/modules/smithing/machines/electroplater.dm @@ -1,6 +1,6 @@ /obj/machinery/electroplater name = "arc electroplater" - desc = "An industrial electroplater, using electricity it can coat basically anything in the given materials." + desc = "An industrial electroplater, using electricity it can coat basically anything in the given materials;adding it's traits to the item." icon_state = "plater0" icon = 'goon/icons/matsci.dmi' @@ -9,9 +9,9 @@ density = TRUE idle_power_usage = 10 - active_power_usage = 3000 - resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - circuit = null + active_power_usage = 2000 + resistance_flags = LAVA_PROOF | FIRE_PROOF + circuit = /obj/item/circuitboard/machine/electroplater light_outer_range = 2 light_power = 1.5 @@ -34,6 +34,11 @@ /obj/machinery/electroplater/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() + if(held_item) + if(held_item.tool_behaviour == TOOL_WRENCH && !plating) + context[SCREENTIP_CONTEXT_LMB] = "Toggle Anchored." + if(held_item.tool_behaviour == TOOL_CROWBAR && !plating && !anchored) + context[SCREENTIP_CONTEXT_LMB] = "Deconstruct." if((isstack(held_item) || istype(held_item, /obj/item/merged_material)) && !stored_material) context[SCREENTIP_CONTEXT_LMB] = "Add Material Plate." if(stored_material && held_item) @@ -79,6 +84,16 @@ return return ..() +/obj/machinery/electroplater/attackby_secondary(obj/item/weapon, mob/user, params) + if(weapon.tool_behaviour == TOOL_WRENCH && !plating) + default_unfasten_wrench(user,weapon,40) + return + if(weapon.tool_behaviour == TOOL_CROWBAR && !plating && !anchored) + default_deconstruction_crowbar(weapon,1,FALSE) + return + + return ..() + /obj/machinery/electroplater/proc/try_plate() if(!stored_material || !plating_item) return @@ -110,3 +125,12 @@ plating_item = null plating = FALSE icon_state = "plater0" + +/obj/item/circuitboard/machine/electroplater + name = "electroplater" + req_components = list( + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/capacitor = 4 + ) + build_path = /obj/machinery/electroplater diff --git a/monkestation/code/modules/smithing/machines/material_alloyer.dm b/monkestation/code/modules/smithing/machines/material_alloyer.dm new file mode 100644 index 000000000000..11fac8a6f62b --- /dev/null +++ b/monkestation/code/modules/smithing/machines/material_alloyer.dm @@ -0,0 +1,110 @@ +/obj/machinery/material_alloyer + name = "metal alloyer" + desc = "A small machine that can create an alloy of basically any two materials;blending their stats." + icon = 'monkestation/code/modules/smithing/icons/forge_structures.dmi' + icon_state = "material_alloyer" + bound_width = 32 + bound_height = 32 + anchored = TRUE + max_integrity = 200 + density = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = 10 + active_power_usage = 1500 + resistance_flags = LAVA_PROOF | FIRE_PROOF + circuit = /obj/item/circuitboard/machine/material_alloyer + light_outer_range = 3 + light_power = 1.5 + light_color = LIGHT_COLOR_FIRE + + ///the item in our first slot for merging + var/atom/movable/slot_one_item + ///the item in our second slot for merging + var/atom/movable/slot_two_item + + +/obj/machinery/material_alloyer/Initialize(mapload) + . = ..() + register_context() + +/obj/machinery/material_alloyer/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + if(held_item) + if(held_item.tool_behaviour == TOOL_SCREWDRIVER) + context[SCREENTIP_CONTEXT_RMB] = "Open Maint. Panel" + if(held_item.tool_behaviour == TOOL_CROWBAR && panel_open) + context[SCREENTIP_CONTEXT_RMB] = "Deconstruct." + if((!slot_one_item || !slot_two_item) && (isstack(held_item) || istype(held_item, /obj/item/merged_material))) + context[SCREENTIP_CONTEXT_LMB] = "Add material to alloy." + if(slot_one_item && slot_two_item) + context[SCREENTIP_CONTEXT_ALT_LMB] = "Alloy Materials." + return CONTEXTUAL_SCREENTIP_SET + +/obj/machinery/material_alloyer/attackby(obj/item/attacking_item, mob/living/user, params) + if(isstack(attacking_item)) + var/obj/item/stack/stack = attacking_item + if(!stack.material_type) + return + if(stack.amount > 1) + attacking_item = stack.split_stack(user, 1) + + if(try_add_to_buffer(attacking_item)) + visible_message(span_notice("[user] adds [attacking_item] into the [src]")) + return + if(istype(attacking_item, /obj/item/merged_material)) + if(try_add_to_buffer(attacking_item)) + visible_message(span_notice("[user] adds [attacking_item] into the [src]")) + return + return ..() +/obj/machinery/material_alloyer/attackby_secondary(obj/item/weapon, mob/user, params) + if(weapon.tool_behaviour == TOOL_SCREWDRIVER) + default_deconstruction_screwdriver(user,"material_alloyer_open","material_alloyer",weapon) + return + if(weapon.tool_behaviour == TOOL_CROWBAR) + default_deconstruction_crowbar(weapon) + return + return ..() + +/obj/machinery/material_alloyer/proc/try_add_to_buffer(obj/item/adder) + if(!slot_one_item) + slot_one_item = adder + adder.forceMove(src) + return TRUE + if(!slot_two_item) + slot_two_item = adder + adder.forceMove(src) + return TRUE + return FALSE + +/obj/machinery/material_alloyer/AltClick(mob/user) + if(attempt_material_forge()) + return TRUE + . = ..() + +/obj/machinery/material_alloyer/proc/attempt_material_forge() + if(!slot_one_item || !slot_two_item) + return FALSE + + var/obj/item/merged_material/new_material = new(get_turf(src)) + if(isstack(slot_one_item)) + var/obj/item/stack/stack = slot_one_item + new_material.create_stats_from_material(stack.material_type) + else + new_material.create_stats_from_material_stats(slot_one_item.material_stats) + + new_material.combine_material_stats(slot_two_item) + + new_material.name = "[new_material.material_stats.material_name] Ingot" + + QDEL_NULL(slot_one_item) + QDEL_NULL(slot_two_item) + return TRUE + +/obj/item/circuitboard/machine/material_alloyer + name = "material alloyer" + req_components = list( + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/capacitor = 4 + ) + build_path = /obj/machinery/material_alloyer diff --git a/monkestation/code/modules/smithing/machines/material_analyzer.dm b/monkestation/code/modules/smithing/machines/material_analyzer.dm index 9fd66946cb55..2b20fcb59d79 100644 --- a/monkestation/code/modules/smithing/machines/material_analyzer.dm +++ b/monkestation/code/modules/smithing/machines/material_analyzer.dm @@ -17,7 +17,7 @@ /obj/machinery/material_analyzer name = "material analyzer" - desc = "This machine allows you to analyzer materials." + desc = "This machine allows you to analyze materials to see their traits and properties for smithing." icon_state = "matscannerx" icon = 'goon/icons/matsci.dmi' @@ -26,7 +26,7 @@ density = TRUE idle_power_usage = 10 - active_power_usage = 1000 + active_power_usage = 750 circuit = /obj/item/circuitboard/machine/material_analyzer ///the time we need to analyze a material @@ -40,6 +40,11 @@ /obj/machinery/material_analyzer/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() + if(held_item) + if(held_item.tool_behaviour == TOOL_WRENCH && !analyzing) + context[SCREENTIP_CONTEXT_LMB] = "Toggle Anchored." + if(held_item.tool_behaviour == TOOL_CROWBAR && !analyzing && !anchored) + context[SCREENTIP_CONTEXT_LMB] = "Deconstruct." if(held_item && !analyzing) context[SCREENTIP_CONTEXT_LMB] = "Analyze the [held_item]." return CONTEXTUAL_SCREENTIP_SET @@ -59,6 +64,16 @@ analyzing = FALSE print_material_data(weapon) +/obj/machinery/material_analyzer/attackby_secondary(obj/item/weapon, mob/user, params) + if(weapon.tool_behaviour == TOOL_WRENCH && !analyzing) + default_unfasten_wrench(user,weapon,40) + return + if(weapon.tool_behaviour == TOOL_CROWBAR && !analyzing && !anchored) + default_deconstruction_crowbar(weapon,1,FALSE) + return + return ..() + + /obj/machinery/material_analyzer/proc/print_material_data(obj/item/checker) if(!checker.material_stats) say("ERROR: No Material stats found.") @@ -94,3 +109,12 @@ printed_paper.name = text("[checker] Material Stats") printed_paper.add_raw_text(final_paper_text) printed_paper.update_appearance() + +/obj/item/circuitboard/machine/material_analyzer + name = "material analyzer" + req_components = list( + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/scanning_module = 2 + ) + build_path = /obj/machinery/material_analyzer diff --git a/monkestation/code/modules/smithing/material_changes/_base_mineral.dm b/monkestation/code/modules/smithing/material_changes/_base_mineral.dm index 9dd431c111d8..8a950149cf58 100644 --- a/monkestation/code/modules/smithing/material_changes/_base_mineral.dm +++ b/monkestation/code/modules/smithing/material_changes/_base_mineral.dm @@ -18,7 +18,7 @@ ///our refractiveness var/refractiveness = 0 ///list of material traits to work with - var/list/material_traits = list() + var/list/datum/material_trait/material_traits = list() /obj/item/stack/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt) . = ..() diff --git a/monkestation/code/modules/smithing/material_changes/material_stats.dm b/monkestation/code/modules/smithing/material_changes/material_stats.dm index 01bdd412e4df..a8b1275f8770 100644 --- a/monkestation/code/modules/smithing/material_changes/material_stats.dm +++ b/monkestation/code/modules/smithing/material_changes/material_stats.dm @@ -94,7 +94,7 @@ var/refractiveness = 0 ///list of material traits to work with - var/list/material_traits = list() + var/list/datum/material_trait/material_traits = list() ///our coolass color var/merged_color @@ -113,9 +113,10 @@ src.parent = parent if(parent) RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) + RegisterSignal(parent, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE,PROC_REF(post_parent_init)) START_PROCESSING(SSobj, src) -/datum/material_stats/Destroy(force, ...) +/datum/material_stats/Destroy(force) . = ..() STOP_PROCESSING(SSobj, src) for(var/datum/material_trait/trait as anything in material_traits) @@ -125,6 +126,11 @@ UnregisterSignal(parent, COMSIG_ITEM_ATTACK) parent = null +/datum/material_stats/proc/post_parent_init() + for(var/datum/material_trait/trait as anything in material_traits) + trait.post_parent_init(parent) + UnregisterSignal(parent,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE) + /datum/material_stats/proc/on_attack(datum/source, atom/target, mob/user) for(var/datum/material_trait/trait as anything in material_traits) trait.on_mob_attack(parent, src, target, user) @@ -172,7 +178,7 @@ for(var/datum/material_trait/trait as anything in material_traits) - material_traits[trait]-- + material_traits[trait] -= 1 if(material_traits[trait] <= 0) trait.on_remove(parent) material_traits -= trait diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/_base_trait.dm b/monkestation/code/modules/smithing/material_changes/material_traits/_base_trait.dm index 4db1e0b78f40..0bc6218728e8 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/_base_trait.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/_base_trait.dm @@ -3,11 +3,19 @@ var/desc = "Does generic material things." var/trait_flags = NONE var/reforges = 4 - + var/value_bonus = 0 +///Called when added to an object /datum/material_trait/proc/on_trait_add(atom/movable/parent) - + return +///Called when removed from an object /datum/material_trait/proc/on_remove(atom/movable/parent) - + return +///Called on processing tick /datum/material_trait/proc/on_process(atom/movable/parent, datum/material_stats/host) - + return +///Called when used to attack a living mob /datum/material_trait/proc/on_mob_attack(atom/movable/parent, datum/material_stats/host, mob/living/target, mob/living/attacker) + return +///Called after the atom has been Initialized. Modfiy the finished products here. +/datum/material_trait/proc/post_parent_init(atom/movable/parent) + return diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm b/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm index 10ef9931d7b8..af54ed8907f7 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/magical.dm @@ -2,6 +2,7 @@ name = "Magical" desc = "Makes this item magical." trait_flags = MATERIAL_NO_STACK_ADD + value_bonus = 50 /datum/material_trait/magical/on_trait_add(atom/movable/parent) . = ..() diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/rainbow.dm b/monkestation/code/modules/smithing/material_changes/material_traits/rainbow.dm index 8a7a50ddc98b..98764d6090cb 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/rainbow.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/rainbow.dm @@ -1,6 +1,7 @@ /datum/material_trait/rainbow name = "Rainbow" desc = "Makes the material have a cool RGB effect." + value_bonus = 100 //oh shiny /datum/material_trait/rainbow/on_trait_add(atom/movable/parent) parent.rainbow_effect() diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/shiny.dm b/monkestation/code/modules/smithing/material_changes/material_traits/shiny.dm index cae49df8e891..1c8a9ea1aefc 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/shiny.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/shiny.dm @@ -1,6 +1,7 @@ /datum/material_trait/shiny name = "Shiny" desc = "Makes the material shine" + value_bonus = 25 /datum/material_trait/shiny/on_trait_add(atom/movable/parent) parent.AddComponent(/datum/component/particle_spewer/sparkle) diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/slow_attacks.dm b/monkestation/code/modules/smithing/material_changes/material_traits/slow_attacks.dm index f8e18eb1058e..facc088bb15d 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/slow_attacks.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/slow_attacks.dm @@ -2,16 +2,10 @@ name = "Bulky" desc = "Multiplies the attack delay by 1.5." reforges = 6 + value_bonus = -25 -/datum/material_trait/slow_attacks/on_trait_add(atom/movable/parent) - . = ..() +/datum/material_trait/slow_attacks/post_parent_init(atom/movable/parent) if(isitem(parent)) var/obj/item/item = parent item.attack_speed *= 1.5 item.attack_speed = round(item.attack_speed) - -/datum/material_trait/slow_attacks/on_remove(atom/movable/parent) - if(isitem(parent)) - var/obj/item/item = parent - item.attack_speed /= 1.5 - item.attack_speed = round(item.attack_speed) diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/stamina_draining.dm b/monkestation/code/modules/smithing/material_changes/material_traits/stamina_draining.dm index bcc24c5a7d96..ed979342666b 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/stamina_draining.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/stamina_draining.dm @@ -1,17 +1,15 @@ /datum/material_trait/stamina_draining name = "Cumbersome" - desc = "Multiplies the stamina cost by 1.5 times." + desc = "Multiplies the stamina drain by 1.5 times. Includes damage dealt if it deals Stamina Damage!" reforges = 6 + value_bonus = -10 -/datum/material_trait/stamina_draining/on_trait_add(atom/movable/parent) - . = ..() +/datum/material_trait/stamina_draining/post_parent_init(atom/movable/parent) if(isitem(parent)) var/obj/item/item = parent item.stamina_cost *= 1.5 item.stamina_cost = round(item.stamina_cost) + if(item.damtype == STAMINA) + item.force *= 1.5 + item.force = round(item.force) -/datum/material_trait/stamina_draining/on_remove(atom/movable/parent) - if(isitem(parent)) - var/obj/item/item = parent - item.stamina_cost /= 1.5 - item.stamina_cost = round(item.stamina_cost) diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/stunning.dm b/monkestation/code/modules/smithing/material_changes/material_traits/stunning.dm new file mode 100644 index 000000000000..93262d926e3f --- /dev/null +++ b/monkestation/code/modules/smithing/material_changes/material_traits/stunning.dm @@ -0,0 +1,11 @@ +/datum/material_trait/stunning + name = "Stunning" + desc = "Changes the weapon damage type to stamina." + value_bonus = 50 + +/datum/material_trait/stunning/post_parent_init(atom/movable/parent) + if(isobj(parent)) + var/obj/obj = parent + obj.damtype = STAMINA + obj.force *= 1.75 //People have more stamina than health. + obj.force = round(obj.force) diff --git a/monkestation/code/modules/smithing/material_changes/material_traits/weak_weapon.dm b/monkestation/code/modules/smithing/material_changes/material_traits/weak_weapon.dm index 38ddef99a6c3..d22bfcacbe3c 100644 --- a/monkestation/code/modules/smithing/material_changes/material_traits/weak_weapon.dm +++ b/monkestation/code/modules/smithing/material_changes/material_traits/weak_weapon.dm @@ -1,9 +1,10 @@ /datum/material_trait/weak_weapon name = "Weak Weapon" desc = "Multiplies the weapons force by 0.5 times." + value_bonus = -25 -/datum/material_trait/weak_weapon/on_trait_add(atom/movable/parent) - . = ..() +/datum/material_trait/weak_weapon/post_parent_init(atom/movable/parent) if(isobj(parent)) var/obj/obj = parent obj.force *= 0.5 + obj.force = round(obj.force) diff --git a/monkestation/code/modules/smithing/material_changes/materials.dm b/monkestation/code/modules/smithing/material_changes/materials.dm index 58e8b589bcae..35d8337d563a 100644 --- a/monkestation/code/modules/smithing/material_changes/materials.dm +++ b/monkestation/code/modules/smithing/material_changes/materials.dm @@ -36,7 +36,7 @@ hardness = 70 thermal = 1 liquid_flow = 65 - material_traits = list(/datum/material_trait/honk_blessed) + material_traits = list(/datum/material_trait/honk_blessed, /datum/material_trait/stunning) /datum/material/mythril liquid_flow = 80 @@ -81,6 +81,7 @@ conductivity = 10 density = 50 hardness = 5 + material_traits = list(/datum/material_trait/stunning) /datum/material/biomass hardness = 1 @@ -91,11 +92,11 @@ flammability = 70 density = 30 hardness = 60 + material_traits = list(/datum/material_trait/stunning) /datum/material/adamantine hardness = 100 - density = 10 - material_traits = list(/datum/material_trait/weak_weapon) + density = 40 /datum/material/hot_ice thermal = 100 @@ -153,6 +154,7 @@ hardness = 10 thermal = 100 flammability = 85 + material_traits = list(/datum/material_trait/stunning) /datum/material/bone hardness = 75 @@ -163,6 +165,7 @@ hardness = 25 thermal = 100 flammability = 85 + material_traits = list(/datum/material_trait/stunning) /datum/material/zaukerite thermal = 5 diff --git a/monkestation/code/modules/smithing/minigame/anvil_minigame.dm b/monkestation/code/modules/smithing/minigame/anvil_minigame.dm index 22e4ca8a175c..a64026fda3c5 100644 --- a/monkestation/code/modules/smithing/minigame/anvil_minigame.dm +++ b/monkestation/code/modules/smithing/minigame/anvil_minigame.dm @@ -45,11 +45,11 @@ notes_left = end_product_recipe.total_notes total_notes = end_product_recipe.total_notes - difficulty = round(selected_recipe.difficulty + difficulty_modifier) + difficulty = max(1,round(selected_recipe.difficulty + difficulty_modifier - (user.mind.get_skill_level(/datum/skill/smithing) - 3))) //Better smiths have easier times generate_anvil_beats(TRUE) - if(!user.client || user.incapacitated()) + if(QDELETED(user.client) || user.incapacitated()) return FALSE . = TRUE anvil_hud = new @@ -58,6 +58,15 @@ START_PROCESSING(SSfishing, src) +/datum/anvil_challenge/Destroy(force) + if(anvil_hud) + user?.client?.screen -= anvil_hud + QDEL_NULL(anvil_hud) + user = null + selected_recipe = null + host_anvil = null + return ..() + /datum/anvil_challenge/proc/generate_anvil_beats(init = FALSE) var/list/new_notes = list() @@ -153,12 +162,22 @@ generate_anvil_beats() /datum/anvil_challenge/proc/end_minigame() - success = max(0, round(success - ((100 * (failed_notes / total_notes)) + 1 * (off_time * 2)))) + //Success == quality, takes highest of Smithing level * 5 || 100 minus a number based on how 'accurate' you were plus (smithlevel *5)-15. + //So missing nothing, a level 3 smith will make a qual 100 item. + var smithlevel = user.mind.get_skill_level(/datum/skill/smithing) + success = max(smithlevel * 5, round(success - ((100 * (failed_notes / total_notes)) + 1 * (off_time * 2)) +((smithlevel * 5) - 15))) UnregisterSignal(user.client, COMSIG_CLIENT_CLICK_DIRTY) STOP_PROCESSING(SSfishing, src) anvil_presses = null note_pixels_moved = null + var/obj/item/mat = host_anvil.working_material + if(mat.material_stats) + //gives bonus XP for harder mats, so no cheese with gold or wood. + user.mind.adjust_experience(/datum/skill/smithing,round((total_notes - failed_notes) * 2.5) + round(2 + (mat.material_stats.hardness + mat.material_stats.density)/2.5)) + else + user.mind.adjust_experience(/datum/skill/smithing, round(2.5 * (total_notes - failed_notes))) //Every good Hit = 2 XP anvil_hud.end_minigame() + user.client?.screen -= anvil_hud QDEL_NULL(anvil_hud) host_anvil.smithing = FALSE host_anvil.generate_item(success) diff --git a/monkestation/code/modules/smithing/mining_changes/mineral_datums.dm b/monkestation/code/modules/smithing/mining_changes/mineral_datums.dm index 21b836790296..298937e3b474 100644 --- a/monkestation/code/modules/smithing/mining_changes/mineral_datums.dm +++ b/monkestation/code/modules/smithing/mining_changes/mineral_datums.dm @@ -29,6 +29,16 @@ weight = 1 icon_state = "starstone" +/datum/mineral_sample_datum/stunnium + name = "stunnium" + base_traits = list( + /datum/material_trait/stamina_draining, + /datum/material_trait/shiny, + /datum/material_trait/stunning + ) + weight = 1 + icon_state = "molitz" + /datum/mineral_sample_datum/sploop name = "sploop" icon_state = "fibrilith" diff --git a/monkestation/code/modules/smithing/mining_changes/mineral_sample.dm b/monkestation/code/modules/smithing/mining_changes/mineral_sample.dm index 3cb866c38f67..f702e7dc89f1 100644 --- a/monkestation/code/modules/smithing/mining_changes/mineral_sample.dm +++ b/monkestation/code/modules/smithing/mining_changes/mineral_sample.dm @@ -13,7 +13,7 @@ /obj/item/merged_material/mineral_sample/Initialize(mapload) . = ..() - create_random_mineral_stats(200) + create_random_mineral_stats(125) if(!length(starting_datums)) for(var/datum/mineral_sample_datum/datum as anything in subtypesof(/datum/mineral_sample_datum)) @@ -21,7 +21,7 @@ starting_datums += new_datum starting_datums[new_datum] = new_datum.weight - var/datum/mineral_sample_datum/picked = pick(starting_datums) + var/datum/mineral_sample_datum/picked = pick_weight(starting_datums) if(length(picked.base_traits)) for(var/datum/material_trait/trait as anything in picked.base_traits) material_stats.add_trait(trait) @@ -45,3 +45,19 @@ name_1 = copytext(randomized_name, 1, round((length(randomized_name) * 0.5) + 0.5)) name_2 = copytext(material_type.name, round((length(material_type.name) * 0.5) + 0.5), 0) randomized_name = "[name_1][name_2]" + +/datum/export/mineral_sample + unit_name = "exotic minerals" + k_elasticity = 0 + export_types = list(/obj/item/merged_material) + cost = 1 + +/datum/export/mineral_sample/get_cost(obj/item/merged_material/material, apply_elastic) + var/total_val = 20 + if(material.material_stats) + for(var/datum/material_trait/trait in material.material_stats.material_traits) + total_val += trait.value_bonus + return round(total_val * ((material.material_stats.density + material.material_stats.hardness)/8)) //Nanotransen only cares about the dens/hardness for building new stations. + return total_val + + diff --git a/monkestation/code/modules/smithing/oozelings/body/organs.dm b/monkestation/code/modules/smithing/oozelings/body/organs.dm index b0cc7e1cd869..0f5b242334d5 100644 --- a/monkestation/code/modules/smithing/oozelings/body/organs.dm +++ b/monkestation/code/modules/smithing/oozelings/body/organs.dm @@ -168,13 +168,13 @@ if(target_ling) if(target_ling.oozeling_revives > 0) target_ling.oozeling_revives-- - addtimer(CALLBACK(src, PROC_REF(rebuild_body), null, FALSE), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(rebuild_body), null, FALSE), 30 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_DELETE_ME) if(IS_BLOODSUCKER(brainmob)) var/datum/antagonist/bloodsucker/target_bloodsucker = brainmob.mind.has_antag_datum(/datum/antagonist/bloodsucker) - if(target_bloodsucker.bloodsucker_blood_volume >= target_bloodsucker.max_blood_volume * 0.4) - addtimer(CALLBACK(src, PROC_REF(rebuild_body), null, FALSE), 30 SECONDS) - target_bloodsucker.bloodsucker_blood_volume -= target_bloodsucker.max_blood_volume * 0.15 + if(target_bloodsucker.bloodsucker_blood_volume >= OOZELING_MIN_REVIVE_BLOOD_THRESHOLD) + addtimer(CALLBACK(src, PROC_REF(rebuild_body), null, FALSE), 30 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_DELETE_ME) + target_bloodsucker.bloodsucker_blood_volume -= (OOZELING_MIN_REVIVE_BLOOD_THRESHOLD * 0.5) rebuilt = FALSE victim.transfer_observers_to(src) @@ -226,9 +226,10 @@ item.forceMove(turf) stored_items.Cut() -/obj/item/organ/internal/brain/slime/proc/rebuild_body(mob/user, nugget = TRUE) +/obj/item/organ/internal/brain/slime/proc/rebuild_body(mob/user, nugget = TRUE) as /mob/living/carbon/human + RETURN_TYPE(/mob/living/carbon/human) if(rebuilt) - return + return owner set_organ_damage(-maxHealth) // heals the brain fully if(gps_active) // making sure the gps signal is removed if it's active on revival @@ -239,13 +240,13 @@ brainmob?.mind?.grab_ghost() if(isnull(brainmob)) user?.balloon_alert(user, "This brain is not a viable candidate for repair!") - return TRUE + return null if(isnull(brainmob.stored_dna)) user?.balloon_alert(user, "This brain does not contain any dna!") - return TRUE + return null if(isnull(brainmob.client)) user?.balloon_alert(user, "This brain does not contain a mind!") - return TRUE + return null var/mob/living/carbon/human/new_body = new /mob/living/carbon/human(drop_location()) rebuilt = TRUE @@ -287,3 +288,4 @@ transfer_observers_to(new_body) drop_items_to_ground(new_body.drop_location()) + return new_body diff --git a/monkestation/code/modules/smithing/oozelings/species.dm b/monkestation/code/modules/smithing/oozelings/species.dm index bac2a60dd640..a74e7644b05f 100644 --- a/monkestation/code/modules/smithing/oozelings/species.dm +++ b/monkestation/code/modules/smithing/oozelings/species.dm @@ -9,8 +9,6 @@ species_traits = list( MUTCOLORS, - EYECOLOR, - HAIR,FACEHAIR, ) hair_color = "mutcolor" @@ -107,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) ..() @@ -185,10 +184,12 @@ slime.blood_volume = 0 /datum/species/oozeling/proc/Cannibalize_Body(mob/living/carbon/human/slime) + if(HAS_TRAIT(slime, TRAIT_OOZELING_NO_CANNIBALIZE)) + return var/list/limbs_to_consume = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) - slime.get_missing_limbs() var/obj/item/bodypart/consumed_limb - if(!limbs_to_consume.len) + if(!length(limbs_to_consume)) slime.losebreath++ return if(slime.num_legs) //Legs go before arms diff --git a/monkestation/code/modules/spells/spell_types/pointed/fire_ball.dm b/monkestation/code/modules/spells/spell_types/pointed/fire_ball.dm new file mode 100644 index 000000000000..9f401c5aeff8 --- /dev/null +++ b/monkestation/code/modules/spells/spell_types/pointed/fire_ball.dm @@ -0,0 +1,24 @@ +/datum/action/cooldown/spell/pointed/projectile/fireball/bouncy + name = "Fire Ball" + desc = "This spell fires a ball of fire at a target. Watch out for collateral." + button_icon = 'monkestation/icons/obj/weapons/guns/projectiles.dmi' + button_icon_state = "fire_ball" + + active_msg = "You prepare to cast your fire ball spell!" + deactive_msg = "You extinguish your fire ball... for now." + cooldown_reduction_per_rank = -1 SECONDS //bit too strong otherwise + spell_max_level = 3 + projectile_type = /obj/projectile/magic/fire_ball + +/datum/action/cooldown/spell/pointed/projectile/fireball/bouncy/level_spell(bypass_cap) + . = ..() + projectile_amount++ //become the schoolyard bully + unset_after_click = FALSE + if(spell_level == spell_max_level) + projectiles_per_fire++ + +/datum/action/cooldown/spell/pointed/projectile/fireball/bouncy/ready_projectile(obj/projectile/to_fire, atom/target, mob/user, iteration) + . = ..() + to_fire.ricochets_max += spell_level - 1 + if(iteration > 1) + to_fire.set_angle(dir2angle(user.dir) + rand(-15, 15)) diff --git a/monkestation/code/modules/store/pre_round/_pre_round_store.dm b/monkestation/code/modules/store/pre_round/_pre_round_store.dm index 6508fcbfcb62..30b5b849104c 100644 --- a/monkestation/code/modules/store/pre_round/_pre_round_store.dm +++ b/monkestation/code/modules/store/pre_round/_pre_round_store.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(cached_preround_items) . = ..() ui_interact(user) -/datum/pre_round_store/Destroy(force, ...) +/datum/pre_round_store/Destroy(force) . = ..() bought_item = null diff --git a/monkestation/code/modules/store/store_items/__store.dm b/monkestation/code/modules/store/store_items/__store.dm index 992be44e49fb..073ad2b206c5 100644 --- a/monkestation/code/modules/store/store_items/__store.dm +++ b/monkestation/code/modules/store/store_items/__store.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(all_store_datums) /// Our preview sprite. var/icon/dummysprite -/datum/store_manager/Destroy(force, ...) +/datum/store_manager/Destroy(force) owner = null QDEL_NULL(menu) QDEL_NULL(custom_loadout) diff --git a/monkestation/code/modules/store/store_items/toys.dm b/monkestation/code/modules/store/store_items/toys.dm index 138d4ccc48a6..735ff3ef8a6e 100644 --- a/monkestation/code/modules/store/store_items/toys.dm +++ b/monkestation/code/modules/store/store_items/toys.dm @@ -217,3 +217,9 @@ GLOBAL_LIST_INIT(store_toys, generate_store_items(/datum/store_item/toys)) name = "Chef-o-Mancer Plush" item_path = /obj/item/toy/plush/chefomancer item_cost = 10000 + +/datum/store_item/toys/durrcell + name = "Durrcell Plush" + store_desc = "''Behold, Man''" + item_path = /obj/item/toy/plush/durrcell + item_cost = 6969 diff --git a/monkestation/code/modules/storytellers/converted_events/_base_event.dm b/monkestation/code/modules/storytellers/converted_events/_base_event.dm index 78be9159e94d..84ae021d7840 100644 --- a/monkestation/code/modules/storytellers/converted_events/_base_event.dm +++ b/monkestation/code/modules/storytellers/converted_events/_base_event.dm @@ -252,8 +252,10 @@ role = antag_flag, poll_time = 20 SECONDS, group = list(picked_mob), - pic_source = antag_datum, + alert_pic = antag_datum, role_name_text = lowertext(cast_control.name), + chat_text_border_icon = antag_datum, + show_candidate_amount = FALSE, ) else if(!length(weighted_candidates)) @@ -287,7 +289,15 @@ if(!event_type) return var/datum/round_event_control/triggered_event = locate(event_type) in SSgamemode.control - addtimer(CALLBACK(triggered_event, TYPE_PROC_REF(/datum/round_event_control, run_event), FALSE, null, FALSE, "storyteller"), 1 SECONDS) // wait a second to avoid any potential omnitraitor bs + //wait a second to avoid any potential omnitraitor bs + addtimer(CALLBACK(triggered_event, TYPE_PROC_REF(/datum/round_event_control, run_event), FALSE, null, FALSE, "storyteller"), 1 SECONDS) + +/datum/round_event/antagonist/solo/start() + for(var/datum/mind/antag_mind as anything in setup_minds) + add_datum_to_mind(antag_mind, antag_mind.current) + +/datum/round_event/antagonist/solo/proc/add_datum_to_mind(datum/mind/antag_mind) + antag_mind.add_antag_datum(antag_datum) /datum/round_event/antagonist/solo/proc/spawn_extra_events() if(!LAZYLEN(extra_spawned_events)) @@ -295,6 +305,24 @@ var/datum/round_event_control/event = pick_weight(extra_spawned_events) event?.run_event(random = FALSE, event_cause = "storyteller") +/datum/round_event/antagonist/solo/proc/create_human_mob_copy(turf/create_at, mob/living/carbon/human/old_mob, qdel_old_mob = TRUE) + if(!old_mob?.client) + return + + var/mob/living/carbon/human/new_character = new(create_at) + if(!create_at) + SSjob.SendToLateJoin(new_character) + + old_mob.client.prefs.safe_transfer_prefs_to(new_character) + new_character.dna.update_dna_identity() + old_mob.mind.transfer_to(new_character) + if(qdel_old_mob) + qdel(old_mob) + return new_character + +/datum/round_event/antagonist/solo/ghost/start() + for(var/datum/mind/antag_mind as anything in setup_minds) + add_datum_to_mind(antag_mind) /datum/round_event/antagonist/solo/ghost/setup() var/datum/round_event_control/antagonist/solo/cast_control = control @@ -319,8 +347,9 @@ role = antag_flag, poll_time = 20 SECONDS, group = candidates, - pic_source = antag_datum, + alert_pic = antag_datum, role_name_text = lowertext(cast_control.name), + chat_text_border_icon = antag_datum, ) var/list/weighted_candidates = return_antag_rep_weight(candidates) @@ -343,16 +372,3 @@ new_human.mind.restricted_roles = restricted_roles setup_minds += new_human.mind setup = TRUE - - -/datum/round_event/antagonist/solo/start() - for(var/datum/mind/antag_mind as anything in setup_minds) - add_datum_to_mind(antag_mind, antag_mind.current) - -/datum/round_event/antagonist/solo/proc/add_datum_to_mind(datum/mind/antag_mind) - antag_mind.add_antag_datum(antag_datum) - -/datum/round_event/antagonist/solo/ghost/start() - for(var/datum/mind/antag_mind as anything in setup_minds) - add_datum_to_mind(antag_mind) - diff --git a/monkestation/code/modules/storytellers/converted_events/event_overrides.dm b/monkestation/code/modules/storytellers/converted_events/event_overrides.dm index fdc4ed53d5e4..22b582cf127b 100644 --- a/monkestation/code/modules/storytellers/converted_events/event_overrides.dm +++ b/monkestation/code/modules/storytellers/converted_events/event_overrides.dm @@ -6,7 +6,7 @@ /datum/round_event_control/anomaly track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_MAGICAL) - shared_occurence_type = SHARED_ANOMALIES + event_group = /datum/event_group/anomalies /datum/round_event_control/alien_infestation track = EVENT_TRACK_ROLESET @@ -29,21 +29,21 @@ /datum/round_event_control/brand_intelligence track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/bsod /datum/round_event_control/bureaucratic_error track = EVENT_TRACK_MAJOR // if you've ever dealt with 10 mimes you understand why. tags = list(TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/camera_failure track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL, TAG_SPOOKY) - shared_occurence_type = SHARED_BSOD /datum/round_event_control/carp_migration track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_SPACE, TAG_EXTERNAL, TAG_ALIEN) + event_group = /datum/event_group/guests //THIS IS THE METEOR EVENT, IT NEEDS TO BE A METEOR, DO NOT SPAWN THIS ON PLANETARY MAPS(the spawn works fine on planets, the actual issue is the ling passes out due to CO2) /datum/round_event_control/changeling @@ -55,7 +55,7 @@ max_occurrences = 2 track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL, TAG_SPOOKY) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/comms /datum/round_event_control/disease_outbreak track = EVENT_TRACK_MAJOR @@ -64,7 +64,7 @@ /datum/round_event_control/electrical_storm track = EVENT_TRACK_MUNDANE tags = list(TAG_SPOOKY) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/fake_virus track = EVENT_TRACK_MUNDANE @@ -73,7 +73,7 @@ /datum/round_event_control/falsealarm track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/fugitives track = EVENT_TRACK_MAJOR @@ -82,17 +82,17 @@ /datum/round_event_control/gravity_generator_blackout track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL, TAG_SPACE) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/bsod /datum/round_event_control/grey_tide track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/grid_check track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL, TAG_SPOOKY) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/bsod /datum/round_event_control/heart_attack track = EVENT_TRACK_MODERATE @@ -101,12 +101,12 @@ /datum/round_event_control/immovable_rod track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_EXTERNAL, TAG_MAGICAL) - shared_occurence_type = SHARED_METEORS + event_group = /datum/event_group/meteors /datum/round_event_control/ion_storm track = EVENT_TRACK_MODERATE tags = list(TAG_TARGETED, TAG_ALIEN) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/bsod /datum/round_event_control/mass_hallucination track = EVENT_TRACK_MUNDANE @@ -115,11 +115,12 @@ /datum/round_event_control/meteor_wave track = EVENT_TRACK_MAJOR tags = list(TAG_COMMUNAL, TAG_SPACE, TAG_DESTRUCTIVE, TAG_EXTERNAL) - shared_occurence_type = SHARED_METEORS + event_group = /datum/event_group/meteors /datum/round_event_control/mice_migration track = EVENT_TRACK_MUNDANE tags = list(TAG_DESTRUCTIVE, TAG_ALIEN) //not really alien but rat lords kind of are + event_group = /datum/event_group/guests /datum/round_event_control/morph track = EVENT_TRACK_MAJOR @@ -140,12 +141,13 @@ /datum/round_event_control/portal_storm_syndicate track = EVENT_TRACK_MAJOR tags = list(TAG_COMBAT, TAG_EXTERNAL) + event_group = /datum/event_group/guests /datum/round_event_control/processor_overload max_occurrences = 2 track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/comms /datum/round_event_control/radiation_leak track = EVENT_TRACK_MODERATE @@ -163,10 +165,12 @@ /datum/round_event_control/sandstorm track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_EXTERNAL) + event_group = /datum/event_group/debris /datum/round_event_control/scrubber_clog track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL, TAG_ALIEN, TAG_MAGICAL) + event_group = /datum/event_group/guests /datum/round_event_control/scrubber_clog/critical track = EVENT_TRACK_MAJOR @@ -175,6 +179,7 @@ /datum/round_event_control/scrubber_overflow track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL) + event_group = /datum/event_group/scrubber_overflow /datum/round_event_control/sentience track = EVENT_TRACK_MUNDANE @@ -201,7 +206,6 @@ /datum/round_event_control/space_dust track = EVENT_TRACK_MUNDANE tags = list(TAG_DESTRUCTIVE, TAG_SPACE, TAG_EXTERNAL) - shared_occurence_type = SHARED_METEORS /datum/round_event_control/space_dragon track = EVENT_TRACK_ROLESET @@ -217,6 +221,7 @@ track = EVENT_TRACK_MAJOR tags = list(TAG_COMBAT, TAG_DESTRUCTIVE, TAG_ALIEN) checks_antag_cap = TRUE + event_group = /datum/event_group/guests /datum/round_event_control/spider_infestation track = EVENT_TRACK_ROLESET @@ -230,23 +235,24 @@ /datum/round_event_control/stray_meteor track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_SPACE, TAG_EXTERNAL) - shared_occurence_type = SHARED_METEORS + event_group = /datum/event_group/debris /datum/round_event_control/supermatter_surge track = EVENT_TRACK_MODERATE tags = list(TAG_DESTRUCTIVE, TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/tram_malfunction track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL) - shared_occurence_type = SHARED_BSOD + event_group = /datum/event_group/error /datum/round_event_control/wisdomcow track = EVENT_TRACK_MUNDANE tags = list(TAG_COMMUNAL, TAG_POSITIVE, TAG_MAGICAL) + event_group = /datum/event_group/guests /datum/round_event_control/wormholes track = EVENT_TRACK_MODERATE tags = list(TAG_COMMUNAL, TAG_MAGICAL) - shared_occurence_type = SHARED_ANOMALIES + event_group = /datum/event_group/anomalies 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..2843b335d454 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, @@ -30,12 +31,11 @@ required_enemies = 5 base_antags = 4 maximum_antags = 4 - // I give up, just there should be enough heads with 35 players... - min_players = 35 + min_players = 45 roundstart = TRUE earliest_start = 0 SECONDS weight = 4 - max_occurrences = 0 + max_occurrences = 1 /datum/round_event/antagonist/solo/clockcult end_when = 60000 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..b51cb8b8ae27 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, @@ -64,6 +65,7 @@ for(var/obj/item/item as anything in items) qdel(item) + create_human_mob_copy(get_turf(current_mob), current_mob) antag_mind.set_assigned_role(SSjob.GetJobType(/datum/job/clown_operative)) antag_mind.special_role = ROLE_CLOWN_OPERATIVE @@ -74,10 +76,11 @@ if(!set_leader) set_leader = TRUE var/datum/antagonist/nukeop/leader/leader_antag_datum = new() + var/mob/living/carbon/human/leader_mob = most_experienced.current + leader_mob = create_human_mob_copy(get_turf(leader_mob), leader_mob) nuke_team = leader_antag_datum.nuke_team most_experienced.add_antag_datum(leader_antag_datum) - var/mob/living/carbon/human/leader = most_experienced.current - leader.equip_species_outfit(/datum/outfit/syndicate/clownop/leader) + leader_mob.equip_species_outfit(/datum/outfit/syndicate/clownop/leader) if(antag_mind == most_experienced) return 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/ghosts/paradox_clone.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/paradox_clone.dm index dc13c8d8b8fc..8a1a3223575a 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/paradox_clone.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/paradox_clone.dm @@ -46,8 +46,9 @@ "Would you like to be a paradox clone?", check_jobban = ROLE_PARADOX_CLONE, poll_time = 20 SECONDS, - pic_source = /datum/antagonist/paradox_clone, + alert_pic = /datum/antagonist/paradox_clone, role_name_text = "paradox clone", + chat_text_border_icon = /datum/antagonist/paradox_clone, ) var/list/weighted_candidates = return_antag_rep_weight(candidates) 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..f95ffd7c64ae 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, @@ -57,11 +58,9 @@ for(var/obj/item/item as anything in items) qdel(item) + create_human_mob_copy(get_turf(current_mob), current_mob) if(!most_experienced) - most_experienced = get_most_experienced(setup_minds, required_role) - - if(!most_experienced) - most_experienced = antag_mind + most_experienced = get_most_experienced(setup_minds, required_role) || antag_mind if(!set_leader) set_leader = TRUE @@ -72,6 +71,7 @@ leader_mob.unequip_everything() for(var/obj/item/item as anything in leader_items) qdel(item) + leader_mob = create_human_mob_copy(get_turf(leader_mob), leader_mob) most_experienced.set_assigned_role(SSjob.GetJobType(/datum/job/nuclear_operative)) most_experienced.special_role = ROLE_NUCLEAR_OPERATIVE var/datum/antagonist/nukeop/leader/leader_antag_datum = most_experienced.add_antag_datum(/datum/antagonist/nukeop/leader) 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/storytellers/event_groups/_event_group.dm b/monkestation/code/modules/storytellers/event_groups/_event_group.dm new file mode 100644 index 000000000000..7872629f4278 --- /dev/null +++ b/monkestation/code/modules/storytellers/event_groups/_event_group.dm @@ -0,0 +1,66 @@ +/// An associative list of singleton event groups, in the format of [type] = instance. +GLOBAL_LIST_INIT_TYPED(event_groups, /datum/event_group, initialize_event_groups()) + +/datum/event_group + /// The name of the event group. + var/name + /// If set, this will limit the amount of times events in this group can run. + var/max_occurrences + /// If set, whenever an event in this group runs, no other events in this group + /// will be able to run for the specified amount of time. + /// Can be either a number for a static cooldown, or a list containing 2 numbers, + /// for a random cooldown between the given numbers, which will bias towards the upper bound + /// the more the event group has occured. + var/cooldown_time + /// The amount of time events in this group have ran. + VAR_FINAL/occurrences = 0 + /// If [cooldown_time] is set, this will be set to the minimum world.time where the next event in this group can run. + COOLDOWN_DECLARE(event_cooldown) + +/datum/event_group/Destroy(force) + if(!force && GLOB.event_groups[type] == src) + stack_trace("Something is trying to destroy the event group ([type]), which is a singleton! This is super duper bad!") + return QDEL_HINT_LETMELIVE + return ..() + +/datum/event_group/proc/get_cooldown_time() as num + if(isnum(cooldown_time)) + return cooldown_time + var/min_cooldown = cooldown_time[1] + var/max_cooldown = cooldown_time[2] + + if (max_occurrences) + var/occurrence_ratio = min(1, occurrences / max_occurrences) + return min_cooldown + (max_cooldown - min_cooldown) * occurrence_ratio + else + // If max_occurrences is not set, use a simple exponential increase + return min_cooldown + (max_cooldown - min_cooldown) * (occurrences / (occurrences + 1)) + +/datum/event_group/proc/can_run() as num + . = TRUE + if(cooldown_time && !COOLDOWN_FINISHED(src, event_cooldown)) + return FALSE + if(max_occurrences && occurrences >= max_occurrences) + return FALSE + +/datum/event_group/proc/on_run(datum/round_event_control/running_event) + if(cooldown_time) + var/cooldown = get_cooldown_time() + COOLDOWN_START(src, event_cooldown, cooldown) + for(var/datum/scheduled_event/scheduled_event in SSgamemode.scheduled_events) + if(scheduled_event.event == running_event || scheduled_event.event?.event_group != type || !scheduled_event.start_time || (scheduled_event.start_time > src.event_cooldown) || (scheduled_event.start_time <= world.time)) + continue + var/old_start_time = scheduled_event.start_time + scheduled_event.start_time += cooldown + message_admins("Scheduled event [scheduled_event.event.name] start time pushed back by [DisplayTimeText(cooldown)] ([DisplayTimeText(COOLDOWN_TIMELEFT(scheduled_event, start_time))] from now) due to event group [name] running.") + log_storyteller("Scheduled event [scheduled_event.event.name] start time pushed back by [DisplayTimeText(cooldown)] ([old_start_time] -> [scheduled_event.start_time]) due to event group [name] running.", list("group" = "[name]", "cooldown" = cooldown)) + occurrences++ + SSblackbox.record_feedback("tally", "event_group_ran", 1, "[name]") + +/proc/initialize_event_groups() as /list + RETURN_TYPE(/list) + . = list() + for(var/datum/event_group/event_group as anything in subtypesof(/datum/event_group)) + if(!event_group::name) + continue + .[event_group] = new event_group diff --git a/monkestation/code/modules/storytellers/event_groups/groups.dm b/monkestation/code/modules/storytellers/event_groups/groups.dm new file mode 100644 index 000000000000..a6952f8e0e0e --- /dev/null +++ b/monkestation/code/modules/storytellers/event_groups/groups.dm @@ -0,0 +1,44 @@ +/datum/event_group/anomalies + name = "Anomalies" + cooldown_time = list(10 MINUTES, 25 MINUTES) + +/datum/event_group/comms + name = "Communications" + cooldown_time = list(15 MINUTES, 45 MINUTES) + max_occurrences = 3 + +/// Represents small-scale technical difficulties - might annoy some people, but not everyone will notice or be affected, +/// If the event directly affects the entire crew, use [/datum/event_group/bsod]. +/// If the main effect involves telecommunications, use [/datum/event_group/comms]. +/datum/event_group/error + name = "Technical Difficulties (small scale)" + cooldown_time = list(2.5 MINUTES, 7.5 MINUTES) + +/// Represents large-scale technical difficulties - stuff that affects the whole crew. +/// If the main effect involves telecommunications, use [/datum/event_group/comms]. +/datum/event_group/bsod + name = "Technical Difficulties (large scale)" + cooldown_time = list(15 MINUTES, 25 MINUTES) + max_occurrences = 5 + +/datum/event_group/debris + name = "Space Debris" + cooldown_time = list(2 MINUTES, 10 MINUTES) + +/datum/event_group/meteors + name = "Meteors" + cooldown_time = 20 MINUTES + max_occurrences = 3 + +// needs a better name - this is basically for events focused around spawning some sort of NPCs, +// i.e vines, wisdom cow, carp, etc. +/datum/event_group/guests + name = "Guests" + cooldown_time = list(7.5 MINUTES, 20 MINUTES) + +// These event groups are somewhat specific to a single event, +// but we're using event groups to share cooldowns/occurrences between SSevents and storytellers +/datum/event_group/scrubber_overflow + name = "Scrubber Overflows" + cooldown_time = list(25 MINUTES, 45 MINUTES) + max_occurrences = 2 diff --git a/monkestation/code/modules/storytellers/gamemode_subsystem.dm b/monkestation/code/modules/storytellers/gamemode_subsystem.dm index 2d1f8719509f..561149220487 100644 --- a/monkestation/code/modules/storytellers/gamemode_subsystem.dm +++ b/monkestation/code/modules/storytellers/gamemode_subsystem.dm @@ -189,6 +189,9 @@ SUBSYSTEM_DEF(gamemode) event_pools[event.track] += event //Add it to the categorized event pools load_roundstart_data() + if(CONFIG_GET(flag/disable_storyteller)) // we're just gonna disable firing but still initialize, so we don't have any weird runtimes + flags |= SS_NO_FIRE + return SS_INIT_NO_NEED return SS_INIT_SUCCESS @@ -262,8 +265,7 @@ SUBSYSTEM_DEF(gamemode) continue // I split these checks up to make the code more readable ~Lucy var/is_on_station = is_station_level(player.z) - var/is_late_arrival = HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(get_area(player), /area/shuttle/arrival) - if(!is_on_station && !is_late_arrival) + if(!is_on_station && !is_late_arrival(player)) continue candidate_candidates += player diff --git a/monkestation/code/modules/surgery/bodyparts/arachnid_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/arachnid_bodyparts.dm index 92f15fcadb91..6feabe23fc6d 100644 --- a/monkestation/code/modules/surgery/bodyparts/arachnid_bodyparts.dm +++ b/monkestation/code/modules/surgery/bodyparts/arachnid_bodyparts.dm @@ -2,6 +2,7 @@ icon_greyscale = 'monkestation/icons/mob/species/arachnid/bodyparts.dmi' limb_id = SPECIES_ARACHNIDS is_dimorphic = FALSE + head_flags = HEAD_EYESPRITES | HEAD_EYEHOLES | HEAD_DEBRAIN | HEAD_EYECOLOR /obj/item/bodypart/chest/arachnid icon_greyscale = 'monkestation/icons/mob/species/arachnid/bodyparts.dmi' diff --git a/monkestation/code/modules/surgery/bodyparts/clockwork_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/clockwork_bodyparts.dm index 3c48e54f763f..7c3e0061c5f8 100644 --- a/monkestation/code/modules/surgery/bodyparts/clockwork_bodyparts.dm +++ b/monkestation/code/modules/surgery/bodyparts/clockwork_bodyparts.dm @@ -88,7 +88,7 @@ burn_modifier = 0.95 damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT) disabling_threshold_percentage = 1 - + head_flags = NONE /obj/item/bodypart/chest/robot/clockwork name = "clockwork torso" diff --git a/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm index 85db21d7e072..e815032fcbfa 100644 --- a/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm +++ b/monkestation/code/modules/surgery/bodyparts/ethereal_bodyparts.dm @@ -1,6 +1,7 @@ /obj/item/bodypart/head/ethereal icon_greyscale ='monkestation/icons/mob/species/ethereal/bodyparts.dmi' is_dimorphic = TRUE + head_flags = HEAD_HAIR | HEAD_FACIAL_HAIR | HEAD_EYESPRITES | HEAD_EYEHOLES | HEAD_DEBRAIN | HEAD_EYECOLOR /obj/item/bodypart/chest/ethereal icon_greyscale = 'monkestation/icons/mob/species/ethereal/bodyparts.dmi' diff --git a/monkestation/code/modules/surgery/bodyparts/floran_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/floran_bodyparts.dm index e7751c56c7ca..353882d35acb 100644 --- a/monkestation/code/modules/surgery/bodyparts/floran_bodyparts.dm +++ b/monkestation/code/modules/surgery/bodyparts/floran_bodyparts.dm @@ -2,6 +2,7 @@ icon_greyscale = 'monkestation/icons/mob/species/floran/bodyparts.dmi' limb_id = SPECIES_FLORAN is_dimorphic = FALSE + head_flags = HEAD_EYESPRITES | HEAD_EYEHOLES | HEAD_DEBRAIN /obj/item/bodypart/chest/floran icon_greyscale = 'monkestation/icons/mob/species/floran/bodyparts.dmi' diff --git a/monkestation/code/modules/surgery/bodyparts/simian_bodyparts.dm b/monkestation/code/modules/surgery/bodyparts/simian_bodyparts.dm index 522324f44f22..a4f869adb794 100644 --- a/monkestation/code/modules/surgery/bodyparts/simian_bodyparts.dm +++ b/monkestation/code/modules/surgery/bodyparts/simian_bodyparts.dm @@ -5,7 +5,7 @@ limb_id = SPECIES_SIMIAN is_dimorphic = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_CUSTOM - + head_flags = HEAD_EYESPRITES | HEAD_EYEHOLES | HEAD_DEBRAIN | HEAD_EYECOLOR dmg_overlay_type = "monkey" /obj/item/bodypart/chest/simian diff --git a/monkestation/code/modules/surgery/nif_debonding.dm b/monkestation/code/modules/surgery/nif_debonding.dm new file mode 100644 index 000000000000..af50abbda4fb --- /dev/null +++ b/monkestation/code/modules/surgery/nif_debonding.dm @@ -0,0 +1,96 @@ +/datum/surgery/nif_debonding + name = "NIF debonding" + desc = "Permanently removes a bonded NIF from the patient. Requires the patient to mentally prepare for debonding." + possible_locs = list(BODY_ZONE_HEAD) + steps = list( + /datum/surgery_step/incise, + /datum/surgery_step/retract_skin, + /datum/surgery_step/saw, + /datum/surgery_step/clamp_bleeders, + /datum/surgery_step/incise, + /datum/surgery_step/debond_nif, + /datum/surgery_step/close, + ) + +/datum/surgery/nif_debonding/can_start(mob/user, mob/living/patient) + if(!..()) + return FALSE + + var/obj/item/organ/internal/cyberimp/brain/nif/nif = patient.get_organ_slot(ORGAN_SLOT_BRAIN_NIF) + + return nif?.is_calibrated && patient.stat != DEAD && patient.client && patient.get_organ_slot(ORGAN_SLOT_BRAIN) + +/datum/surgery_step/debond_nif + name = "debond NIF (scalpel)" + time = 5 SECONDS + preop_sound = 'sound/surgery/scalpel1.ogg' + success_sound = 'sound/surgery/scalpel2.ogg' + implements = list( + TOOL_SCALPEL = 100, + /obj/item/melee/energy/sword = 75, + /obj/item/knife = 65, + /obj/item/shard = 45, + /obj/item = 30, + ) + +/datum/surgery_step/debond_nif/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(tgui_alert(target, "Would you like to have your NIF debonded from you by [user]?", "NIF Debonding", list("Yes", "No"), timeout = 5 SECONDS) != "Yes") + if(user && target) + target.balloon_alert(user, "unwilling!") + return SURGERY_STEP_FAIL + + display_results( + user, + target, + span_notice("You begin to carefully cut the threads of the NIF in [target]..."), + span_notice("[user] begins to carefully cut the threads of the NIF in [target]."), + span_notice("[user] begins to carefully cut something in [target]'s head."), + ) + display_pain(target, "You feel painful zaps in your head!") + +/datum/surgery_step/debond_nif/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) + if(target.stat == DEAD) + to_chat(user, span_warning("They need to be alive to perform this surgery!")) + return FALSE + + var/obj/item/organ/internal/brain/brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) + if(!istype(brain)) + to_chat(user, span_warning("They need a brain, dingus!")) + return FALSE + + var/obj/item/organ/internal/cyberimp/brain/nif/nif = target.get_organ_slot(ORGAN_SLOT_BRAIN_NIF) + if(!nif) + to_chat(user, span_warning("They need an NIF, dingus!")) + return FALSE + + if(!brain.modular_persistence) + to_chat(user, span_cultlarge("The ethereal forces of reality forbid debonding the NIF! Okay seriously, tell an admin lmao.")) + CRASH("[user.ckey] attempted NIF debonding for [target.ckey], but no modular persistence datum was found. This shouldn't happen.") + + nif.Remove(target) + user.put_in_hands(nif) + + target.save_nif_data(brain.modular_persistence, remove_nif = TRUE) + target.save_individual_persistence() + + return ..() + +/datum/surgery_step/debond_nif/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob) + display_results( + user, + target, + span_notice("You mess up, damaging the NIF and brain!"), + span_notice("[user] messes up, damaging the NIF and brain!"), + span_notice("[user] messes up!"), + ) + display_pain(user, "You feel a horrible spike of pain in your head!") + + target.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(30, 50)) + + var/obj/item/organ/internal/cyberimp/brain/nif/nif = target.get_organ_slot(ORGAN_SLOT_BRAIN_NIF) + nif?.adjust_durability(-rand(10, 20)) + + return FALSE + +/datum/surgery_step/debond_nif/tool_check(mob/user, obj/item/tool) + return implement_type != /obj/item || tool.get_sharpness() > 0 diff --git a/monkestation/code/modules/surgery/organs/internal/butts.dm b/monkestation/code/modules/surgery/organs/internal/butts.dm index 97a2225e7622..e8fe995bc3cb 100644 --- a/monkestation/code/modules/surgery/organs/internal/butts.dm +++ b/monkestation/code/modules/surgery/organs/internal/butts.dm @@ -160,7 +160,7 @@ //BIBLEFART //This goes above all else because it's an instagib. - for(var/obj/item/storage/book/bible/Holy in Location) + for(var/obj/item/book/bible/Holy in Location) if(Holy) cooling_down = TRUE var/turf/T = get_step(get_step(Person, NORTH), NORTH) diff --git a/monkestation/code/modules/syndicate_ghostroles/listeningpost.dm b/monkestation/code/modules/syndicate_ghostroles/listeningpost.dm new file mode 100644 index 000000000000..c83e807ceaad --- /dev/null +++ b/monkestation/code/modules/syndicate_ghostroles/listeningpost.dm @@ -0,0 +1,50 @@ + +//role + +///asteroid comms agent + +//job datum + +/datum/job/lavaland_syndicate/space //prevent admin confusion (getting bwoinked while squatting on a space ruin) + title = ROLE_SPACE_SYNDICATE + +//spawner itself + +/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space + you_are_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13." + flavour_text = "Monitor enemy activity as best you can, and try to keep a low profile. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" + important_text = "DO NOT leave the base. You are not a field agent, and are not permitted to do their job for them." + spawner_job_path = /datum/job/lavaland_syndicate/space + + + +/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson //the last agent according to lore, spawns rarely, has some flavour text, should start blinded + name = "sleeper" + desc = "A standard medicinal sleeper used to treat small and major injuries alike. It appears to be locked up, and you can see a gas mask through the fogged-up windows..." + icon_state = "sleeper" + you_are_text = "You are a Syndicate reconnaisance agent who went blind in an accident..." + flavour_text = "Your painkillers are running low, your memories are getting foggy, and all you can remember is the codename 'Anderson'. You were about to hurl yourself out into space, but you heard the intercom announce that the backup was getting unfrozen... maybe you'll see again?" + important_text = "DO NOT leave the base, you're inevitably doomed without it!" + outfit = /datum/outfit/lavaland_syndicate/comms/anderson + +/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/Initialize(mapload) + . = ..() + if(prob(85)) //only has a 15% chance of existing, otherwise it'll just be a regular (self-control) sleeper + return INITIALIZE_HINT_QDEL //the destroy() code already handles sleeper spawning + +/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/Destroy() + var/obj/machinery/sleeper/self_control/anderson = new(drop_location()) //one guy cmon + anderson.setDir(dir) + return ..() + +/datum/outfit/lavaland_syndicate/comms/anderson + name = "'Anderson' Comms Agent" + r_hand = /obj/item/storage/pill_bottle //empty pillbottle + l_hand = /obj/item/knife/combat/survival //no esword, but still a knife + head = /obj/item/clothing/head/soft/black + +/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space/anderson/special(mob/living/new_spawn) + . = ..() + new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) + new_spawn.adjustOrganLoss(ORGAN_SLOT_EYES, 100) //AAAARGH MY EYES + new_spawn.adjustOrganLoss(ORGAN_SLOT_LIVER, 35) //not completely out, but it's not having a good day diff --git a/monkestation/code/modules/trading/unusual_effects/_unusual_component.dm b/monkestation/code/modules/trading/unusual_effects/_unusual_component.dm index c086f9421291..665618d0bfb6 100644 --- a/monkestation/code/modules/trading/unusual_effects/_unusual_component.dm +++ b/monkestation/code/modules/trading/unusual_effects/_unusual_component.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(total_unusuals_per_type, list()) RegisterSignal(source_object, COMSIG_ATOM_UPDATE_DESC, PROC_REF(append_unusual)) save_unusual_data() -/datum/component/unusual_handler/Destroy(force, silent) +/datum/component/unusual_handler/Destroy(force) . = ..() UnregisterSignal(source_object, COMSIG_ATOM_UPDATE_DESC) 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 cc409d1c35a4..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 @@ -87,7 +89,7 @@ if(lifetime) addtimer(CALLBACK(src, PROC_REF(kill_it_with_fire)), lifetime) -/datum/component/particle_spewer/Destroy(force, silent) +/datum/component/particle_spewer/Destroy(force) . = ..() UnregisterSignal(source_object, list( COMSIG_ITEM_EQUIPPED, @@ -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/_footprint.dm b/monkestation/code/modules/trading/unusual_effects/animation_housing/_footprint.dm index dec84bd40657..0638dec0bd7f 100644 --- a/monkestation/code/modules/trading/unusual_effects/animation_housing/_footprint.dm +++ b/monkestation/code/modules/trading/unusual_effects/animation_housing/_footprint.dm @@ -3,7 +3,7 @@ processes = FALSE var/mob/attached_signal -/datum/component/particle_spewer/movement/Destroy(force, silent) +/datum/component/particle_spewer/movement/Destroy(force) UnregisterSignal(source_object, COMSIG_MOVABLE_PRE_MOVE) . = ..() UnregisterSignal(attached_signal, COMSIG_MOVABLE_PRE_MOVE) 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/uplink/uplink_items/job.dm b/monkestation/code/modules/uplink/uplink_items/job.dm index 8d80747eca3d..2395ddbf650a 100644 --- a/monkestation/code/modules/uplink/uplink_items/job.dm +++ b/monkestation/code/modules/uplink/uplink_items/job.dm @@ -3,7 +3,7 @@ desc = "We understand it can be difficult to carry out some of our missions. Here is some spiritual counsel in a small package." progression_minimum = 5 MINUTES cost = 1 - item = /obj/item/storage/book/bible/mini + item = /obj/item/book/bible/mini restricted_roles = list(JOB_CHAPLAIN, JOB_CLOWN) /datum/uplink_item/role_restricted/reverse_bear_trap diff --git a/monkestation/code/modules/uplink/uplink_items/nukeops.dm b/monkestation/code/modules/uplink/uplink_items/nukeops.dm index 8a918b7ad0b5..ccfeb79e10df 100644 --- a/monkestation/code/modules/uplink/uplink_items/nukeops.dm +++ b/monkestation/code/modules/uplink/uplink_items/nukeops.dm @@ -18,3 +18,12 @@ /datum/uplink_item/support/honker surplus = 60 + +/datum/uplink_item/suits/cybersun_juggernaut_suit + name = "Cybersun Juggernaut Suit" + desc = "Developed by Cybersun for use in clearing heavy space bear infestations in asteroid belt operations.\ + It now has a new purpose as the heavy operation suit of the Syndicate. By purchasing this you get a special Authorization Key to the only suit in storage at Firebase Balthazord." + item = /obj/item/keycard/syndicate_suit_storage + cost = 20 + purchasable_from = UPLINK_NUKE_OPS + limited_stock = 1 diff --git a/monkestation/code/modules/uplink/uplink_items/suits.dm b/monkestation/code/modules/uplink/uplink_items/suits.dm new file mode 100644 index 000000000000..32331ac90496 --- /dev/null +++ b/monkestation/code/modules/uplink/uplink_items/suits.dm @@ -0,0 +1 @@ +// Never again. diff --git a/monkestation/code/modules/uplink/uplink_items/weapons.dm b/monkestation/code/modules/uplink/uplink_items/weapons.dm index a224ec53eb48..80e36ad88fa0 100644 --- a/monkestation/code/modules/uplink/uplink_items/weapons.dm +++ b/monkestation/code/modules/uplink/uplink_items/weapons.dm @@ -22,7 +22,7 @@ Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aetherofusion assures safety for up to 2 years of use." item = /obj/item/gun/energy/laser/musket/syndicate progression_minimum = 30 MINUTES - cost = 12 + cost = 10 surplus = 40 purchasable_from = ~UPLINK_CLOWN_OPS @@ -31,3 +31,56 @@ desc = "A knife that is made of two razor sharp blades, it has a secret compartment in the handle to store liquids which are injected when stabbing something. Can hold up to forty units of reagents but comes empty." item = /obj/item/knife/venom cost = 6 // all in all it's not super stealthy and you have to get some chemicals yourself + +/datum/uplink_item/dangerous/renoster + name = "Renoster Shotgun Case" + desc = "A twelve gauge shotgun with an eight shell capacity underneath. Comes with two boxes of buckshot." + item = /obj/item/storage/toolbox/guncase/nova/opfor/renoster + cost = 10 + +/datum/uplink_item/dangerous/infanteria + name = "Carwo-Cawil Battle Rifle Case" + desc = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard SolFed rifle magazine. Comes with two mags. This will NOT fit in a backpack... " + progression_minimum = 10 MINUTES + item = /obj/item/storage/toolbox/guncase/nova/opfor/infanteria + cost = 12 + +/datum/uplink_item/dangerous/miecz + name = "'Miecz' Submachinegun Case" + desc = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber cartridges. Comes with two magazines." + progression_minimum = 10 MINUTES + item = /obj/item/storage/toolbox/guncase/nova/opfor/miecz + cost = 9 + +/datum/uplink_item/dangerous/kiboko + name = "Kiboko Grenade Launcher Case" + desc = "A unique grenade launcher firing .980 grenades. A laser sight system allows its user to specify a range for the grenades it fires to detonate at. Comes with two C980 Grenade Drums." + progression_minimum = 10 MINUTES + item = /obj/item/storage/toolbox/guncase/nova/opfor/kiboko + cost = 14 + +/datum/uplink_item/dangerous/sidano + name = "Sindano SMG" + desc = "A small submachinegun, this one is painted in tacticool black. Accepts any standard Sol pistol magazine." + progression_minimum = 10 MINUTES + item = /obj/item/storage/toolbox/guncase/nova/pistol/opfor/sindano + cost = 12 + +/datum/uplink_item/dangerous/wespe + name = "Wespe Pistol" + desc = "The standard issue service pistol of SolFed's various military branches. Comes with attached light." + progression_minimum = 5 MINUTES + item = /obj/item/storage/toolbox/guncase/nova/pistol/opfor/wespe + cost = 6 + +/datum/uplink_item/dangerous/shotgun_revolver + name = "\improper Bóbr 12 GA revolver" + desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a four shell cylinder. That's right, shell, this one shoots twelve guage." + item = /obj/item/storage/box/syndie_kit/shotgun_revolver + cost = 8 + +/datum/uplink_item/dangerous/shit_smg + name = "Surplus Smg Bundle" + desc = "A single surplus Plastikov SMG and two extra magazines. A terrible weapon, perfect for henchmen." + item = /obj/item/storage/box/syndie_kit/shit_smg_bundle + cost = 4 diff --git a/monkestation/code/modules/veth_misc_items/canopics/canopics.dm b/monkestation/code/modules/veth_misc_items/canopics/canopics.dm new file mode 100644 index 000000000000..f164cb9f4e73 --- /dev/null +++ b/monkestation/code/modules/veth_misc_items/canopics/canopics.dm @@ -0,0 +1,254 @@ +//canopic box sprited by twiggy, coded by veth +/obj/item/storage/box/canopic_box + name = "Canopic Box" + desc = "An ornate stone box inscribed with ancient hieroglyphs." + icon = 'monkestation/code/modules/veth_misc_items/canopics/icons/canopic_box.dmi' + icon_state = "canopic_box" + inhand_icon_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + resistance_flags = FIRE_PROOF + drop_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg' + pickup_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg' + foldable_result = FALSE + illustration = FALSE + +/datum/crafting_recipe/canopic_box + name = "Canopic box" + result = /obj/item/storage/box/canopic_box + time = 2 SECONDS + tool_paths = FALSE + reqs = list( + /obj/item/stack/sheet/sandblock = 5, + /obj/item/stack/sheet/mineral/wood = 10, + /obj/item/stack/sheet/leather = 2, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1) + category = CAT_CONTAINERS + +//jackal canopic sprited by twiggy, coded by veth +/obj/item/storage/box/canopic_jackal/Initialize(mapload) + . = ..() + atom_storage.max_slots = 1 + atom_storage.set_holdable(list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + )) + atom_storage.exception_hold = list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + ) + atom_storage.can_hold = typecacheof(/obj/item/organ/internal) + atom_storage.can_hold_description = "This jar can hold organs!" + atom_storage.max_total_storage = WEIGHT_CLASS_TINY*10 + update_appearance() + +/obj/item/storage/box/canopic_jackal + name = "Jackal Canopic jar" + desc = "An ornate stone canopic, inscribed with ancient hieroglyphs. These used to be used to store organs." + w_class = WEIGHT_CLASS_TINY + icon = 'monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi' + icon_state = "canopic_jackal" + inhand_icon_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + resistance_flags = FIRE_PROOF + drop_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg' + pickup_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg' + foldable_result = FALSE + illustration = FALSE + +/datum/crafting_recipe/canopic_jackal + name = "Jackal Canopic jar" + result = /obj/item/storage/box/canopic_jackal + time = 2 SECONDS + tool_paths = FALSE + reqs = list( + /obj/item/stack/sheet/sandblock = 1, + /obj/item/stack/sheet/mineral/wood = 1, + /obj/item/stack/sheet/leather = 1, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1) + category = CAT_CONTAINERS +//human canopic sprited by twiggy, coded by veth +/obj/item/storage/box/canopic_human + name = "Human Canopic jar" + desc = "An ornate stone canopic, inscribed with ancient hieroglyphs. These used to be used to store organs." + w_class = WEIGHT_CLASS_TINY + icon = 'monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi' + icon_state = "canopic_human" + inhand_icon_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + resistance_flags = FIRE_PROOF + drop_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg' + pickup_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg' + foldable_result = FALSE + illustration = FALSE +/obj/item/storage/box/canopic_human/Initialize(mapload) + . = ..() + + atom_storage.max_slots = 1 + atom_storage.set_holdable(list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + )) + atom_storage.exception_hold = list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + ) + atom_storage.can_hold = typecacheof(/obj/item/organ/internal) + atom_storage.can_hold_description = "This jar can hold organs!" + atom_storage.max_total_storage = WEIGHT_CLASS_TINY*10 + update_appearance() + +/datum/crafting_recipe/canopic_human + name = "Human Canopic jar" + result = /obj/item/storage/box/canopic_human + time = 2 SECONDS + tool_paths = FALSE + reqs = list( + /obj/item/stack/sheet/sandblock = 1, + /obj/item/stack/sheet/mineral/wood = 1, + /obj/item/stack/sheet/leather = 1, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1) + category = CAT_CONTAINERS +//monke canopic sprited by twiggy, coded by veth +/obj/item/storage/box/canopic_monke/Initialize(mapload) + . = ..() + atom_storage.max_slots = 1 + atom_storage.set_holdable(list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + )) + atom_storage.exception_hold = list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + ) + atom_storage.can_hold = typecacheof(/obj/item/organ/internal) + atom_storage.can_hold_description = "This jar can hold organs!" + atom_storage.max_total_storage = WEIGHT_CLASS_TINY*10 + update_appearance() + +/obj/item/storage/box/canopic_monke //creates the object + name = "Monke canopic jar" + desc = "An ornate stone canopic, inscribed with ancient hieroglyphs. These used to be used to store organs." + w_class = WEIGHT_CLASS_TINY + icon = 'monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi' + icon_state = "canopic_monke" + inhand_icon_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + resistance_flags = FIRE_PROOF + drop_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg' + pickup_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg' + foldable_result = FALSE + illustration = FALSE + +/datum/crafting_recipe/canopic_monke //creates the crafting recipe + name = "Monke Canopic jar" + result = /obj/item/storage/box/canopic_monke + time = 2 SECONDS + tool_paths = FALSE + reqs = list( + /obj/item/stack/sheet/sandblock = 1, + /obj/item/stack/sheet/mineral/wood = 1, + /obj/item/stack/sheet/leather = 1, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1) + category = CAT_CONTAINERS + + + +//hawk canopic sprited by twiggy, coded by veth +/obj/item/storage/box/canopic_hawk/Initialize(mapload) + . = ..() + atom_storage.max_slots = 1 + atom_storage.set_holdable(list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + )) + atom_storage.exception_hold = list( + /obj/item/organ/internal/heart, + /obj/item/organ/internal/lungs, + /obj/item/organ/internal/liver, + /obj/item/organ/internal/appendix, + /obj/item/organ/internal/tongue, + /obj/item/organ/internal/eyes, + /obj/item/organ/internal/stomach, + /obj/item/organ/internal/ears, + ) + atom_storage.can_hold = typecacheof(/obj/item/organ/internal) + atom_storage.can_hold_description = "This jar can hold organs!" + atom_storage.max_total_storage = WEIGHT_CLASS_TINY*10 + update_appearance() + +/obj/item/storage/box/canopic_hawk //creates the object + name = "Hawk Canopic jar" + desc = "An ornate stone canopic, inscribed with ancient hieroglyphs. These used to be used to store organs." + w_class = WEIGHT_CLASS_TINY + icon = 'monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi' + icon_state = "canopic_hawk" + inhand_icon_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + resistance_flags = FIRE_PROOF + drop_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg' + pickup_sound = 'monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg' + foldable_result = FALSE + illustration = FALSE +/datum/crafting_recipe/canopic_hawk //creates the crafting recipe + name = "hawk canopic jar" + result = /obj/item/storage/box/canopic_hawk + time = 2 SECONDS + tool_paths = FALSE + reqs = list( + /obj/item/stack/sheet/sandblock = 1, + /obj/item/stack/sheet/mineral/wood = 1, + /obj/item/stack/sheet/leather = 1, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1) + category = CAT_CONTAINERS diff --git a/monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi b/monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi new file mode 100644 index 000000000000..8e56c6be4ed4 Binary files /dev/null and b/monkestation/code/modules/veth_misc_items/canopics/icons/canopic.dmi differ diff --git a/monkestation/code/modules/veth_misc_items/canopics/icons/canopic_box.dmi b/monkestation/code/modules/veth_misc_items/canopics/icons/canopic_box.dmi new file mode 100644 index 000000000000..4f1944503bfa Binary files /dev/null and b/monkestation/code/modules/veth_misc_items/canopics/icons/canopic_box.dmi differ diff --git a/monkestation/code/modules/veth_misc_items/canopics/readme.md b/monkestation/code/modules/veth_misc_items/canopics/readme.md new file mode 100644 index 000000000000..124565d5da76 --- /dev/null +++ b/monkestation/code/modules/veth_misc_items/canopics/readme.md @@ -0,0 +1,25 @@ +## Title: + + +MODULE ID: CANOPICS + +### Description: +This PR adds canopics requested by Malphy to the game. +https://discord.com/channels/748354466335686736/1170798993308139571 + +### Master file additions + +- N/A + + +### Included files that are not contained in this module: + +- N/A + + +### Credits: + + + +Made by Veth +Sprited by Twiggy diff --git a/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg b/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg new file mode 100644 index 000000000000..70d2abcc774a Binary files /dev/null and b/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_drop.ogg differ diff --git a/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg b/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg new file mode 100644 index 000000000000..a52eec4cf681 Binary files /dev/null and b/monkestation/code/modules/veth_misc_items/canopics/sounds/canopic_pickup.ogg differ diff --git a/monkestation/code/modules/virology/disease/plague_rat/event.dm b/monkestation/code/modules/virology/disease/plague_rat/event.dm index cd8558397817..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." @@ -17,18 +17,12 @@ role_name = "Plague Rat" /datum/round_event/ghost_role/plague_rat/spawn_role() - var/list/candidates = SSpolling.poll_ghost_candidates(check_jobban = ROLE_PLAGUERAT, role = ROLE_PLAGUERAT, pic_source = /mob/living/basic/mouse/plague) + var/list/candidates = SSpolling.poll_ghost_candidates(check_jobban = ROLE_PLAGUERAT, role = ROLE_PLAGUERAT, alert_pic = /mob/living/basic/mouse/plague, amount_to_pick = 4) if(!length(candidates)) return NOT_ENOUGH_PLAYERS - for(var/i = 1 to 4) - - var/mob/dead/selected = pick_n_take(candidates) - if(!selected) - break - + for(var/mob/dead/selected in candidates) var/key = selected.key - var/mob/living/basic/mouse/plague/dragon = new dragon.key = key dragon.mind.special_role = ROLE_PLAGUERAT 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 e3b529a21025..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 @@ -25,7 +27,7 @@ //generate_combination_strings() generate_sequence() -/datum/cracker_puzzle/Destroy(force, ...) +/datum/cracker_puzzle/Destroy(force) . = ..() parent = null @@ -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_cracker/symptom_component.dm b/monkestation/code/modules/virology/disease/symptom_cracker/symptom_component.dm index 98d6078420f8..0bbefed43d19 100644 --- a/monkestation/code/modules/virology/disease/symptom_cracker/symptom_component.dm +++ b/monkestation/code/modules/virology/disease/symptom_cracker/symptom_component.dm @@ -36,7 +36,7 @@ . = ..() UnregisterSignal(parent, COMSIG_ATOM_EXTRAPOLATOR_ACT) -/datum/component/symptom_genes/Destroy(force, silent) +/datum/component/symptom_genes/Destroy(force) . = ..() current_user = null current_extrapolator = null diff --git a/monkestation/code/modules/virology/disease/symptom_varients/base.dm b/monkestation/code/modules/virology/disease/symptom_varients/base.dm index 88e3615cef15..216255679326 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/base.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/base.dm @@ -46,5 +46,4 @@ 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) - return new_varient + return new type(new_symp) diff --git a/monkestation/code/modules/virology/disease/symptom_varients/bluespace.dm b/monkestation/code/modules/virology/disease/symptom_varients/bluespace.dm index a1ff3a5f2c2a..0e53035e5166 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/bluespace.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/bluespace.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(bluespace_varient_list, list()) last_bluespace_id++ bluespace_id = last_bluespace_id -/datum/symptom_varient/bluespace/Destroy(force, ...) +/datum/symptom_varient/bluespace/Destroy(force) . = ..() GLOB.bluespace_varient_list -= src diff --git a/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm b/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm index ae869a508212..0d50e3eea259 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm @@ -4,7 +4,7 @@ cooldown_time = 15 SECONDS -/datum/symptom_varient/recursive/Destroy(force, ...) +/datum/symptom_varient/recursive/Destroy(force) . = ..() UnregisterSignal(host_symptom, COMSIG_SYMPTOM_TRIGGER) diff --git a/monkestation/code/modules/virology/disease/symptom_varients/reflexive.dm b/monkestation/code/modules/virology/disease/symptom_varients/reflexive.dm index e9f7efc60e86..61bd02aa653c 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/reflexive.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/reflexive.dm @@ -6,7 +6,7 @@ var/mob/living/host_mob -/datum/symptom_varient/reflexive/Destroy(force, ...) +/datum/symptom_varient/reflexive/Destroy(force) . = ..() if(host_mob) UnregisterSignal(host_mob, COMSIG_CARBON_TAKE_BRUTE_DAMAGE) diff --git a/monkestation/code/modules/virology/disease/symptom_varients/routine.dm b/monkestation/code/modules/virology/disease/symptom_varients/routine.dm index f82033fca351..820dbb62b7e4 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/routine.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/routine.dm @@ -5,7 +5,7 @@ cooldown_time = 5 SECONDS COOLDOWN_DECLARE(next_process) -/datum/symptom_varient/routine/Destroy(force, ...) +/datum/symptom_varient/routine/Destroy(force) . = ..() STOP_PROCESSING(SSobj, src) diff --git a/monkestation/code/modules/virology/disease/symptom_varients/strengthen.dm b/monkestation/code/modules/virology/disease/symptom_varients/strengthen.dm index 3eaae2fc5c15..c66032a9d49d 100644 --- a/monkestation/code/modules/virology/disease/symptom_varients/strengthen.dm +++ b/monkestation/code/modules/virology/disease/symptom_varients/strengthen.dm @@ -4,7 +4,7 @@ cooldown_time = 15 SECONDS -/datum/symptom_varient/strength/Destroy(force, ...) +/datum/symptom_varient/strength/Destroy(force) . = ..() UnregisterSignal(host_symptom, COMSIG_SYMPTOM_TRIGGER) diff --git a/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm b/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm index a9a7c836de2f..ef13a61fc797 100644 --- a/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm +++ b/monkestation/code/modules/virology/disease/symtoms/restricted/stage1.dm @@ -54,20 +54,20 @@ /datum/symptom/transformation/proc/replace_banned_player(mob/living/new_mob, mob/living/affected_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed. set waitfor = FALSE - var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates_for_mob("Do you want to play as [affected_mob.real_name]?", check_jobban = bantype, role = bantype, poll_time = 5 SECONDS, target_mob = affected_mob, pic_source = affected_mob, role_name_text = "transformation victim") - if(LAZYLEN(candidates)) - var/mob/dead/observer/C = pick(candidates) - to_chat(affected_mob, span_userdanger("Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")) - message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(affected_mob)]) to replace a jobbanned player.") - affected_mob.ghostize(FALSE) - affected_mob.key = C.key - else + var/mob/dead/observer/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [affected_mob.real_name]?", check_jobban = bantype, role = bantype, poll_time = 5 SECONDS, checked_target = affected_mob, alert_pic = affected_mob, role_name_text = "transformation victim") + if(isnull(chosen_one)) to_chat(new_mob, span_userdanger("Your mob has been claimed by death! Appeal your job ban if you want to avoid this in the future!")) new_mob.investigate_log("has been killed because there was no one to replace them as a job-banned player.", INVESTIGATE_DEATHS) new_mob.death() if (!QDELETED(new_mob)) new_mob.ghostize(can_reenter_corpse = FALSE) new_mob.key = null + return + to_chat(affected_mob, span_userdanger("Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")) + message_admins("[key_name_admin(chosen_one)] has taken control of ([key_name_admin(affected_mob)]) to replace a jobbanned player.") + affected_mob.ghostize(FALSE) + affected_mob.key = chosen_one.key + /datum/symptom/transformation/robot name = "Robotic Transformation" 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/restricted/stage4.dm b/monkestation/code/modules/virology/disease/symtoms/restricted/stage4.dm index f4578364a10f..2136b068d855 100644 --- a/monkestation/code/modules/virology/disease/symtoms/restricted/stage4.dm +++ b/monkestation/code/modules/virology/disease/symtoms/restricted/stage4.dm @@ -3,7 +3,10 @@ desc = "If left untreated the subject will die!" restricted = TRUE max_multiplier = 5 + chance = 20 + max_chance = 20 var/sound = FALSE + badness = EFFECT_DANGER_DEADLY /datum/symptom/heart_failure/activate(mob/living/carbon/affected_mob) . = ..() @@ -17,25 +20,25 @@ switch(round(multiplier)) if(1 to 2) - if(prob(1)) + if(prob(5)) to_chat(affected_mob, span_warning("You feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.")) - if(prob(1)) + if(prob(5)) to_chat(affected_mob, span_warning("You feel dizzy.")) affected_mob.adjust_confusion(6 SECONDS) - if(prob(1.5)) + if(prob(7.5)) to_chat(affected_mob, span_warning("You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short of breath", "uneasy")].")) if(3 to 4) if(!sound) affected_mob.playsound_local(affected_mob, 'sound/health/slowbeat.ogg', 40, FALSE, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) sound = TRUE - if(prob(1.5)) + if(prob(7.5)) to_chat(affected_mob, span_danger("You feel a sharp pain in your chest!")) - if(prob(25)) + if(prob(30)) affected_mob.vomit(95) affected_mob.emote("cough") affected_mob.Paralyze(40) affected_mob.losebreath += 4 - if(prob(1.5)) + if(prob(7.5)) to_chat(affected_mob, span_danger("You feel very weak and dizzy...")) affected_mob.adjust_confusion(8 SECONDS) affected_mob.stamina.adjust(-40, FALSE) @@ -50,6 +53,7 @@ affected_mob.set_heartattack(TRUE) affected_mob.reagents.add_reagent(/datum/reagent/medicine/c2/penthrite, 3) // To give the victim a final chance to shock their heart before losing consciousness return FALSE + multiplier_tweak(0.1) /datum/symptom/catapult_sneeze name = "Sneezing?" diff --git a/monkestation/code/modules/virology/disease/symtoms/stage1.dm b/monkestation/code/modules/virology/disease/symtoms/stage1.dm index 9cf4026f9492..570c72e4c377 100644 --- a/monkestation/code/modules/virology/disease/symtoms/stage1.dm +++ b/monkestation/code/modules/virology/disease/symtoms/stage1.dm @@ -167,7 +167,7 @@ /datum/symptom/wendigo_warning/activate(mob/living/mob) to_chat(mob, span_warning("[pick(host_messages)]")) - mob.adjust_nutrition(-25) + mob.adjust_nutrition(-10) /datum/symptom/cult_hallucination @@ -418,12 +418,12 @@ /datum/symptom/plasma_heal/first_activate(mob/living/carbon/mob, datum/disease/advanced/disease) . = ..() - ADD_TRAIT(mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT) + ADD_TRAIT(mob, TRAIT_PLASMA_LOVER_METABOLISM, type) to_chat(mob, span_notice("You suddenly love plasma.")) /datum/symptom/plasma_heal/side_effect(mob/living/mob) . = ..() - REMOVE_TRAIT(mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT) + REMOVE_TRAIT(mob, TRAIT_PLASMA_LOVER_METABOLISM, type) /datum/symptom/plasma_heal/activate(mob/living/carbon/mob, datum/disease/advanced/disease) . = ..() diff --git a/monkestation/code/modules/virology/disease/symtoms/stage2.dm b/monkestation/code/modules/virology/disease/symtoms/stage2.dm index c64c9115bf84..e00750ca7466 100644 --- a/monkestation/code/modules/virology/disease/symtoms/stage2.dm +++ b/monkestation/code/modules/virology/disease/symtoms/stage2.dm @@ -74,17 +74,6 @@ strength -= 30 i++ -/datum/symptom/hungry - name = "Appetiser Effect" - desc = "Starves the infected." - stage = 2 - badness = EFFECT_DANGER_ANNOYING - multiplier = 10 - max_multiplier = 20 - -/datum/symptom/hungry/activate(mob/living/mob) - mob.nutrition = max(0, mob.nutrition - 20*multiplier) - /datum/symptom/fridge name = "Refridgerator Syndrome" desc = "Causes the infected to shiver at random." @@ -379,16 +368,16 @@ /datum/symptom/famine/activate(mob/living/mob) if(ishuman(mob)) var/mob/living/carbon/human/victim = mob - if(victim.dna) - if(ispodperson(victim)) //Plantmen take a LOT of damage - victim.adjustCloneLoss(5 * multiplier) + 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("\The [crop] rots at an alarming rate!") + for(var/obj/item/food/grown/crop in range(2 * multiplier,mob)) + crop.visible_message(span_warning("\The [crop] rots at an alarming rate!")) new /obj/item/food/badrecipe(get_turf(crop)) qdel(crop) - if(prob(30/multiplier)) + if(prob(30 / multiplier)) break + /datum/symptom/cyborg_vomit name = "Oleum Syndrome" desc = "Causes the infected to internally synthesize oil and other inorganic material." @@ -396,12 +385,8 @@ badness = EFFECT_DANGER_ANNOYING /datum/symptom/cyborg_vomit/activate(mob/living/mob) - if((HAS_TRAIT(mob, TRAIT_NOHUNGER))) - return - - if(!(mob.has_mouth())) + if(HAS_TRAIT(mob, TRAIT_NOHUNGER) || !mob.has_mouth()) return - if(prob(90)) //90% chance for just oil mob.visible_message(span_danger("[mob.name] vomits up some oil!")) mob.adjustToxLoss(-3) @@ -522,11 +507,11 @@ max_count = 1 /datum/symptom/disfiguration/activate(mob/living/carbon/mob) - ADD_TRAIT(mob, TRAIT_DISFIGURED, DISEASE_TRAIT) + ADD_TRAIT(mob, TRAIT_DISFIGURED, type) mob.visible_message(span_warning("[mob]'s face appears to cave in!"), span_notice("You feel your face crumple and cave in!")) /datum/symptom/disfiguration/deactivate(mob/living/carbon/mob) - REMOVE_TRAIT(mob, TRAIT_DISFIGURED, DISEASE_TRAIT) + REMOVE_TRAIT(mob, TRAIT_DISFIGURED, type) /datum/symptom/blindness name = "Hyphema" diff --git a/monkestation/code/modules/virology/disease/symtoms/stage3.dm b/monkestation/code/modules/virology/disease/symtoms/stage3.dm index 294428b1d34d..afe0808b87c6 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" @@ -106,11 +106,12 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list()) stage = 3 badness = EFFECT_DANGER_HINDRANCE max_multiplier = 5 - max_chance = 15 + symptom_delay_min = 1 + symptom_delay_max = 5 /datum/symptom/confusion/activate(mob/living/carbon/mob) - to_chat(mob, span_notice("You have trouble telling right and left apart all of a sudden.")) - mob.adjust_confusion(1 SECONDS * multiplier) + to_chat(mob, span_warning("You have trouble telling right and left apart all of a sudden!")) + mob.adjust_confusion_up_to(1 SECONDS * multiplier, 20 SECONDS) /datum/symptom/groan name = "Groaning Syndrome" @@ -451,8 +452,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 @@ -720,34 +725,29 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list()) Heal(mob, multiplier) else multiplier = min(multiplier + 0.1, max_multiplier) - return /datum/symptom/darkness/proc/CanHeal(mob/living/carbon/mob) var/light_amount = 0 if(isturf(mob.loc)) //else, there's considered to be no light - var/turf/T = mob.loc - light_amount = min(1,T.get_lumcount()) - 0.5 + var/turf/mob_turf = mob.loc + light_amount = min(1, mob_turf.get_lumcount()) - 0.5 if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) return power -/datum/symptom/darkness/proc/Heal(mob/living/carbon/M, actual_power) +/datum/symptom/darkness/proc/Heal(mob/living/carbon/victim, actual_power) var/heal_amt = 2 * actual_power - - var/list/parts = M.get_damaged_bodyparts(1,1,BODYTYPE_ORGANIC) - - if(!parts.len) + var/list/parts = victim.get_damaged_bodyparts(brute = TRUE, burn = TRUE, required_bodytype = BODYTYPE_ORGANIC) + if(!length(parts)) return - if(prob(5)) - to_chat(M, span_notice("The darkness soothes and mends your wounds.")) - - for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5, BODYTYPE_ORGANIC)) //more effective on brute - M.update_damage_overlays() - return 1 - -/datum/symptom/darkness/proc/passive_message_condition(mob/living/M) - if(M.getBruteLoss() || M.getFireLoss()) + to_chat(victim, span_notice("The darkness soothes and mends your wounds.")) + var/brute_heal = heal_amt / length(parts) + var/burn_heal = brute_heal * 0.5 + victim.heal_overall_damage(brute = brute_heal, burn = burn_heal, required_bodytype = BODYTYPE_ORGANIC) + return TRUE + +/datum/symptom/darkness/proc/passive_message_condition(mob/living/victim) + if(victim.getBruteLoss() || victim.getFireLoss()) return TRUE return FALSE @@ -766,7 +766,7 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list()) . = ..() if(!added_to_mob && max_multiplier >= 12) added_to_mob = TRUE - ADD_TRAIT(mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT) + ADD_TRAIT(mob, TRAIT_NOCRITDAMAGE, type) var/effectiveness = CanHeal(mob) if(!effectiveness) @@ -781,54 +781,47 @@ GLOBAL_LIST_INIT(disease_hivemind_users, list()) uncoma() if(!added_to_mob) return - REMOVE_TRAIT(mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT) + REMOVE_TRAIT(mob, TRAIT_NOCRITDAMAGE, type) -/datum/symptom/coma/proc/CanHeal(mob/living/M) - if(HAS_TRAIT(M, TRAIT_DEATHCOMA)) +/datum/symptom/coma/proc/CanHeal(mob/living/victim) + if(HAS_TRAIT(victim, TRAIT_DEATHCOMA)) return multiplier - if(M.IsSleeping()) + if(victim.IsSleeping()) return multiplier * 0.25 //Voluntary unconsciousness yields lower healing. - switch(M.stat) + switch(victim.stat) if(UNCONSCIOUS, HARD_CRIT) return multiplier * 0.9 if(SOFT_CRIT) return multiplier * 0.5 - if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) - to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) + if((victim.getBruteLoss() + victim.getFireLoss()) >= 70 && !active_coma) + to_chat(victim, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE - addtimer(CALLBACK(src, PROC_REF(coma), M), 60) + addtimer(CALLBACK(src, PROC_REF(coma), victim), 6 SECONDS) return FALSE -/datum/symptom/coma/proc/coma(mob/living/M) - if(QDELETED(M) || M.stat == DEAD) +/datum/symptom/coma/proc/coma(mob/living/victim) + if(QDELETED(victim) || victim.stat == DEAD) return - M.fakedeath("regenerative_coma", TRUE) - addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300) + victim.fakedeath("regenerative_coma", TRUE) + addtimer(CALLBACK(src, PROC_REF(uncoma), victim), 30 SECONDS) -/datum/symptom/coma/proc/uncoma(mob/living/M) - if(QDELETED(M) || !active_coma) +/datum/symptom/coma/proc/uncoma(mob/living/victim) + if(QDELETED(victim) || !active_coma) return active_coma = FALSE - M.cure_fakedeath("regenerative_coma") + victim.cure_fakedeath("regenerative_coma") -/datum/symptom/coma/proc/Heal(mob/living/carbon/M, actual_power) - var/heal_amt = 4 * actual_power - - var/list/parts = M.get_damaged_bodyparts(1,1) - - if(!parts.len) +/datum/symptom/coma/proc/Heal(mob/living/carbon/victim, actual_power) + var/list/parts = victim.get_damaged_bodyparts(brute = TRUE, burn = TRUE) + if(!length(parts)) return - - for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, BODYTYPE_ORGANIC)) - M.update_damage_overlays() - - if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0) - uncoma(M) - - return 1 - -/datum/symptom/coma/proc/passive_message_condition(mob/living/M) - if((M.getBruteLoss() + M.getFireLoss()) > 30) + var/heal_amt = (4 * actual_power) / length(parts) + victim.heal_overall_damage(brute = heal_amt, burn = heal_amt) + if(active_coma && (victim.getBruteLoss() + victim.getFireLoss()) == 0) + uncoma(victim) + return TRUE + +/datum/symptom/coma/proc/passive_message_condition(mob/living/victim) + if((victim.getBruteLoss() + victim.getFireLoss()) > 30) return TRUE return FALSE diff --git a/monkestation/code/modules/virology/disease/symtoms/stage4.dm b/monkestation/code/modules/virology/disease/symtoms/stage4.dm index 1679cf6c530d..94354c3a3425 100644 --- a/monkestation/code/modules/virology/disease/symtoms/stage4.dm +++ b/monkestation/code/modules/virology/disease/symtoms/stage4.dm @@ -7,13 +7,11 @@ chance = 10 max_chance = 25 -/datum/symptom/spaceadapt/activate(mob/living/carbon/mob) - mob.dna.add_mutation(/datum/mutation/human/pressure_adaptation) - mob.dna.add_mutation(/datum/mutation/human/temperature_adaptation) +/datum/symptom/spaceadapt/activate(mob/living/mob) + mob.add_traits(list(TRAIT_RESISTCOLD, TRAIT_RESISTLOWPRESSURE), type) /datum/symptom/spaceadapt/deactivate(mob/living/carbon/mob) - mob.dna.remove_mutation(/datum/mutation/human/pressure_adaptation) - mob.dna.remove_mutation(/datum/mutation/human/temperature_adaptation) + mob.remove_traits(list(TRAIT_RESISTCOLD, TRAIT_RESISTLOWPRESSURE), type) /datum/symptom/minttoxin name = "Creosote Syndrome" @@ -22,7 +20,7 @@ badness = EFFECT_DANGER_HARMFUL /datum/symptom/minttoxin/activate(mob/living/carbon/mob) - if(istype(mob) && mob.reagents.get_reagent_amount(/datum/reagent/consumable/mintextract) < 5) + if(istype(mob) && mob.reagents?.get_reagent_amount(/datum/reagent/consumable/mintextract) < 5) to_chat(mob, span_notice("You feel a minty freshness")) mob.reagents.add_reagent(/datum/reagent/consumable/mintextract, 5) @@ -46,11 +44,10 @@ // Just absolutely murder me man ears.apply_organ_damage(ears.maxHealth) mob.emote("scream") - ADD_TRAIT(mob, TRAIT_DEAF, DISEASE_TRAIT) + ADD_TRAIT(mob, TRAIT_DEAF, type) /datum/symptom/deaf/deactivate(mob/living/carbon/mob) - REMOVE_TRAIT(mob, TRAIT_DEAF, DISEASE_TRAIT) - + REMOVE_TRAIT(mob, TRAIT_DEAF, type) /datum/symptom/killertoxins name = "Toxification Syndrome" @@ -61,8 +58,7 @@ max_multiplier = 5 /datum/symptom/killertoxins/activate(mob/living/carbon/mob) - mob.adjustToxLoss(5*multiplier) - + mob.adjustToxLoss(5 * multiplier) /datum/symptom/dna name = "Reverse Pattern Syndrome" @@ -73,9 +69,8 @@ /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) - + if(mob.toxloss <= 50) + mob.adjustToxLoss(10) /datum/symptom/immortal name = "Longevity Syndrome" @@ -85,29 +80,28 @@ var/total_healed = 0 /datum/symptom/immortal/activate(mob/living/carbon/mob) - if(istype(mob, /mob/living/carbon/human)) + if(ishuman(mob)) for(var/datum/wound/wound as anything in mob.all_wounds) to_chat(mob, span_notice("You feel the [wound] heal itself.")) wound.remove_wound() break - var/heal_amt = 5*multiplier + var/heal_amt = 5 * multiplier var/current_health = mob.getBruteLoss() if(current_health >= heal_amt) total_healed += heal_amt * 0.2 else total_healed += (heal_amt - current_health) * 0.2 - mob.adjustBruteLoss(-heal_amt) - mob.adjustFireLoss(-heal_amt) - mob.adjustCloneLoss(-heal_amt) + mob.heal_overall_damage(brute = heal_amt, burn = heal_amt) + mob.adjustToxLoss(-heal_amt) /datum/symptom/immortal/deactivate(mob/living/carbon/mob) - if(istype(mob, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = mob - to_chat(H, span_warning("You suddenly feel hurt and old...")) - H.age += 4 * multiplier * total_healed - mob.adjustBruteLoss(total_healed) - mob.adjustFireLoss(total_healed) + if(ishuman(mob)) + var/mob/living/carbon/human/person = mob + to_chat(person, span_warning("You suddenly feel hurt and old...")) + person.age += 4 * multiplier * total_healed + if(total_healed > 0) + mob.take_overall_damage(brute = (total_healed / 2), burn = (total_healed / 2)) /datum/symptom/bones name = "Fragile Person Syndrome" @@ -115,17 +109,17 @@ stage = 4 badness = EFFECT_DANGER_HINDRANCE -/datum/symptom/bones/activate(mob/living/carbon/mob) - if(istype(mob, /mob/living/carbon/human)) - var/mob/living/carbon/human/victim = mob - for (var/obj/item/bodypart/part in victim.bodyparts) - part.wound_resistance -= 10 +/datum/symptom/bones/activate(mob/living/carbon/human/victim) + if(!ishuman(victim)) + return + for(var/obj/item/bodypart/part in victim.bodyparts) + part.wound_resistance -= 10 -/datum/symptom/bones/deactivate(mob/living/carbon/mob) - if(istype(mob, /mob/living/carbon/human)) - var/mob/living/carbon/human/victim = mob - for (var/obj/item/bodypart/part in victim.bodyparts) - part.wound_resistance += 10 +/datum/symptom/bones/deactivate(mob/living/carbon/human/victim) + if(!ishuman(victim)) + return + for(var/obj/item/bodypart/part in victim.bodyparts) + part.wound_resistance += 10 /datum/symptom/fizzle name = "Fizzle Effect" @@ -134,7 +128,7 @@ badness = EFFECT_DANGER_FLAVOR /datum/symptom/fizzle/activate(mob/living/carbon/mob) - mob.emote("me",1,pick("sniffles...", "clears their throat...")) + mob.emote("me", 1, pick("sniffles...", "clears their throat...")) /datum/symptom/delightful name = "Delightful Effect" @@ -144,7 +138,7 @@ /datum/symptom/delightful/activate(mob/living/carbon/mob) to_chat(mob, "You feel delightful!") - if (mob.reagents.get_reagent_amount(/datum/reagent/drug/happiness) < 5) + if (mob.reagents?.get_reagent_amount(/datum/reagent/drug/happiness) < 5) mob.reagents.add_reagent(/datum/reagent/drug/happiness, 10) /datum/symptom/spawn @@ -153,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) + 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]!") + 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() @@ -172,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" @@ -218,17 +229,18 @@ var/intensity = 1 + (count > 10) + (count > 20) if (prob(20)) to_chat(mob, span_warning("You feel a [intensity < 3 ? "slight" : "powerful"] shock course through your body.")) - for(var/obj/M in orange(3 * intensity,mob)) - if(!M.anchored) - var/iter = rand(1,intensity) - for(var/i=0,i
[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/code/random_rooms/engines/boxstation.dm b/monkestation/code/random_rooms/engines/boxstation.dm index cb1e0e3efe9a..a62661e1c878 100644 --- a/monkestation/code/random_rooms/engines/boxstation.dm +++ b/monkestation/code/random_rooms/engines/boxstation.dm @@ -26,5 +26,15 @@ centerspawner = FALSE template_height = 26 template_width = 29 - weight = 4 // Should probably be rarer than the other two engines. + weight = 8 + station_name = "Box Station" + +/datum/map_template/random_room/random_engines/box_sm_teg + name = "Box SM TEG Engine" + room_id = "box_sm_teg" + mappath = "_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm" + centerspawner = FALSE + template_height = 26 + template_width = 29 + weight = 6 station_name = "Box Station" 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/monkestation/icons/bloodsuckers/actions_bloodsucker.dmi b/monkestation/icons/bloodsuckers/actions_bloodsucker.dmi index 901589214ea2..6d9b2d5dd6ef 100644 Binary files a/monkestation/icons/bloodsuckers/actions_bloodsucker.dmi and b/monkestation/icons/bloodsuckers/actions_bloodsucker.dmi differ diff --git a/monkestation/icons/mob/clothing/back.dmi b/monkestation/icons/mob/clothing/back.dmi index 169859c9430b..45c1a44aa2a1 100644 Binary files a/monkestation/icons/mob/clothing/back.dmi and b/monkestation/icons/mob/clothing/back.dmi differ diff --git a/monkestation/icons/mob/clothing/feet.dmi b/monkestation/icons/mob/clothing/feet.dmi index c08c98c308e6..9b631b7efa4b 100644 Binary files a/monkestation/icons/mob/clothing/feet.dmi and b/monkestation/icons/mob/clothing/feet.dmi differ diff --git a/monkestation/icons/mob/clothing/gloves.dmi b/monkestation/icons/mob/clothing/gloves.dmi index 28b988f4927d..93cd30ded95c 100644 Binary files a/monkestation/icons/mob/clothing/gloves.dmi and b/monkestation/icons/mob/clothing/gloves.dmi differ diff --git a/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi b/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi index 23851baead1d..14d91e6e4760 100644 Binary files a/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi and b/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi differ diff --git a/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi b/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi index 06b8ee2be81e..5767d0d79eac 100644 Binary files a/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi and b/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi differ diff --git a/monkestation/icons/mob/clothing/head.dmi b/monkestation/icons/mob/clothing/head.dmi index 7143b2dae137..11e0cab2653f 100644 Binary files a/monkestation/icons/mob/clothing/head.dmi and b/monkestation/icons/mob/clothing/head.dmi differ diff --git a/monkestation/icons/mob/clothing/head/bio.dmi b/monkestation/icons/mob/clothing/head/bio.dmi new file mode 100644 index 000000000000..0d96ef13e192 Binary files /dev/null and b/monkestation/icons/mob/clothing/head/bio.dmi differ diff --git a/monkestation/icons/mob/clothing/species/suit_digi.dmi b/monkestation/icons/mob/clothing/species/suit_digi.dmi index 392e8319d99c..de208936bc37 100644 Binary files a/monkestation/icons/mob/clothing/species/suit_digi.dmi and b/monkestation/icons/mob/clothing/species/suit_digi.dmi differ diff --git a/monkestation/icons/mob/clothing/suit.dmi b/monkestation/icons/mob/clothing/suit.dmi index 4536c506ca6d..2cde5c4b4c8e 100644 Binary files a/monkestation/icons/mob/clothing/suit.dmi and b/monkestation/icons/mob/clothing/suit.dmi differ diff --git a/monkestation/icons/mob/clothing/suits/bio.dmi b/monkestation/icons/mob/clothing/suits/bio.dmi new file mode 100644 index 000000000000..21ea4945074b Binary files /dev/null and b/monkestation/icons/mob/clothing/suits/bio.dmi differ diff --git a/monkestation/icons/mob/clothing/uniform.dmi b/monkestation/icons/mob/clothing/uniform.dmi index a4fed470b119..09dec7b67866 100644 Binary files a/monkestation/icons/mob/clothing/uniform.dmi and b/monkestation/icons/mob/clothing/uniform.dmi differ diff --git a/monkestation/icons/mob/inhands/equipment/shields_lefthand.dmi b/monkestation/icons/mob/inhands/equipment/shields_lefthand.dmi new file mode 100644 index 000000000000..9d68d9bc028d Binary files /dev/null and b/monkestation/icons/mob/inhands/equipment/shields_lefthand.dmi differ diff --git a/monkestation/icons/mob/inhands/equipment/shields_righthand.dmi b/monkestation/icons/mob/inhands/equipment/shields_righthand.dmi new file mode 100644 index 000000000000..e3712b9bd95d Binary files /dev/null and b/monkestation/icons/mob/inhands/equipment/shields_righthand.dmi differ diff --git a/monkestation/icons/mob/landmarks.dmi b/monkestation/icons/mob/landmarks.dmi index 534d291e79b3..b6ed3d6442b4 100644 Binary files a/monkestation/icons/mob/landmarks.dmi and b/monkestation/icons/mob/landmarks.dmi differ diff --git a/monkestation/icons/mob/ranching/chickens.dmi b/monkestation/icons/mob/ranching/chickens.dmi index cd3df5dbb9d7..e9eb66bc4104 100644 Binary files a/monkestation/icons/mob/ranching/chickens.dmi and b/monkestation/icons/mob/ranching/chickens.dmi differ diff --git a/monkestation/icons/obj/clothing/bomb_vest.dmi b/monkestation/icons/obj/clothing/bomb_vest.dmi new file mode 100644 index 000000000000..4a3b0cd1c8a4 Binary files /dev/null and b/monkestation/icons/obj/clothing/bomb_vest.dmi differ diff --git a/monkestation/icons/obj/clothing/eyes.dmi b/monkestation/icons/obj/clothing/eyes.dmi new file mode 100644 index 000000000000..dd404ec95c06 Binary files /dev/null and b/monkestation/icons/obj/clothing/eyes.dmi differ diff --git a/monkestation/icons/obj/clothing/glasses.dmi b/monkestation/icons/obj/clothing/glasses.dmi index 9bc84d0e2f75..0bec1b4941e0 100644 Binary files a/monkestation/icons/obj/clothing/glasses.dmi and b/monkestation/icons/obj/clothing/glasses.dmi differ diff --git a/monkestation/icons/obj/clothing/gloves.dmi b/monkestation/icons/obj/clothing/gloves.dmi index 30d92013e3d2..3fa4376f4f96 100644 Binary files a/monkestation/icons/obj/clothing/gloves.dmi and b/monkestation/icons/obj/clothing/gloves.dmi differ diff --git a/monkestation/icons/obj/clothing/hardsuits/helmet.dmi b/monkestation/icons/obj/clothing/hardsuits/helmet.dmi index 5132e21fb006..8a9ae453d94d 100644 Binary files a/monkestation/icons/obj/clothing/hardsuits/helmet.dmi and b/monkestation/icons/obj/clothing/hardsuits/helmet.dmi differ diff --git a/monkestation/icons/obj/clothing/hardsuits/suit.dmi b/monkestation/icons/obj/clothing/hardsuits/suit.dmi index c86f9072c170..d94809069857 100644 Binary files a/monkestation/icons/obj/clothing/hardsuits/suit.dmi and b/monkestation/icons/obj/clothing/hardsuits/suit.dmi differ diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi index 8d039b341602..cd931ae1a7ec 100644 Binary files a/monkestation/icons/obj/clothing/hats.dmi and b/monkestation/icons/obj/clothing/hats.dmi differ diff --git a/monkestation/icons/obj/clothing/head/bio.dmi b/monkestation/icons/obj/clothing/head/bio.dmi new file mode 100644 index 000000000000..1cfd3c66d180 Binary files /dev/null and b/monkestation/icons/obj/clothing/head/bio.dmi differ diff --git a/monkestation/icons/obj/clothing/shoes.dmi b/monkestation/icons/obj/clothing/shoes.dmi index e0924e8e0ade..4a24deda042d 100644 Binary files a/monkestation/icons/obj/clothing/shoes.dmi and b/monkestation/icons/obj/clothing/shoes.dmi differ diff --git a/monkestation/icons/obj/clothing/suits.dmi b/monkestation/icons/obj/clothing/suits.dmi index 2ec9a3624132..38449150fcb3 100644 Binary files a/monkestation/icons/obj/clothing/suits.dmi and b/monkestation/icons/obj/clothing/suits.dmi differ diff --git a/monkestation/icons/obj/clothing/suits/bio.dmi b/monkestation/icons/obj/clothing/suits/bio.dmi new file mode 100644 index 000000000000..a14fd71a3cf4 Binary files /dev/null and b/monkestation/icons/obj/clothing/suits/bio.dmi differ diff --git a/monkestation/icons/obj/clothing/uniforms.dmi b/monkestation/icons/obj/clothing/uniforms.dmi index b08cdc09b81f..ed47123806de 100644 Binary files a/monkestation/icons/obj/clothing/uniforms.dmi and b/monkestation/icons/obj/clothing/uniforms.dmi differ diff --git a/monkestation/icons/obj/flora/glowshroom.dmi b/monkestation/icons/obj/flora/glowshroom.dmi new file mode 100644 index 000000000000..620c30bf17a9 Binary files /dev/null and b/monkestation/icons/obj/flora/glowshroom.dmi differ diff --git a/monkestation/icons/obj/machines/composter.dmi b/monkestation/icons/obj/machines/composter.dmi index ba6ad5164342..1cf3be3edd20 100644 Binary files a/monkestation/icons/obj/machines/composter.dmi and b/monkestation/icons/obj/machines/composter.dmi differ diff --git a/monkestation/icons/obj/misc.dmi b/monkestation/icons/obj/misc.dmi index 533da229a7f6..de6db8e4f600 100644 Binary files a/monkestation/icons/obj/misc.dmi and b/monkestation/icons/obj/misc.dmi differ diff --git a/monkestation/icons/obj/plushes.dmi b/monkestation/icons/obj/plushes.dmi index 4cb4460acd35..403c3975726d 100644 Binary files a/monkestation/icons/obj/plushes.dmi and b/monkestation/icons/obj/plushes.dmi differ diff --git a/monkestation/icons/obj/weapons/guns/projectiles.dmi b/monkestation/icons/obj/weapons/guns/projectiles.dmi new file mode 100644 index 000000000000..69dbc9a4ffa2 Binary files /dev/null and b/monkestation/icons/obj/weapons/guns/projectiles.dmi differ diff --git a/monkestation/icons/obj/weapons/shields.dmi b/monkestation/icons/obj/weapons/shields.dmi new file mode 100644 index 000000000000..c7aa290346f6 Binary files /dev/null and b/monkestation/icons/obj/weapons/shields.dmi differ diff --git a/monkestation/sound/effects/hl2/button-click.ogg b/monkestation/sound/effects/hl2/button-click.ogg new file mode 100644 index 000000000000..c91ba47e3454 Binary files /dev/null and b/monkestation/sound/effects/hl2/button-click.ogg differ diff --git a/monkestation/sound/effects/hl2/button-fail.ogg b/monkestation/sound/effects/hl2/button-fail.ogg new file mode 100644 index 000000000000..b19436b4ac76 Binary files /dev/null and b/monkestation/sound/effects/hl2/button-fail.ogg differ diff --git a/monkestation/sound/effects/hl2/lightswitch.ogg b/monkestation/sound/effects/hl2/lightswitch.ogg new file mode 100644 index 000000000000..355946f4f3f9 Binary files /dev/null and b/monkestation/sound/effects/hl2/lightswitch.ogg differ diff --git a/monkestation/sound/voice/durrcell-squeak.ogg b/monkestation/sound/voice/durrcell-squeak.ogg new file mode 100644 index 000000000000..74d0750210f3 Binary files /dev/null and b/monkestation/sound/voice/durrcell-squeak.ogg differ diff --git a/monkestation/sound/voice/feline/funnymeow.ogg b/monkestation/sound/voice/feline/funnymeow.ogg new file mode 100644 index 000000000000..5a3ce12cf7fb Binary files /dev/null and b/monkestation/sound/voice/feline/funnymeow.ogg differ diff --git a/monkestation/sound/voice/feline/mggaow.ogg b/monkestation/sound/voice/feline/mggaow.ogg new file mode 100644 index 000000000000..7ffddbdf60ee Binary files /dev/null and b/monkestation/sound/voice/feline/mggaow.ogg differ diff --git a/monkestation/sound/voice/feline/purr.ogg b/monkestation/sound/voice/feline/purr.ogg new file mode 100644 index 000000000000..c04d58ce2388 Binary files /dev/null and b/monkestation/sound/voice/feline/purr.ogg differ diff --git a/monkestation/sound/voice/speen.ogg b/monkestation/sound/voice/speen.ogg new file mode 100644 index 000000000000..2c7eecaae3e3 Binary files /dev/null and b/monkestation/sound/voice/speen.ogg differ 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/sound/magic/staff_shrink.ogg b/sound/magic/staff_shrink.ogg new file mode 100644 index 000000000000..f2268130fd81 Binary files /dev/null and b/sound/magic/staff_shrink.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 746301676fe2..03945169b298 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -115,6 +115,7 @@ #include "code\__DEFINES\ghost.dm" #include "code\__DEFINES\gravity.dm" #include "code\__DEFINES\guardian_defines.dm" +#include "code\__DEFINES\holiday.dm" #include "code\__DEFINES\holopads.dm" #include "code\__DEFINES\hud.dm" #include "code\__DEFINES\icon_smoothing.dm" @@ -158,6 +159,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" @@ -226,6 +228,7 @@ #include "code\__DEFINES\species_clothing_paths.dm" #include "code\__DEFINES\speech_channels.dm" #include "code\__DEFINES\speech_controller.dm" +#include "code\__DEFINES\sprite_accessories.dm" #include "code\__DEFINES\stack_trace.dm" #include "code\__DEFINES\stamina.dm" #include "code\__DEFINES\stat.dm" @@ -249,7 +252,6 @@ #include "code\__DEFINES\tools.dm" #include "code\__DEFINES\toys.dm" #include "code\__DEFINES\trader.dm" -#include "code\__DEFINES\traits.dm" #include "code\__DEFINES\tram.dm" #include "code\__DEFINES\turbine_defines.dm" #include "code\__DEFINES\turfs.dm" @@ -383,6 +385,12 @@ #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_spawner.dm" #include "code\__DEFINES\research\anomalies.dm" #include "code\__DEFINES\research\research_categories.dm" +#include "code\__DEFINES\traits\_traits.dm" +#include "code\__DEFINES\traits\declarations.dm" +#include "code\__DEFINES\traits\macros.dm" +#include "code\__DEFINES\traits\sources.dm" +#include "code\__DEFINES\traits\monkestation\declarations.dm" +#include "code\__DEFINES\traits\monkestation\sources.dm" #include "code\__DEFINES\~monkestation\_patreon.dm" #include "code\__DEFINES\~monkestation\abberant_organs.dm" #include "code\__DEFINES\~monkestation\access.dm" @@ -400,7 +408,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" @@ -410,15 +420,18 @@ #include "code\__DEFINES\~monkestation\cooldowns.dm" #include "code\__DEFINES\~monkestation\cybernetics.dm" #include "code\__DEFINES\~monkestation\DNA.dm" +#include "code\__DEFINES\~monkestation\elevation.dm" #include "code\__DEFINES\~monkestation\factions.dm" #include "code\__DEFINES\~monkestation\guns.dm" #include "code\__DEFINES\~monkestation\hacking.dm" #include "code\__DEFINES\~monkestation\holomaps.dm" #include "code\__DEFINES\~monkestation\interaction_particles.dm" #include "code\__DEFINES\~monkestation\ipcs.dm" +#include "code\__DEFINES\~monkestation\is_helpers.dm" #include "code\__DEFINES\~monkestation\jobs.dm" #include "code\__DEFINES\~monkestation\keybinding.dm" #include "code\__DEFINES\~monkestation\level_traits.dm" +#include "code\__DEFINES\~monkestation\living.dm" #include "code\__DEFINES\~monkestation\logging.dm" #include "code\__DEFINES\~monkestation\maps.dm" #include "code\__DEFINES\~monkestation\market.dm" @@ -431,6 +444,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" @@ -439,11 +453,11 @@ #include "code\__DEFINES\~monkestation\skills.dm" #include "code\__DEFINES\~monkestation\slimes.dm" #include "code\__DEFINES\~monkestation\smoothing.dm" +#include "code\__DEFINES\~monkestation\sounds.dm" #include "code\__DEFINES\~monkestation\span.dm" #include "code\__DEFINES\~monkestation\status_effects.dm" #include "code\__DEFINES\~monkestation\storytellers.dm" #include "code\__DEFINES\~monkestation\time.dm" -#include "code\__DEFINES\~monkestation\traits.dm" #include "code\__DEFINES\~monkestation\twitch.dm" #include "code\__DEFINES\~monkestation\uplink.dm" #include "code\__DEFINES\~monkestation\virology.dm" @@ -451,8 +465,10 @@ #include "code\__DEFINES\~monkestation\dcs\signals\signals_blueshift.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_carbon.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_element.dm" +#include "code\__DEFINES\~monkestation\dcs\signals\signals_food.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_guns.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_item.dm" +#include "code\__DEFINES\~monkestation\dcs\signals\signals_object.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_traitor.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_mob\signals_mob_main.dm" #include "code\__HELPERS\_auxtools_api.dm" @@ -575,7 +591,9 @@ #include "code\__HELPERS\~monkestation-helpers\clients.dm" #include "code\__HELPERS\~monkestation-helpers\cmp.dm" #include "code\__HELPERS\~monkestation-helpers\icon_smoothing.dm" +#include "code\__HELPERS\~monkestation-helpers\icons.dm" #include "code\__HELPERS\~monkestation-helpers\mapping.dm" +#include "code\__HELPERS\~monkestation-helpers\mobs.dm" #include "code\__HELPERS\~monkestation-helpers\roundend.dm" #include "code\__HELPERS\~monkestation-helpers\time.dm" #include "code\__HELPERS\~monkestation-helpers\virology.dm" @@ -593,7 +611,6 @@ #include "code\_globalvars\religion.dm" #include "code\_globalvars\tgui.dm" #include "code\_globalvars\time_vars.dm" -#include "code\_globalvars\traits.dm" #include "code\_globalvars\lists\achievements.dm" #include "code\_globalvars\lists\ambience.dm" #include "code\_globalvars\lists\client.dm" @@ -605,12 +622,14 @@ #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" #include "code\_globalvars\lists\typecache.dm" #include "code\_globalvars\lists\wiremod.dm" #include "code\_globalvars\lists\xenobiology.dm" +#include "code\_globalvars\traits\_traits.dm" #include "code\_globalvars\~monkestation\lists\colors.dm" #include "code\_globalvars\~monkestation\lists\flavor_misc.dm" #include "code\_globalvars\~monkestation\lists\holomap.dm" @@ -898,6 +917,7 @@ #include "code\datums\actions\mobs\meteors.dm" #include "code\datums\actions\mobs\mobcooldown.dm" #include "code\datums\actions\mobs\open_mob_commands.dm" +#include "code\datums\actions\mobs\personality_commune.dm" #include "code\datums\actions\mobs\projectileattack.dm" #include "code\datums\actions\mobs\sign_language.dm" #include "code\datums\actions\mobs\sneak.dm" @@ -1064,6 +1084,7 @@ #include "code\datums\components\beetlejuice.dm" #include "code\datums\components\blob_minion.dm" #include "code\datums\components\blood_walk.dm" +#include "code\datums\components\bloody_spreader.dm" #include "code\datums\components\bloodysoles.dm" #include "code\datums\components\boomerang.dm" #include "code\datums\components\breeding.dm" @@ -1350,6 +1371,7 @@ #include "code\datums\elements\blocks_explosives.dm" #include "code\datums\elements\bonus_damage.dm" #include "code\datums\elements\bsa_blocker.dm" +#include "code\datums\elements\bugkiller_reagent.dm" #include "code\datums\elements\bump_click.dm" #include "code\datums\elements\can_barricade.dm" #include "code\datums\elements\chemical_transfer.dm" @@ -1905,6 +1927,7 @@ #include "code\game\machinery\dna_infuser\organ_sets\goliath_organs.dm" #include "code\game\machinery\dna_infuser\organ_sets\gondola_organs.dm" #include "code\game\machinery\dna_infuser\organ_sets\rat_organs.dm" +#include "code\game\machinery\dna_infuser\organ_sets\roach_organs.dm" #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_electronics.dm" #include "code\game\machinery\doors\airlock_types.dm" @@ -2338,7 +2361,6 @@ #include "code\game\objects\items\storage\bags.dm" #include "code\game\objects\items\storage\basket.dm" #include "code\game\objects\items\storage\belt.dm" -#include "code\game\objects\items\storage\book.dm" #include "code\game\objects\items\storage\briefcase.dm" #include "code\game\objects\items\storage\fancy.dm" #include "code\game\objects\items\storage\garment.dm" @@ -2568,7 +2590,6 @@ #include "code\modules\admin\force_event.dm" #include "code\modules\admin\fun_balloon.dm" #include "code\modules\admin\greyscale_modify_menu.dm" -#include "code\modules\admin\hardelete_toggle.dm" #include "code\modules\admin\holder2.dm" #include "code\modules\admin\ipintel.dm" #include "code\modules\admin\IsBanned.dm" @@ -3607,7 +3628,6 @@ #include "code\modules\escape_menu\title.dm" #include "code\modules\events\_event.dm" #include "code\modules\events\_event_admin_setup.dm" -#include "code\modules\events\artifact_spawn.dm" #include "code\modules\events\aurora_caelus.dm" #include "code\modules\events\brain_trauma.dm" #include "code\modules\events\brand_intelligence.dm" @@ -4064,7 +4084,9 @@ #include "code\modules\language\xenocommon.dm" #include "code\modules\library\admin_only.dm" #include "code\modules\library\barcode_scanner.dm" +#include "code\modules\library\bibles.dm" #include "code\modules\library\book.dm" +#include "code\modules\library\book_info.dm" #include "code\modules\library\bookcase.dm" #include "code\modules\library\lib_codex_gigas.dm" #include "code\modules\library\lib_machines.dm" @@ -5355,6 +5377,7 @@ #include "code\modules\spells\spell_types\pointed\spell_cards.dm" #include "code\modules\spells\spell_types\pointed\swap.dm" #include "code\modules\spells\spell_types\pointed\terrorize.dm" +#include "code\modules\spells\spell_types\pointed\tie_shoes.dm" #include "code\modules\spells\spell_types\projectile\_basic_projectile.dm" #include "code\modules\spells\spell_types\projectile\juggernaut.dm" #include "code\modules\spells\spell_types\self\basic_heal.dm" @@ -5364,7 +5387,6 @@ #include "code\modules\spells\spell_types\self\lichdom.dm" #include "code\modules\spells\spell_types\self\mime_vow.dm" #include "code\modules\spells\spell_types\self\mutate.dm" -#include "code\modules\spells\spell_types\self\personality_commune.dm" #include "code\modules\spells\spell_types\self\rod_form.dm" #include "code\modules\spells\spell_types\self\sanguine_strike.dm" #include "code\modules\spells\spell_types\self\smoke.dm" @@ -5441,8 +5463,8 @@ #include "code\modules\surgery\bodyparts\_bodyparts.dm" #include "code\modules\surgery\bodyparts\digitigrade.dm" #include "code\modules\surgery\bodyparts\dismemberment.dm" -#include "code\modules\surgery\bodyparts\hair.dm" #include "code\modules\surgery\bodyparts\head.dm" +#include "code\modules\surgery\bodyparts\head_hair_and_lips.dm" #include "code\modules\surgery\bodyparts\helpers.dm" #include "code\modules\surgery\bodyparts\parts.dm" #include "code\modules\surgery\bodyparts\robot_bodyparts.dm" @@ -5613,6 +5635,7 @@ #include "code\modules\vending\modularpc.dm" #include "code\modules\vending\nutrimax.dm" #include "code\modules\vending\plasmaresearch.dm" +#include "code\modules\vending\plushvendor.dm" #include "code\modules\vending\robotics.dm" #include "code\modules\vending\security.dm" #include "code\modules\vending\snack.dm" @@ -5779,8 +5802,10 @@ #include "monkestation\code\__HELPERS\turfs.dm" #include "monkestation\code\_onclick\hud\alert.dm" #include "monkestation\code\area\areas\direction_names.dm" +#include "monkestation\code\area\areas\ruins.dm" #include "monkestation\code\area\areas\station.dm" #include "monkestation\code\controllers\subsystem\economy.dm" +#include "monkestation\code\controllers\subsystem\glowshroom.dm" #include "monkestation\code\controllers\subsystem\job.dm" #include "monkestation\code\datums\action.dm" #include "monkestation\code\datums\dna.dm" @@ -5799,13 +5824,17 @@ #include "monkestation\code\datums\ai_laws\laws_monke.dm" #include "monkestation\code\datums\announcers\dagoth.dm" #include "monkestation\code\datums\announcers\duke.dm" +#include "monkestation\code\datums\armor\_armor.dm" #include "monkestation\code\datums\brain_damage\magic.dm" #include "monkestation\code\datums\brain_damage\phobia.dm" #include "monkestation\code\datums\changelog\changelog.dm" #include "monkestation\code\datums\components\carbon_sprint.dm" +#include "monkestation\code\datums\components\charge_adjuster.dm" #include "monkestation\code\datums\components\crafting.dm" #include "monkestation\code\datums\components\irradiated.dm" +#include "monkestation\code\datums\components\lock_on_cursor.dm" #include "monkestation\code\datums\components\multi_hit.dm" +#include "monkestation\code\datums\components\pixel_shift.dm" #include "monkestation\code\datums\components\throw_bounce.dm" #include "monkestation\code\datums\components\turf_checker_complex.dm" #include "monkestation\code\datums\components\turf_healing.dm" @@ -5843,6 +5872,7 @@ #include "monkestation\code\game\machinery\_machinery.dm" #include "monkestation\code\game\machinery\announcement_system.dm" #include "monkestation\code\game\machinery\cloning.dm" +#include "monkestation\code\game\machinery\deployable.dm" #include "monkestation\code\game\machinery\exp_cloner.dm" #include "monkestation\code\game\machinery\launch_pad.dm" #include "monkestation\code\game\machinery\player_hologram.dm" @@ -5855,6 +5885,8 @@ #include "monkestation\code\game\machinery\trains\train_network.dm" #include "monkestation\code\game\objects\items.dm" #include "monkestation\code\game\objects\effects\countdown.dm" +#include "monkestation\code\game\objects\effects\forcefields.dm" +#include "monkestation\code\game\objects\effects\glowshroom.dm" #include "monkestation\code\game\objects\effects\landmark.dm" #include "monkestation\code\game\objects\effects\sprint_dust.dm" #include "monkestation\code\game\objects\effects\anomalies\_anomalies.dm" @@ -5868,6 +5900,7 @@ #include "monkestation\code\game\objects\items\choice_beacon.dm" #include "monkestation\code\game\objects\items\cigs_lighters.dm" #include "monkestation\code\game\objects\items\cirno_plush.dm" +#include "monkestation\code\game\objects\items\emags.dm" #include "monkestation\code\game\objects\items\gravity_gun.dm" #include "monkestation\code\game\objects\items\jukebox_beacon.dm" #include "monkestation\code\game\objects\items\miningweapons.dm" @@ -5921,6 +5954,7 @@ #include "monkestation\code\game\objects\items\storage\garment.dm" #include "monkestation\code\game\objects\items\storage\uplink_kits.dm" #include "monkestation\code\game\objects\items\storage\boxes\security_boxes.dm" +#include "monkestation\code\game\objects\structures\elevation.dm" #include "monkestation\code\game\objects\structures\tables_racks.dm" #include "monkestation\code\game\objects\structures\window.dm" #include "monkestation\code\game\objects\structures\beds_chairs\chair.dm" @@ -5932,6 +5966,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" @@ -5945,6 +5985,7 @@ #include "monkestation\code\modules\admin\antag_tokens.dm" #include "monkestation\code\modules\admin\camera_view.dm" #include "monkestation\code\modules\admin\event_tokens.dm" +#include "monkestation\code\modules\admin\smites\choke_on_this.dm" #include "monkestation\code\modules\admin\smites\dagothkillsmite.dm" #include "monkestation\code\modules\admin\smites\dagothstripsmite.dm" #include "monkestation\code\modules\admin\smites\phobia_christian_minecraft.dm" @@ -5954,6 +5995,7 @@ #include "monkestation\code\modules\admin\verbs\kick_player_by_ckey.dm" #include "monkestation\code\modules\admin\verbs\selectequipment.dm" #include "monkestation\code\modules\admin\verbs\spawn_mixtape.dm" +#include "monkestation\code\modules\admin\verbs\traits.dm" #include "monkestation\code\modules\aesthetics\airlock\airlock.dm" #include "monkestation\code\modules\aesthetics\items\clothing.dm" #include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm" @@ -5967,6 +6009,7 @@ #include "monkestation\code\modules\antagonists\_common\antag_datum.dm" #include "monkestation\code\modules\antagonists\_common\antag_hud.dm" #include "monkestation\code\modules\antagonists\abductor\abductor.dm" +#include "monkestation\code\modules\antagonists\abductor\equipment\gear\abductor_items.dm" #include "monkestation\code\modules\antagonists\abductor\equipment\glands\blood.dm" #include "monkestation\code\modules\antagonists\abductor\equipment\glands\plasma.dm" #include "monkestation\code\modules\antagonists\abductor\equipment\glands\slime.dm" @@ -6017,6 +6060,7 @@ #include "monkestation\code\modules\antagonists\brother\actions\communicate.dm" #include "monkestation\code\modules\antagonists\brother\actions\gear.dm" #include "monkestation\code\modules\antagonists\brother\gear\_gear.dm" +#include "monkestation\code\modules\antagonists\brother\gear\misc.dm" #include "monkestation\code\modules\antagonists\brother\gear\recipes.dm" #include "monkestation\code\modules\antagonists\changeling\powers\tiny_prick.dm" #include "monkestation\code\modules\antagonists\clock_cult\area.dm" @@ -6144,29 +6188,17 @@ #include "monkestation\code\modules\antagonists\florida_man\florida_events.dm" #include "monkestation\code\modules\antagonists\florida_man\florida_spells.dm" #include "monkestation\code\modules\antagonists\florida_man\supplypods.dm" +#include "monkestation\code\modules\antagonists\heretic\heretic_antag.dm" +#include "monkestation\code\modules\antagonists\heretic\heretic_living_heart.dm" +#include "monkestation\code\modules\antagonists\heretic\heretic_monsters.dm" #include "monkestation\code\modules\antagonists\heretic\items\forbidden_book.dm" #include "monkestation\code\modules\antagonists\heretic\items\heretic_armor.dm" #include "monkestation\code\modules\antagonists\heretic\knowledge\ash_lore.dm" #include "monkestation\code\modules\antagonists\heretic\knowledge\rust_lore.dm" #include "monkestation\code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_buff.dm" +#include "monkestation\code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_knowledge.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" @@ -6176,6 +6208,8 @@ #include "monkestation\code\modules\antagonists\traitor\objectives\final_objective\final_objective.dm" #include "monkestation\code\modules\antagonists\wizard\wizard.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\artefact.dm" +#include "monkestation\code\modules\antagonists\wizard\equipment\mirror_shield.dm" +#include "monkestation\code\modules\antagonists\wizard\equipment\wizard_spellbook.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\defensive.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\mobility.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\offensive.dm" @@ -6185,6 +6219,7 @@ #include "monkestation\code\modules\antimatter\code\control.dm" #include "monkestation\code\modules\antimatter\code\shielding.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_origins.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_proto_datums.dm" #include "monkestation\code\modules\art_sci_overrides\generic_artifact_objects.dm" #include "monkestation\code\modules\art_sci_overrides\globals.dm" #include "monkestation\code\modules\art_sci_overrides\item_stimuli.dm" @@ -6195,23 +6230,36 @@ #include "monkestation\code\modules\art_sci_overrides\artifact_components\_base_component.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\_base_component_signal_procs.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_components\_base_subtype_helpers.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\bomb.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\bonk.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\borger.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\cell.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\emoter.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\forcegen.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\gun.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\heal.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\injector.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\lamp.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\melee.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\repulsor.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\smoke_artifacts.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\surgery.dm" -#include "monkestation\code\modules\art_sci_overrides\artifact_components\vomit.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_components\ghost_object.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\_artifact_effect.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\bomb.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\bonk.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\borger.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\bread.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\cell.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\cleaning.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\emoter.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\false_rod.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\forcegen.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\gun.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\heal.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\injector.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\itsasecret.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\lamp.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\meat.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\melee.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\money.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\narsieoffering.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\plushie_vendor.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\repulsor.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\smoke_artifacts.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\surgery.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_effects\vomit.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_cell.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_effect_disk.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_gun.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_item.dm" +#include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_manipulators.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_items\artifact_melee.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_objects\artifact_powergen.dm" #include "monkestation\code\modules\art_sci_overrides\artifact_testers\analysis_form.dm" @@ -6221,13 +6269,16 @@ #include "monkestation\code\modules\art_sci_overrides\asteroids\areas.dm" #include "monkestation\code\modules\art_sci_overrides\asteroids\asteroid_generation.dm" #include "monkestation\code\modules\art_sci_overrides\asteroids\asteroid_magnet.dm" -#include "monkestation\code\modules\art_sci_overrides\asteroids\asteroid_template.dm" +#include "monkestation\code\modules\art_sci_overrides\asteroids\asteroid_templates.dm" #include "monkestation\code\modules\art_sci_overrides\asteroids\cartesian_plane.dm" -#include "monkestation\code\modules\art_sci_overrides\asteroids\simple_asteroid.dm" #include "monkestation\code\modules\art_sci_overrides\faults\_fault.dm" +#include "monkestation\code\modules\art_sci_overrides\faults\bioscrambler.dm" +#include "monkestation\code\modules\art_sci_overrides\faults\clowning.dm" #include "monkestation\code\modules\art_sci_overrides\faults\explosion.dm" +#include "monkestation\code\modules\art_sci_overrides\faults\greg.dm" #include "monkestation\code\modules\art_sci_overrides\faults\ignite.dm" #include "monkestation\code\modules\art_sci_overrides\faults\just_death.dm" +#include "monkestation\code\modules\art_sci_overrides\faults\monkey_mode.dm" #include "monkestation\code\modules\art_sci_overrides\faults\reagents.dm" #include "monkestation\code\modules\art_sci_overrides\faults\say.dm" #include "monkestation\code\modules\art_sci_overrides\faults\size_change.dm" @@ -6259,12 +6310,30 @@ #include "monkestation\code\modules\assault_ops\code\armaments\mod_modules.dm" #include "monkestation\code\modules\assault_ops\code\armaments\utility.dm" #include "monkestation\code\modules\assembly\flash.dm" +#include "monkestation\code\modules\asset_cache\assets\botanical_lexicon.dm" +#include "monkestation\code\modules\asset_cache\assets\chicken_book.dm" #include "monkestation\code\modules\atmospherics\machinery\air_alarm\air_alarm_ac.dm" #include "monkestation\code\modules\balloon_alert\balloon_alert.dm" #include "monkestation\code\modules\ballpit\ballbit_sink.dm" #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" @@ -6347,6 +6416,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" @@ -6382,7 +6463,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" @@ -6470,6 +6550,7 @@ #include "monkestation\code\modules\blueshift\items\pepperbell.dm" #include "monkestation\code\modules\blueshift\items\pizza.dm" #include "monkestation\code\modules\blueshift\items\plushies.dm" +#include "monkestation\code\modules\blueshift\items\plushieslobcorp.dm" #include "monkestation\code\modules\blueshift\items\retractable_armor.dm" #include "monkestation\code\modules\blueshift\items\skillchip.dm" #include "monkestation\code\modules\blueshift\items\soul_catcher.dm" @@ -6614,11 +6695,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" @@ -6634,6 +6793,7 @@ #include "monkestation\code\modules\cargo\crates\science.dm" #include "monkestation\code\modules\cargo\crates\security.dm" #include "monkestation\code\modules\cargo\crates\service.dm" +#include "monkestation\code\modules\cargo\mail\mail_token.dm" #include "monkestation\code\modules\cargo\markets\market_items.dm" #include "monkestation\code\modules\cargo\packs\engineering.dm" #include "monkestation\code\modules\cargo\packs\medical.dm" @@ -6686,10 +6846,13 @@ #include "monkestation\code\modules\client\preferences\species_features\lizard.dm" #include "monkestation\code\modules\client\preferences\species_features\secondary_mut_color.dm" #include "monkestation\code\modules\client\preferences\species_features\simians.dm" +#include "monkestation\code\modules\client\verbs\deadchat.dm" #include "monkestation\code\modules\client\verbs\looc.dm" +#include "monkestation\code\modules\clothing\durathread_weave.dm" #include "monkestation\code\modules\clothing\accessories\accessories.dm" #include "monkestation\code\modules\clothing\costumes\gnome.dm" #include "monkestation\code\modules\clothing\costumes\henchmen.dm" +#include "monkestation\code\modules\clothing\glasses\glasses.dm" #include "monkestation\code\modules\clothing\gloves\gloves.dm" #include "monkestation\code\modules\clothing\head\costume.dm" #include "monkestation\code\modules\clothing\head\hat.dm" @@ -6708,6 +6871,7 @@ #include "monkestation\code\modules\clothing\spacesuits\hardsuits\_hardsuit.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\_helmet.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\engineering.dm" +#include "monkestation\code\modules\clothing\spacesuits\hardsuits\heavy.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\medical.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\misc.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\science.dm" @@ -6717,6 +6881,7 @@ #include "monkestation\code\modules\clothing\suits\costume.dm" #include "monkestation\code\modules\clothing\suits\toggles.dm" #include "monkestation\code\modules\clothing\under\_under.dm" +#include "monkestation\code\modules\clothing\under\bomb_vest.dm" #include "monkestation\code\modules\clothing\under\costume.dm" #include "monkestation\code\modules\clothing\under\undersuit.dm" #include "monkestation\code\modules\clothing\under\accessories\medals.dm" @@ -6797,23 +6962,62 @@ #include "monkestation\code\modules\donator\code\item\choice_beacon.dm" #include "monkestation\code\modules\donator\code\item\clothing.dm" #include "monkestation\code\modules\donator\code\item\effects.dm" +#include "monkestation\code\modules\donator\code\item\misc.dm" #include "monkestation\code\modules\donator\code\item\plush.dm" #include "monkestation\code\modules\donator\code\mob\pets.dm" #include "monkestation\code\modules\emotes\code\emote.dm" #include "monkestation\code\modules\events\_event_admin_setup.dm" +#include "monkestation\code\modules\events\artifact_spawn.dm" #include "monkestation\code\modules\events\brand_intelligence.dm" #include "monkestation\code\modules\events\gravity_generator_blackout.dm" +#include "monkestation\code\modules\events\portal_storm.dm" #include "monkestation\code\modules\events\radiation_storm.dm" #include "monkestation\code\modules\events\scrubber_clog.dm" #include "monkestation\code\modules\events\scrubber_overflow.dm" #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" #include "monkestation\code\modules\flavor_text\flavor_text.dm" #include "monkestation\code\modules\flavor_text\pose_component.dm" +#include "monkestation\code\modules\food_and_drinks\machinery\microwave.dm" #include "monkestation\code\modules\food_and_drinks\machinery\smartfridge.dm" #include "monkestation\code\modules\food_and_drinks\recipes\boiling.dm" #include "monkestation\code\modules\food_and_drinks\recipes\recipes_meat.dm" @@ -6872,7 +7076,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" @@ -7042,9 +7245,11 @@ #include "monkestation\code\modules\mining\accelerators\repeater.dm" #include "monkestation\code\modules\mining\accelerators\shockwave.dm" #include "monkestation\code\modules\mining\accelerators\shotgun.dm" +#include "monkestation\code\modules\mining\lavaland\tendril_loot.dm" #include "monkestation\code\modules\mob\login.dm" #include "monkestation\code\modules\mob\mob.dm" #include "monkestation\code\modules\mob\mob_defines.dm" +#include "monkestation\code\modules\mob\mob_say.dm" #include "monkestation\code\modules\mob\transform_procs.dm" #include "monkestation\code\modules\mob\dead\new_player\new_player.dm" #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\_base.dm" @@ -7065,12 +7270,14 @@ #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\tails.dm" #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\underwear.dm" #include "monkestation\code\modules\mob\living\living_defines.dm" +#include "monkestation\code\modules\mob\living\living_movement.dm" #include "monkestation\code\modules\mob\living\status_procs.dm" #include "monkestation\code\modules\mob\living\basic\animatronic.dm" #include "monkestation\code\modules\mob\living\basic\bots\medbot\medbot.dm" #include "monkestation\code\modules\mob\living\basic\ggg\glerm.dm" #include "monkestation\code\modules\mob\living\basic\ggg\susflash.dm" #include "monkestation\code\modules\mob\living\basic\pets\parrot\parrot_ai\parroting_action.dm" +#include "monkestation\code\modules\mob\living\basic\trooper\syndicate.dm" #include "monkestation\code\modules\mob\living\basic\vermin\frog.dm" #include "monkestation\code\modules\mob\living\basic\vermin\mouse.dm" #include "monkestation\code\modules\mob\living\carbon\carbon.dm" @@ -7087,6 +7294,7 @@ #include "monkestation\code\modules\mob\living\carbon\human\emotes.dm" #include "monkestation\code\modules\mob\living\carbon\human\human.dm" #include "monkestation\code\modules\mob\living\carbon\human\human_defines.dm" +#include "monkestation\code\modules\mob\living\carbon\human\init_signals.dm" #include "monkestation\code\modules\mob\living\carbon\human\lizard_gags.dm" #include "monkestation\code\modules\mob\living\carbon\human\simian_gags.dm" #include "monkestation\code\modules\mob\living\carbon\human\worn_overlays.dm" @@ -7123,6 +7331,7 @@ #include "monkestation\code\modules\modular_bartending\garnishes\grown_cuts.dm" #include "monkestation\code\modules\modular_bartending\item_modifications\attack_additions.dm" #include "monkestation\code\modules\modular_bartending\item_modifications\reagent_modification.dm" +#include "monkestation\code\modules\modular_computers\computers\item\role_tablet_presets.dm" #include "monkestation\code\modules\modular_computers\file_system\programs\crewmanifest.dm" #include "monkestation\code\modules\modular_guns\__base_attachment.dm" #include "monkestation\code\modules\modular_guns\__base_modular_gun.dm" @@ -7233,7 +7442,9 @@ #include "monkestation\code\modules\overwatch\subsystem.dm" #include "monkestation\code\modules\overwatch\panels\asn_panel.dm" #include "monkestation\code\modules\overwatch\panels\whitelist_panel.dm" +#include "monkestation\code\modules\pai\card.dm" #include "monkestation\code\modules\paperwork\fax.dm" +#include "monkestation\code\modules\paperwork\filingcabinet.dm" #include "monkestation\code\modules\patches_if_they_were_cool\_base_patch_changes.dm" #include "monkestation\code\modules\physics\atom_movables.dm" #include "monkestation\code\modules\physics\physics_component.dm" @@ -7282,6 +7493,7 @@ #include "monkestation\code\modules\projectiles\guns\ballistic\revolver.dm" #include "monkestation\code\modules\projectiles\guns\ballistic\ryanecorp_whispering_jester.dm" #include "monkestation\code\modules\projectiles\guns\special\meat_hook.dm" +#include "monkestation\code\modules\projectiles\projectile\spells.dm" #include "monkestation\code\modules\projectiles\projectile\bullets\c45_caseless.dm" #include "monkestation\code\modules\ranching\_animations.dm" #include "monkestation\code\modules\ranching\chicken_book.dm" @@ -7303,6 +7515,7 @@ #include "monkestation\code\modules\ranching\chickens\ai\gary\gary_subtrees.dm" #include "monkestation\code\modules\ranching\chickens\misc\gary.dm" #include "monkestation\code\modules\ranching\chickens\misc\gary_component.dm" +#include "monkestation\code\modules\ranching\chickens\misc\gary_spawner.dm" #include "monkestation\code\modules\ranching\chickens\misc\hideout_datum.dm" #include "monkestation\code\modules\ranching\chickens\tier1\brown_chicken.dm" #include "monkestation\code\modules\ranching\chickens\tier1\chicken.dm" @@ -7521,18 +7734,22 @@ #include "monkestation\code\modules\smithing\area.dm" #include "monkestation\code\modules\smithing\anvil\anvil.dm" #include "monkestation\code\modules\smithing\anvil\recipe\_base_recipe.dm" -#include "monkestation\code\modules\smithing\anvil\recipe\swords.dm" +#include "monkestation\code\modules\smithing\anvil\recipe\armor_parts.dm" #include "monkestation\code\modules\smithing\anvil\recipe\thermal_conductor.dm" +#include "monkestation\code\modules\smithing\anvil\recipe\weapon_heads.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\_base_part.dm" +#include "monkestation\code\modules\smithing\anvil\smithed_parts\axe_blade.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\dagger_blade.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\pickaxe_head.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\rapier_blade.dm" +#include "monkestation\code\modules\smithing\anvil\smithed_parts\shields.dm" +#include "monkestation\code\modules\smithing\anvil\smithed_parts\spear_blade.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\staff_head.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\sword_blade.dm" #include "monkestation\code\modules\smithing\anvil\smithed_parts\thermal_conductor.dm" #include "monkestation\code\modules\smithing\assembly_bench\assembly_bench.dm" #include "monkestation\code\modules\smithing\assembly_bench\assembly_recipes\_base_recipe.dm" -#include "monkestation\code\modules\smithing\assembly_bench\assembly_recipes\sword.dm" +#include "monkestation\code\modules\smithing\assembly_bench\assembly_recipes\weapons.dm" #include "monkestation\code\modules\smithing\ipcs\species.dm" #include "monkestation\code\modules\smithing\ipcs\body\base_bodyparts.dm" #include "monkestation\code\modules\smithing\ipcs\body\internal_organs.dm" @@ -7542,9 +7759,11 @@ #include "monkestation\code\modules\smithing\ipcs\surgeries\robot_chest_repair.dm" #include "monkestation\code\modules\smithing\ipcs\surgeries\robot_healing.dm" #include "monkestation\code\modules\smithing\ipcs\surgeries\steps.dm" +#include "monkestation\code\modules\smithing\items\clothing.dm" #include "monkestation\code\modules\smithing\items\merged_material.dm" #include "monkestation\code\modules\smithing\machines\arc_forge.dm" #include "monkestation\code\modules\smithing\machines\electroplater.dm" +#include "monkestation\code\modules\smithing\machines\material_alloyer.dm" #include "monkestation\code\modules\smithing\machines\material_analyzer.dm" #include "monkestation\code\modules\smithing\material_changes\_base_mineral.dm" #include "monkestation\code\modules\smithing\material_changes\alloy_stats.dm" @@ -7561,6 +7780,7 @@ #include "monkestation\code\modules\smithing\material_changes\material_traits\slippery.dm" #include "monkestation\code\modules\smithing\material_changes\material_traits\slow_attacks.dm" #include "monkestation\code\modules\smithing\material_changes\material_traits\stamina_draining.dm" +#include "monkestation\code\modules\smithing\material_changes\material_traits\stunning.dm" #include "monkestation\code\modules\smithing\material_changes\material_traits\warping.dm" #include "monkestation\code\modules\smithing\material_changes\material_traits\weak_weapon.dm" #include "monkestation\code\modules\smithing\minigame\anvil_minigame.dm" @@ -7579,6 +7799,7 @@ #include "monkestation\code\modules\smithing\TEG\teg_states\worked_materials.dm" #include "monkestation\code\modules\spells\spell_types\aoe_spell\mind_swap.dm" #include "monkestation\code\modules\spells\spell_types\conjure_item\summon_mjollnir.dm" +#include "monkestation\code\modules\spells\spell_types\pointed\fire_ball.dm" #include "monkestation\code\modules\spells\spell_types\pointed\smite.dm" #include "monkestation\code\modules\store\admin\admin_coin_modification.dm" #include "monkestation\code\modules\store\atm\_atm.dm" @@ -7625,6 +7846,8 @@ #include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\nuclear_operative_ghost.dm" #include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\paradox_clone.dm" #include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\wizard.dm" +#include "monkestation\code\modules\storytellers\event_groups\_event_group.dm" +#include "monkestation\code\modules\storytellers\event_groups\groups.dm" #include "monkestation\code\modules\storytellers\storytellers\_storyteller.dm" #include "monkestation\code\modules\storytellers\storytellers\clown.dm" #include "monkestation\code\modules\storytellers\storytellers\ghost.dm" @@ -7637,6 +7860,7 @@ #include "monkestation\code\modules\storytellers\storytellers\vote.dm" #include "monkestation\code\modules\storytellers\storytellers\warrior.dm" #include "monkestation\code\modules\surgery\blood_filter.dm" +#include "monkestation\code\modules\surgery\nif_debonding.dm" #include "monkestation\code\modules\surgery\advanced\brainwashing.dm" #include "monkestation\code\modules\surgery\bodyparts\arachnid_bodyparts.dm" #include "monkestation\code\modules\surgery\bodyparts\clockwork_bodyparts.dm" @@ -7664,6 +7888,7 @@ #include "monkestation\code\modules\surgery\organs\internal\lungs.dm" #include "monkestation\code\modules\surgery\organs\internal\stomach.dm" #include "monkestation\code\modules\surgery\organs\internal\tongue.dm" +#include "monkestation\code\modules\syndicate_ghostroles\listeningpost.dm" #include "monkestation\code\modules\trading\box_rolling.dm" #include "monkestation\code\modules\trading\lootbox_buying.dm" #include "monkestation\code\modules\trading\lootbox_clothing.dm" @@ -7676,6 +7901,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" @@ -7705,12 +7931,14 @@ #include "monkestation\code\modules\uplink\uplink_items\misc.dm" #include "monkestation\code\modules\uplink\uplink_items\nukeops.dm" #include "monkestation\code\modules\uplink\uplink_items\species.dm" +#include "monkestation\code\modules\uplink\uplink_items\suits.dm" #include "monkestation\code\modules\uplink\uplink_items\weapons.dm" #include "monkestation\code\modules\vehicles\monkey_ball.dm" #include "monkestation\code\modules\vehicles\wheelchair.dm" #include "monkestation\code\modules\vehicles\mecha\mecha_actions.dm" #include "monkestation\code\modules\vehicles\mecha\equipment\tools\other_tools.dm" #include "monkestation\code\modules\vending\megaseed.dm" +#include "monkestation\code\modules\veth_misc_items\canopics\canopics.dm" #include "monkestation\code\modules\viking\viking_armour.dm" #include "monkestation\code\modules\viking\viking_axes.dm" #include "monkestation\code\modules\virology\__base_procs.dm" @@ -7759,6 +7987,7 @@ #include "monkestation\code\modules\virology\effects\cleanables.dm" #include "monkestation\code\modules\virology\effects\pathogen_cloud.dm" #include "monkestation\code\modules\virology\immune_systems\_immune_system.dm" +#include "monkestation\code\modules\virology\immune_systems\job_boosting.dm" #include "monkestation\code\modules\virology\items\_base_item_additions.dm" #include "monkestation\code\modules\virology\items\antibodyscanner.dm" #include "monkestation\code\modules\virology\items\bio_hazard_deployable.dm" @@ -7832,4 +8061,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') && (
+