_overrides.dm` for a focused group, e.g. `living_overrides.dm`) and are `#include`d from the modpack's `.dme` like any other file. Keeping them in clearly-named files makes it obvious at a glance which stock behavior a modpack changes. Cleverly-designed modpacks will define their core code hooks/overrides separate from per-type value overrides, so they can change as little as possible for each type, making changes less brittle.
+
+#### Overriding a var
+The simplest type of override just extends an existing type and changes variable values:
+
+```dm
+// mods/content/fantasy/items/material_overrides.dm
+// FRANCE ISN'T REAL
+/obj/item/chems/drinks/bottle/champagne
+ name = "sparkling wine bottle"
+
+/decl/material/liquid/alcohol/champagne
+ name = "sparkling wine"
+ glass_name = "sparkling wine"
+ glass_desc = "Sparkling white wine, a favourite at noble and merchant parties."
+ lore_text = "Sparkling white wine, a favourite at noble and merchant parties."
+```
+
+This is safe and done entirely at compile-time without adding any new code; it just changes the initial value of vars that the existing type already declares. The only conflict risk is two modpacks setting the same var on the same type to different values, in which case the last one loaded wins. Some modpacks may intend this, while others may want to write a compatibility patch (see below).
+
+#### Overriding a proc
+To change behavior, redefine the proc on the existing type. Most overrides should call `..()` so the stock implementation (and any other modpack's override of it) still runs:
+
+```dm
+// mods/content/augments/passive/armor.dm
+// override to add armor augment damage mods
+/obj/item/organ/external/get_brute_mod(var/damage_flags)
+ . = ..() // run the stock proc, keep its result
+ var/obj/item/organ/internal/augment/armor/armor_augment = owner?.get_organ(BP_AUGMENT_CHEST_ARMOUR, /obj/item/organ/internal/augment/armor)
+ if(armor_augment)
+ . *= armor_augment.brute_mult
+```
+
+You can call `..()` at the start (to modify the result afterward), at the end (to run your logic first), or conditionally (to sometimes short-circuit and sometimes defer to stock):
+
+```dm
+// mods/content/breath_holding/living_overrides.dm
+// override to make a held breath take priority
+/mob/living/get_breath(obj/item/organ/internal/lungs/lungs)
+ if(lungs?.holding_breath && lungs.held_breath)
+ return lungs.held_breath // intentionally skip the stock proc
+ return ..()
+```
+
+#### Overriding a static list getter (the injector pattern)
+One common pattern in core code is the *static list getter,* used to avoid creating a new list every time the getter is called. This is much more efficient, but is a little more complex to override. Take this getter, for example:
+
+```dm
+// code/game/objects/items/weapons/secrets_disk.dm
+/obj/item/disk/secret_project/proc/get_secret_project_nouns()
+ var/static/list/nouns = list(
+ "a superluminal artillery cannon", "a fusion engine", "an atmospheric scrubber",\
+ "a human cloning pod", "a microwave oven", "a wormhole generator", "a laser carbine", "an energy pistol",\
+ "a wormhole", "a teleporter", "a huge mining drill", "a strange spacecraft", "a space station",\
+ "a sleek-looking fighter spacecraft", "a ballistic rifle", "an energy sword", "an inanimate carbon rod"
+ )
+ return nouns
+```
+
+We want to extend this by adding "a supermatter engine" to the list. A naive approach might be like this:
+
+```dm
+//Example code not actually used
+/obj/item/disk/secret_project/get_secret_project_nouns()
+ . = ..()
+ . += "a supermatter engine"
+```
+
+This works at first glance, if you call it once. However, because the getter uses a *static list,* it's saved between calls. That means it will be added every time we use the getter, which will quickly add a lot of duplicate entries to the list. Another naive fix for this would be using `|=` to avoid duplicates, but this is expensive because it checks if the item already exists in the list. Wouldn't it be nice to just add it once?
+
+For this, we use something called an injector, which uses a static var to track whether or not we've run our override before. If we're running it for the first time, we make all our changes to the static list returned by `..()`, and after that we set our tracking variable to ensure we never modify it again:
+
+```dm
+// mods/content/supermatter/overrides/sm_strings.dm
+/obj/item/disk/secret_project/get_secret_project_nouns()
+ var/static/sm_injected = FALSE
+ if(sm_injected)
+ return ..()
+ sm_injected = TRUE
+ . = ..()
+ . += "a supermatter engine"
+ return .
+```
+
+This also works for removing items from static lists, and may be useful for run-once code in other contexts as well. Another good example is in mods/content/corporate/items/random.dm.
+
+#### Footguns
+- **Multiple side-overrides chain through `..()` in definition order.** Unlike a normal override, which lives on a new subtype deeper in the type tree, a side-override is defined directly on the existing type. If there are several side-overrides of `/mob/living/some_proc()`, they're all kept and chained: `..()` in the last-defined override calls the previous one, and so on down to the first, which then walks up the type tree to the base implementation. The order in which they run depends on the order they're defined in, so don't write a side-override that assumes it runs first, last, or in any particular position relative to another modpack's. (You can generally assume that it will run after the core definition, though.)
+- **Extend, don't copy.** It may be easier to copy an existing proc definition, skip the parent call, and make a change somewhere in the middle. This is (almost) always a horrible idea, because you may not even notice something breaks when an update changes the definition you copied. The correct solution is to add it to an override that runs before or after the parent call, and if you *really* need to run it in the middle, consider adding a proc to the core code that your modpack can override (or split the existing proc into two or more).
+- **Always call `..()` unless you really mean to break the chain.** Forgetting `..()` drops the base implementation *and* any earlier modpack's side-override, which can break unrelated core features and any other modpack that expected that proc to do its normal job. Only omit it when you genuinely intend to replace the behavior wholesale.
+- **Don't depend on load order between modpacks.** A modpack may depend only on itself and stock code. If your override only makes sense when *another* modpack is also enabled, it's a cross-modpack interaction and belongs in `mods/~compatibility` (see below), which is loaded last and therefore modpack load-order agnostic.
+- **Side-overrides are the most fragile thing to maintain across upstream changes.** When upstream code renames a proc, changes its signature, or alters what `..()` returns, your override breaks. The fewer side-overrides a modpack has, the less it breaks when upstream code is refactored. **There being no merge conflicts doesn't mean your code wasn't broken by an update!**
### Cross-modpack interactions
Sometimes, a modpack that's enabled might need to do something in response to another modpack also being enabled. Compatibility patches allow for this to happen without the modpacks in question requiring a hard dependency on each other.
@@ -62,7 +157,168 @@ Some modpacks extend other modpacks and make no sense to include on their own, i
Modular code on a downstream with an upstream that does frequent refactors and rewrites is inevitably going to break when the upstream codebase does anything. Names change, so do assumptions, and even design directions might diverge so far that reconciling them will be hard or even impossible. There's not really getting around that, but we can at least mitigate it by designing stable interfaces and documenting changes. When upstream code is written with modularity in mind, downstreams have a much easier time adding content.
## How do I write upstream/core code with extension via modpacks in mind?
-TODO: Actually write this section. Give examples like `/decl/atmos_grief_fix_step`, `/decl/human_examination`, the cocktails system, etc. Iterating over subtypes of a base type makes it easy for modpacks to add new code. Also maybe address some footguns like trying to make something modular before trying to make it actually work? Could also discuss the open-closed principle I guess, e.g. write code that gets *extended* rather than *modified* (so avoiding side-overrides where possible, etc.).
+This is the counterpart of "Overriding Core Code" above. There, a modpack reaches into core code and changes it from the side; here, you're the one writing the core code, and your goal is to leave an *entry point* that modpacks can hook into without ever editing your code. The guiding idea is the open/closed principle: code should be open for extension but closed for modification. Every time a modpack can add a feature by writing a new file instead of side-overriding one of yours, that's one fewer thing that silently breaks when you refactor later.
+
+The single most useful tool for this is **iterating over decl subtypes.** Define an abstract decl as a hook point, write your core logic to enumerate every subtype of it and call into them, and modpacks extend the system simply by defining a new subtype. Nothing in core needs to know the modpack exists.
+
+### Pattern: action decls
+Take the "fix atmospherics grief" admin tool. Core code defines an abstract decl with a small interface, then enumerates every subtype, sorts them, and calls each:
+
+```dm
+// code/modules/admin/verbs/grief_fixers.dm
+/decl/atmos_grief_fix_step
+ abstract_type = /decl/atmos_grief_fix_step
+ var/name
+
+/decl/atmos_grief_fix_step/proc/act()
+ return
+
+// ...elsewhere, the verb that runs them all:
+var/list/steps = decls_repository.get_decls_of_subtype_unassociated(/decl/atmos_grief_fix_step)
+steps = sortTim(steps.Copy(), /proc/cmp_decl_sort_value_asc)
+for(var/decl/atmos_grief_fix_step/fix_step as anything in steps)
+ to_chat(usr, "[fix_step.name].")
+ fix_step.act()
+```
+
+A modpack can then add a step without touching any of the above. It just defines a new subtype and the core loop runs it in the specified order:
+
+```dm
+// mods/content/supermatter/datums/sm_grief_fix.dm
+/decl/atmos_grief_fix_step/supermatter
+ name = "Supermatter depowered"
+ sort_order = 0
+
+/decl/atmos_grief_fix_step/supermatter/act()
+ // Depower the supermatter, as it would quickly blow up once we remove all gases from the pipes.
+ for(var/obj/structure/supermatter/S in SSsupermatter.processing)
+ S.power = 0
+```
+
+Note the two things that make this clean: `abstract_type` marks the base as not-runnable so the enumeration only picks up real steps, and a `sort_order` var (read by the `cmp_decl_sort_value_asc` comparator) lets each subtype declare where it belongs in the sequence rather than relying on definition or load order. When you design a hook like this, give modpacks an explicit ordering knob instead of leaving order undefined.
+
+### Pattern: output builder decls
+Enumerable decls don't have to *do* something; they can be useful just for a calculation or return value used in base-game code. Human examination text works this way. Base human examination code defines a stub decl whose whole purpose is to be subtyped by modpacks:
+
+```dm
+// code/modules/mob/living/human/human_examine_decl.dm
+/decl/human_examination //This is essentially a stub-method for modpacks to be able to add onto the human examination stuff
+ var/priority = 0
+
+/decl/human_examination/proc/do_examine(mob/user, distance, mob/living/human/source, hideflags, decl/pronouns/pronouns)
+ return
+```
+
+Core's examine code enumerates these decls (sorted by `priority`) and appends whatever each returns. A modpack adds a line to the examine output by defining a subtype of `/decl/human_examination` and implementing `do_examine()`; see `mods/content/matchmaking/matchmaker.dm` for a working example.
+
+### Pattern: condition/recipe decls
+Similarly to output builder decls (see prior section), the cocktails system (`code/modules/reagents/cocktails.dm`), chemical reaction system (`code\modules\reagents\reactions\_reaction.dm`), and stack recipe system (`code\modules\crafting\stack_recipes\_recipe.dm`) follow a similar idea: a base type that gets enumerated, so modpacks add new recipes by adding subtypes rather than editing a central list. By combining this with other principles, modpacks can extend, remove, or modify existing recipes, cocktails, reactions, etc. without needing to edit them directly.
+
+### Pattern: events (`/decl/observ`)
+The decl patterns above allow core and modpack code to request extensible subtypes representing information, behavior, or conditions. Conversely, events allow modular code to request an update when something particular happens, and they're easily the most versatile tool for writing code that doesn't require side-overrides. When something notable happens, core code raises an event, and anything that cares can register to be notified. The code raising the event has no idea who's listening, and never needs a call added for each new listener. This is exactly what makes it good for modular code: a modpack can react to a core event (or even another modpack's event) without the event-issuing code containing a single reference to the consumer of that event.
+
+An event is a `/decl/observ` subtype. Defining one is just a declaration plus a doc comment describing the arguments listeners will receive:
+
+```dm
+// code/datums/observation/death.dm
+// Raised when: A mob dies.
+// Arguments the called proc should expect:
+// /mob/dying_mob: the mob that died.
+/decl/observ/death
+ name = "Death"
+ expected_type = /mob
+```
+
+Events are typically raised with the `RAISE_EVENT` macro, passing the source as the first argument followed by any event-specific arguments.
+
+```dm
+// code/datums/observation/death.dm
+/mob/living/add_to_dead_mob_list()
+ . = ..()
+ if(.)
+ RAISE_EVENT(/decl/observ/death, src)
+```
+
+A modpack (or any object) hooks in by registering a callback through `events_repository`. The arguments are `(event_type, event_source, listener, proc_to_call)`; the listener's proc receives the event source plus whatever extra args the event documents. Crucially, you must **unregister** when you no longer care (and always before the listener is destroyed), or the listener will be forced to clean them up manually on deletion, which can be slow. This augment registers on the item it's holding and tears the registration down when that item goes away (through another event):
+
+```dm
+// mods/content/augments/simple.dm
+/obj/item/organ/internal/augment/active/simple/Initialize()
+ . = ..()
+ // ...
+ events_repository.register(/decl/observ/moved, holding, src, PROC_REF(check_holding))
+ events_repository.register(/decl/observ/destroyed, holding, src, PROC_REF(check_holding))
+
+/obj/item/organ/internal/augment/active/simple/proc/check_holding()
+ if(QDELETED(holding))
+ events_repository.unregister(/decl/observ/moved, holding, src)
+ events_repository.unregister(/decl/observ/destroyed, holding, src)
+ holding = null
+```
+
+Pass `event_source` to register for events from one specific object; use `register_global(event_type, listener, proc_call)` to hear about that event from *every* source. Some high-traffic events forbid this for performance with the `OBSERVATION_NO_GLOBAL_REGISTRATIONS` flag, so check the event's definition; if writing something that may need that level of performance, `raise_event_non_global` can be used instead of `RAISE_EVENT`.
+
+When you're writing core code, raising an event is the right move whenever you can imagine *someone, someday* wanting to react to something (death, an item moving, a mob examining something) without you knowing who they are or why they want it. It costs one `RAISE_EVENT` line (and the overhead of dispatching events to listeners) and buys almost-unlimited extensibility in modpacks.
+
+The problem is it's easy to get overeager: every event has a small registration/dispatch cost, so raise them when needed rather than sprinkling them everywhere on the off chance. You can always make an upstream PR to add a new event when it's needed.
+
+As an aside, those familiar with TGstation's "DCS" system (datum, component, signal) will recognize this as very similar to TG's signals. They do functionally the same thing.
+
+### Pattern: extensions (`/datum/extension`)
+Events let modpacks react to *moments*; extensions let them attach *state and behavior* to an object without subtyping it or piling vars onto its definition. An extension is a separate datum (`/datum/extension`) that hangs off a "holder" datum, keeping a self-contained feature's data and procs encapsulated in its own type instead of smeared across the holder's variable space. This is composition over inheritance: rather than making a new `/obj/item/chems/pill` subtype for "a pill that hides what it contains," you attach an `obfuscated_medication` extension to any pill.
+
+That separation of concerns is the whole point. The holder doesn't grow a var or a proc for the feature; the feature lives entirely in the extension, can be attached to several unrelated holder types (anything matching its `expected_type`), and can be added or removed at runtime. For a modpack this means adding a self-contained capability to a core object while not touching the core object's *definition* at all. This can even be useful in core code for functionality shared across types whose common ancestor is unacceptably early in the type hierarchy, like `/datum/extension/loaded_cell` (`code\datums\extensions\cell\cell.dm`) or `/datum/extension/padding` (`code\datums\extensions\padding\padding.dm`).
+
+An extension subtype sets `base_type` (attaching a second extension derived from the same `base_type` replaces the first) and `expected_type` (the holders it's allowed on, enforced at construction):
+
+```dm
+// mods/content/bigpharma/extension.dm
+/datum/extension/obfuscated_medication
+ base_type = /datum/extension/obfuscated_medication
+ expected_type = /obj/item
+ flags = EXTENSION_FLAG_IMMEDIATE
+ var/original_reagent
+
+/datum/extension/obfuscated_medication/pill
+ expected_type = /obj/item/chems/pill
+
+/datum/extension/obfuscated_medication/pill/update_appearance()
+ var/obj/item/pill = holder // every extension knows its holder
+ pill.icon_state = get_medication_icon_state_from_reagent_name(original_reagent, "pill", 1, 5)
+```
+
+You attach an extension to a holder via `set_extension(holder, extension_type, ...)`; any extra arguments are forwarded to the extension's `New()`/`post_construction()`. Then you can retrieve it with `get_extension(holder, base_type)`. By default extensions are lazy-loaded (only instantiated on first `get_extension`); set `EXTENSION_FLAG_IMMEDIATE` if it must exist the moment it's attached. There's also `has_extension()` (a cheap presence check that won't trigger lazy instantiation), `remove_extension()`, and `get_or_create_extension()`:
+
+```dm
+// mods/content/augments/active/cyberbrain.dm
+/obj/item/organ/internal/augment/active/cyberbrain/Initialize()
+ . = ..()
+ // ...
+ set_extension(src, /datum/extension/interactive/os/device/implant)
+ set_extension(src, /datum/extension/assembly/modular_computer/cyberbrain)
+ // ...
+
+/obj/item/organ/internal/augment/active/cyberbrain/proc/install_default_hardware()
+ var/datum/extension/assembly/assembly = get_extension(src, /datum/extension/assembly)
+ for(var/component_type in default_hardware)
+ assembly.try_install_component(null, new component_type(src))
+```
+
+Note that the cyberbrain above attaches *two* unrelated extensions (a modular-computer assembly extension and the OS extension) to one organ. Each is a distinct concern with its own state, neither knows about the other, and neither required a new organ subtype.
+
+When you're writing core code, prefer an extension over adding vars/procs to a base type whenever the feature is **optional, self-contained, or only relevant to some instances.** This keeps the base type lean and gives modpacks a clean attachment point. Create a subtype instead when the behavior is intrinsic to what the object *is* rather than an add-on. As with all of these patterns, don't build an extension for something only one type will ever use and that isn't a separable concern; overengineering is the enemy of getting things done.
+
+As with observation events, those familiar with DCS will note that these are similar to components, with the caveat that explicitly checking for extensions and calling methods on them is perfectly acceptable. You can still avoid it through the use of events, and doing so will often lead to cleaner, more extensible code (after all, if you need to add a hook, chances are something else will too), but it is by no means mandatory or even preferred by all developers.
+
+### Other hooks worth leaving
+- **Append to lists, don't replace them.** If core code builds a list that modpacks might want to add to, expose it (or build it from decl subtypes) so a modpack can contribute an entry. The static-list-getter injector pattern in "Overriding Core Code" above exists precisely *because* a getter didn't leave an easier entry point. Don't make modpacks resort to it if you can offer a cleaner hook.
+- **Split a proc to create a hook.** If a modpack would otherwise need to side-override the middle of a long proc (the "Extend, don't copy" footgun), the right fix on the core side is to factor that middle out into its own overridable proc, so modpacks can override the small piece and call `..()`.
+- **Add vars to a type for modpacks to fill in.** A core type can carry a var that core logic respects but only modpacks ever set, letting modpacks opt into behavior declaratively.
+
+### Footguns
+- **Don't focus too hard on abstraction before getting something working.** It's tempting to design an elaborate system ahead of time to make implementation easier, but a structure for extension is only useful once you understand what that structure needs to accomplish. Implement a working feature first, *then* focus on the points modpacks might actually want to modify. Time spent abstracting and modularizing a system that's fundamentally broken is time wasted.
+- **A stable interface is a promise.** Once modpacks (and downstreams) hook into your decl or proc, renaming it or changing its signature breaks them silently. Treat hook points as a small, deliberate API: keep them narrow, name them clearly, and **document them,** because changing them is more troublesome than changing ordinary internal code.
+- **Be aware of subtype ordering.** If the order your subtypes run in matters, give them an explicit ordering var (like `sort_order`/`priority` above). Relying on enumeration or load order makes behavior depend on which modpacks happen to be enabled, which is exactly the kind of fragility this whole approach is meant to avoid.
# Contribution
Please contribute to this README/guide. It's currently unfinished and doesn't cover a lot of important things. Thanks.
\ No newline at end of file
diff --git a/mods/_modpack.dm b/mods/_modpack.dm
index 0fb1d5d7908..b9bad395444 100644
--- a/mods/_modpack.dm
+++ b/mods/_modpack.dm
@@ -75,6 +75,14 @@
/decl/modpack/proc/on_roundstart()
return
+/// This runs before `global.using_map.finalize_map_generation()` in SSmapping initialize.
+/decl/modpack/proc/on_mapping_pre_finalize()
+ return
+
+/// This runs in SSmisc_late Initialize.
+/decl/modpack/proc/on_misc_late_init()
+ return
+
/decl/modpack/proc/get_membership_perks()
return
diff --git a/mods/content/augments/active/polytool.dm b/mods/content/augments/active/polytool.dm
index ad72c0f405b..09d7ec605d6 100644
--- a/mods/content/augments/active/polytool.dm
+++ b/mods/content/augments/active/polytool.dm
@@ -14,9 +14,9 @@
var/obj/item/I = new path (src)
I.canremove = FALSE
items += I
- events_repository.register(/decl/observ/moved, I, src, /obj/item/organ/internal/augment/active/polytool/proc/check_holding)
- events_repository.register(/decl/observ/destroyed, I, src, /obj/item/organ/internal/augment/active/polytool/proc/check_holding)
- events_repository.register(/decl/observ/item_unequipped, I, src, /obj/item/organ/internal/augment/active/polytool/proc/check_holding)
+ events_repository.register(/decl/observ/moved, I, src, PROC_REF(check_holding))
+ events_repository.register(/decl/observ/destroyed, I, src, PROC_REF(check_holding))
+ events_repository.register(/decl/observ/item_unequipped, I, src, PROC_REF(check_holding))
/obj/item/organ/internal/augment/active/polytool/Destroy()
for(var/obj/item/item in items)
diff --git a/mods/content/augments/simple.dm b/mods/content/augments/simple.dm
index 14e48b5ca45..52410b05c91 100644
--- a/mods/content/augments/simple.dm
+++ b/mods/content/augments/simple.dm
@@ -12,9 +12,9 @@
holding.canremove = FALSE
if(!origin_tech)
origin_tech = holding.get_origin_tech()
- events_repository.register(/decl/observ/moved, holding, src, /obj/item/organ/internal/augment/active/simple/proc/check_holding)
- events_repository.register(/decl/observ/destroyed, holding, src, /obj/item/organ/internal/augment/active/simple/proc/check_holding)
- events_repository.register(/decl/observ/item_unequipped, holding, src, /obj/item/organ/internal/augment/active/simple/proc/check_holding)
+ events_repository.register(/decl/observ/moved, holding, src, PROC_REF(check_holding))
+ events_repository.register(/decl/observ/destroyed, holding, src, PROC_REF(check_holding))
+ events_repository.register(/decl/observ/item_unequipped, holding, src, PROC_REF(check_holding))
/obj/item/organ/internal/augment/active/simple/proc/check_holding()
diff --git a/mods/content/beekeeping/_beekeeping.dm b/mods/content/beekeeping/_beekeeping.dm
index d3b58be746d..53ca84daf62 100644
--- a/mods/content/beekeeping/_beekeeping.dm
+++ b/mods/content/beekeeping/_beekeeping.dm
@@ -1,7 +1,13 @@
+#define FRAME_RESERVE_COST 30
+#define SWARM_AGITATION_PER_FRAME 25
+#define FRAME_MATERIAL_COST 20
+#define SWARM_GROWTH_COST 10
+#define FRAME_FILL_MATERIAL_COST 5
+#define HIVE_REPAIR_MATERIAL_COST 5
+
/decl/modpack/beekeeping
- name = "Beekeeping Content"
+ name = "Beekeeping and Insects Content"
/datum/storage/hopper/industrial/centrifuge/New()
..()
can_hold |= /obj/item/hive_frame
-
diff --git a/mods/content/beekeeping/_beekeeping.dme b/mods/content/beekeeping/_beekeeping.dme
index 75778704f36..92ee753943b 100644
--- a/mods/content/beekeeping/_beekeeping.dme
+++ b/mods/content/beekeeping/_beekeeping.dme
@@ -3,10 +3,17 @@
// BEGIN_INCLUDE
#include "_beekeeping.dm"
#include "closets.dm"
-#include "hive_frame.dm"
#include "items.dm"
+#include "materials.dm"
#include "recipes.dm"
#include "trading.dm"
-#include "hives\_hive.dm"
+#include "hives\hive_extension.dm"
+#include "hives\hive_flora.dm"
+#include "hives\hive_frame.dm"
+#include "hives\hive_queen.dm"
+#include "hives\hive_structure.dm"
+#include "hives\hive_swarm.dm"
+#include "hives\insect_species\_insects.dm"
+#include "hives\insect_species\insects_pollinators.dm"
// END_INCLUDE
#endif
diff --git a/mods/content/beekeeping/closets.dm b/mods/content/beekeeping/closets.dm
index c39e70dbb45..daf63a942d5 100644
--- a/mods/content/beekeeping/closets.dm
+++ b/mods/content/beekeeping/closets.dm
@@ -1,11 +1,11 @@
/obj/structure/closet/crate/hydroponics/beekeeping
name = "beekeeping crate"
- desc = "All you need to set up your own beehive."
+ desc = "All you need to set up your own beehive, except the beehive."
/obj/structure/closet/crate/hydroponics/beekeeping/Initialize()
. = ..()
- new /obj/item/beehive_assembly(src)
- new /obj/item/bee_smoker(src)
+ new /obj/item/stack/material/plank/mapped/wood/ten
+ new /obj/item/smoker(src)
new /obj/item/hive_frame/crafted(src)
new /obj/item/hive_frame/crafted(src)
new /obj/item/hive_frame/crafted(src)
diff --git a/mods/content/beekeeping/hive_frame.dm b/mods/content/beekeeping/hive_frame.dm
deleted file mode 100644
index 35ffd429777..00000000000
--- a/mods/content/beekeeping/hive_frame.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-/obj/item/hive_frame
- abstract_type = /obj/item/hive_frame
- icon_state = ICON_STATE_WORLD
- w_class = ITEM_SIZE_SMALL
- material_alteration = MAT_FLAG_ALTERATION_ALL
- chem_volume = 20
- var/destroy_on_centrifuge = FALSE
-
-/obj/item/hive_frame/on_reagent_change()
- . = ..()
- if(REAGENT_TOTAL_VOLUME(reagents))
- SetName("filled [initial(name)] ([reagents.get_primary_reagent_name()])")
- else
- SetName(initial(name))
- queue_icon_update()
-
-/obj/item/hive_frame/on_update_icon()
- . = ..()
- var/mesh_state = "[icon_state]-mesh"
- if(check_state_in_icon(mesh_state, icon))
- add_overlay(overlay_image(icon, mesh_state, COLOR_WHITE, RESET_COLOR))
- if(REAGENT_TOTAL_VOLUME(reagents))
- var/comb_state = "[icon_state]-comb"
- if(check_state_in_icon(comb_state, icon))
- add_overlay(overlay_image(icon, comb_state, reagents.get_color(), RESET_COLOR))
- compile_overlays()
-
-/obj/item/hive_frame/handle_centrifuge_process(obj/machinery/centrifuge/centrifuge)
- if(!(. = ..()))
- return
- if(REAGENT_TOTAL_VOLUME(reagents))
- reagents.trans_to_holder(centrifuge.loaded_beaker.reagents, REAGENT_TOTAL_VOLUME(reagents))
- for(var/obj/item/thing in contents)
- thing.dropInto(centrifuge.loc)
- if(destroy_on_centrifuge)
- for(var/atom/movable/thing in convert_matter_to_lumps())
- thing.dropInto(centrifuge.loc)
-
-// Crafted frame used in apiaries.
-/obj/item/hive_frame/crafted
- name = "hive frame"
- desc = "A wooden frame for insect hives that the workers will fill with products like honey."
- icon = 'mods/content/beekeeping/icons/frame.dmi'
- material = /decl/material/solid/organic/wood/oak
- material_alteration = MAT_FLAG_ALTERATION_ALL
-
-// TEMP until beewrite redoes hives.
-/obj/item/hive_frame/crafted/filled/Initialize()
- . = ..()
- new /obj/item/stack/material/bar/wax(src)
- update_icon()
-
-/obj/item/hive_frame/crafted/filled/populate_reagents()
- . = ..()
- reagents.add_reagent(/decl/material/liquid/nutriment/honey, REAGENT_MAXIMUM_VOLUME(reagents))
diff --git a/mods/content/beekeeping/hives/_hive.dm b/mods/content/beekeeping/hives/_hive.dm
deleted file mode 100644
index 990d148a16f..00000000000
--- a/mods/content/beekeeping/hives/_hive.dm
+++ /dev/null
@@ -1,168 +0,0 @@
-/obj/machinery/beehive
- name = "apiary"
- icon = 'mods/content/beekeeping/icons/beekeeping.dmi'
- icon_state = "beehive-0"
- desc = "A wooden box designed specifically to house our buzzling buddies. Far more efficient than traditional hives. Just insert a frame and a queen, close it up, and you're good to go!"
- density = TRUE
- anchored = TRUE
- layer = BELOW_OBJ_LAYER
-
- var/closed = 0
- var/bee_count = 0 // Percent
- var/smoked = 0 // Timer
- var/honeycombs = 0 // Percent
- var/frames = 0
- var/maxFrames = 5
-
-/obj/machinery/beehive/Initialize()
- . = ..()
- update_icon()
-
-/obj/machinery/beehive/on_update_icon()
- overlays.Cut()
- icon_state = "beehive-[closed]"
- if(closed)
- overlays += "lid"
- if(frames)
- overlays += "empty[frames]"
- if(honeycombs >= 100)
- overlays += "full[round(honeycombs / 100)]"
- if(!smoked)
- switch(bee_count)
- if(1 to 20)
- overlays += "bees1"
- if(21 to 40)
- overlays += "bees2"
- if(41 to 60)
- overlays += "bees3"
- if(61 to 80)
- overlays += "bees4"
- if(81 to 100)
- overlays += "bees5"
-
-/obj/machinery/beehive/get_examine_strings(mob/user, distance, infix, suffix)
- . = ..()
- if(!closed)
- . += "The lid is open."
-
-/obj/machinery/beehive/attackby(var/obj/item/used_item, var/mob/user)
- if(IS_CROWBAR(used_item))
- closed = !closed
- user.visible_message("\The [user] [closed ? "closes" : "opens"] \the [src].", "You [closed ? "close" : "open"] \the [src].")
- update_icon()
- return TRUE
- else if(IS_WRENCH(used_item))
- anchored = !anchored
- user.visible_message("\The [user] [anchored ? "wrenches" : "unwrenches"] \the [src].", "You [anchored ? "wrench" : "unwrench"] \the [src].")
- return TRUE
- else if(istype(used_item, /obj/item/bee_smoker))
- if(closed)
- to_chat(user, "You need to open \the [src] with a crowbar before smoking the bees.")
- return TRUE
- user.visible_message("\The [user] smokes the bees in \the [src].", "You smoke the bees in \the [src].")
- smoked = 30
- update_icon()
- return TRUE
- else if(istype(used_item, /obj/item/hive_frame/crafted))
- if(closed)
- to_chat(user, "You need to open \the [src] with a crowbar before inserting \the [used_item].")
- return TRUE
- if(frames >= maxFrames)
- to_chat(user, "There is no place for an another frame.")
- return TRUE
- var/obj/item/hive_frame/crafted/H = used_item
- if(REAGENT_TOTAL_VOLUME(H.reagents))
- to_chat(user, "\The [used_item] is full with beeswax and honey, empty it in the extractor first.")
- return TRUE
- ++frames
- user.visible_message("\The [user] loads \the [used_item] into \the [src].", "You load \the [used_item] into \the [src].")
- update_icon()
- qdel(used_item)
- return TRUE
- else if(istype(used_item, /obj/item/bee_pack))
- var/obj/item/bee_pack/B = used_item
- if(B.full && bee_count)
- to_chat(user, "\The [src] already has bees inside.")
- return TRUE
- if(!B.full && bee_count < 90)
- to_chat(user, "\The [src] is not ready to split.")
- return TRUE
- if(!B.full && !smoked)
- to_chat(user, "Smoke \the [src] first!")
- return TRUE
- if(closed)
- to_chat(user, "You need to open \the [src] with a crowbar before moving the bees.")
- return TRUE
- if(B.full)
- user.visible_message("\The [user] puts the queen and the bees from \the [used_item] into \the [src].", "You put the queen and the bees from \the [used_item] into \the [src].")
- bee_count = 20
- B.empty()
- else
- user.visible_message("\The [user] puts bees and larvae from \the [src] into \the [used_item].", "You put bees and larvae from \the [src] into \the [used_item].")
- bee_count /= 2
- B.fill()
- update_icon()
- return TRUE
- else if(istype(used_item, /obj/item/scanner/plant))
- to_chat(user, "Scan result of \the [src]...")
- to_chat(user, "Beehive is [bee_count ? "[round(bee_count)]% full" : "empty"].[bee_count > 90 ? " Colony is ready to split." : ""]")
- if(frames)
- to_chat(user, "[frames] frames installed, [round(honeycombs / 100)] filled.")
- if(honeycombs < frames * 100)
- to_chat(user, "Next frame is [round(honeycombs % 100)]% full.")
- else
- to_chat(user, "No frames installed.")
- if(smoked)
- to_chat(user, "The hive is smoked.")
- return TRUE
- else if(IS_SCREWDRIVER(used_item))
- if(bee_count)
- to_chat(user, "You can't dismantle \the [src] with these bees inside.")
- return TRUE
- to_chat(user, "You start dismantling \the [src]...")
- playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
- if(do_after(user, 30, src))
- user.visible_message("\The [user] dismantles \the [src].", "You dismantle \the [src].")
- new /obj/item/beehive_assembly(loc)
- qdel(src)
- return TRUE
- return FALSE // this should probably not be a machine, so don't do any component interactions
-
-/obj/machinery/beehive/physical_attack_hand(var/mob/user)
- if(closed)
- return FALSE
- . = TRUE
- if(honeycombs < 100)
- to_chat(user, "There are no filled honeycombs.")
- return
- if(!smoked && bee_count)
- to_chat(user, "The bees won't let you take the honeycombs out like this, smoke them first.")
- return
- user.visible_message("\The [user] starts taking the honeycombs out of \the [src].", "You start taking the honeycombs out of \the [src]...")
- while(honeycombs >= 100 && do_after(user, 30, src))
- new /obj/item/hive_frame/crafted/filled(loc)
- honeycombs -= 100
- --frames
- update_icon()
- if(honeycombs < 100)
- to_chat(user, "You take all filled honeycombs out.")
-
-/obj/machinery/beehive/Process()
- if(closed && !smoked && bee_count)
- pollinate_flowers()
- update_icon()
- smoked = max(0, smoked - 1)
- if(!smoked && bee_count)
- bee_count = min(bee_count * 1.005, 100)
- update_icon()
-
-/obj/machinery/beehive/proc/pollinate_flowers()
- var/coef = bee_count / 100
- var/trays = 0
- for(var/obj/machinery/portable_atmospherics/hydroponics/H in view(7, src))
- if(H.seed && !H.dead)
- H.plant_health += 0.05 * coef
- if(H.pollen >= 1)
- H.pollen--
- trays++
- honeycombs = min(honeycombs + 0.1 * coef * min(trays, 5), frames * 100)
diff --git a/mods/content/beekeeping/hives/hive_extension.dm b/mods/content/beekeeping/hives/hive_extension.dm
new file mode 100644
index 00000000000..5e91d1c1c23
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_extension.dm
@@ -0,0 +1,218 @@
+/datum/extension/insect_hive
+ base_type = /datum/extension/insect_hive
+ expected_type = /obj/structure
+ flags = EXTENSION_FLAG_IMMEDIATE
+ /// The species of insect that made this hive.
+ var/decl/insect_species/holding_species
+ /// References to our current swarm effects gathering for the hive.
+ var/list/swarms
+ var/current_health = 100
+ var/material = 10
+ var/raw_reserves = 0
+ /// Tracker for the last world.time that a frame was removed.
+ var/frame_last_removed = 0
+ /// Tracker for time that smoke will wear off.
+ var/smoked_until = 0
+
+/datum/extension/insect_hive/New(datum/holder, _species_decl)
+ ..()
+ holding_species = istype(_species_decl, /decl/insect_species) ? _species_decl : GET_DECL(_species_decl)
+ if(!istype(holding_species))
+ CRASH("Insect hive extension instantiated with invalid insect species: '[_species_decl]'.")
+ START_PROCESSING(SSprocessing, src)
+
+/datum/extension/insect_hive/Destroy()
+ STOP_PROCESSING(SSprocessing, src)
+ if(length(swarms))
+ for(var/obj/effect/insect_swarm/swarm as anything in swarms)
+ swarm.owner = null
+ swarms = null
+ var/atom/movable/hive = holder
+ if(istype(hive) && !QDELETED(hive))
+ hive.queue_icon_update()
+ return ..()
+
+/datum/extension/insect_hive/Process()
+ if(world.time < smoked_until)
+ return
+ holding_species.process_hive(src)
+ create_hive_products()
+
+/datum/extension/insect_hive/proc/handle_item_interaction(mob/user, obj/item/item)
+ return FALSE
+
+/datum/extension/insect_hive/proc/drop_nest(atom/drop_loc)
+ if(!isatom(drop_loc))
+ return
+ // handle some kind of physical hive dropping here
+ remove_extension(holder, /datum/extension/insect_hive)
+ if(!QDELETED(src))
+ qdel(src)
+
+/datum/extension/insect_hive/proc/get_nest_condition()
+ switch(current_health)
+ if(0, 10)
+ return "dying"
+ if(10, 30)
+ return "struggling"
+ if(30, 60)
+ return "sickly"
+ if(60, 90)
+ return null
+ return "thriving"
+
+/datum/extension/insect_hive/proc/get_nest_name()
+ return holding_species?.nest_name
+
+/datum/extension/insect_hive/proc/examined(mob/user, show_detail)
+ var/nest_descriptor = get_nest_condition()
+ if(nest_descriptor)
+ to_chat(user, SPAN_NOTICE("It contains \a [nest_descriptor] [get_nest_name()]."))
+ else
+ to_chat(user, SPAN_NOTICE("It contains \a [get_nest_name()]."))
+
+/datum/extension/insect_hive/proc/frame_removed(obj/item/frame)
+ frame_last_removed = world.time
+ if(world.time >= smoked_until && length(swarms) > 0)
+ if(isatom(holder))
+ var/atom/hive = holder
+ hive.visible_message(SPAN_DANGER("The buzzing from \the [holder] intensifies."))
+ for(var/obj/effect/insect_swarm/swarm as anything in swarms)
+ swarm.swarm_agitation = min(100, swarm.swarm_agitation + SWARM_AGITATION_PER_FRAME)
+
+/datum/extension/insect_hive/proc/try_hand_harvest(mob/user, obj/item/structure)
+ if(istype(structure) && !structure.storage)
+ var/obj/item/hive_frame/frame = locate() in structure
+ if(frame)
+ frame.dropInto(get_turf(structure))
+ if(istype(user))
+ user.put_in_hands(frame)
+ return TRUE
+ return FALSE
+
+/datum/extension/insect_hive/proc/try_tool_harvest(mob/user, obj/item/tool)
+ return FALSE
+
+/datum/extension/insect_hive/proc/swarm_destroyed(obj/effect/insect_swarm/swarm)
+ return
+
+/datum/extension/insect_hive/proc/swarm_at_hive()
+ for(var/atom/movable/swarm as anything in swarms)
+ if(get_turf(swarm) == get_turf(holder))
+ return swarm
+
+/datum/extension/insect_hive/proc/has_material(amt)
+ return amt <= material
+
+/datum/extension/insect_hive/proc/consume_material(amt)
+ if(has_material(amt))
+ material = clamp(material-amt, 0, 100)
+ return TRUE
+ return FALSE
+
+/datum/extension/insect_hive/proc/add_material(amt)
+ material = clamp(material+amt, 0, 100)
+ return TRUE
+
+/datum/extension/insect_hive/proc/add_reserves(amt)
+ raw_reserves = clamp(raw_reserves+amt, 0, 100)
+ return TRUE
+
+/datum/extension/insect_hive/proc/has_reserves(amt, raw_reserves_only = TRUE)
+ if(raw_reserves >= amt)
+ return TRUE
+ if(raw_reserves_only)
+ return FALSE
+ var/reserve = 0
+ for(var/obj/item/frame in holder)
+ reserve += REAGENT_TOTAL_VOLUME(frame.reagents)
+ if(reserve >= amt)
+ return TRUE
+ return FALSE
+
+/datum/extension/insect_hive/proc/consume_reserves(amt, raw_reserves_only = TRUE)
+ if(!has_reserves(amt, raw_reserves_only))
+ return FALSE
+ if(raw_reserves >= amt)
+ raw_reserves -= amt
+ return TRUE
+ if(raw_reserves_only)
+ return FALSE
+ amt -= raw_reserves
+ raw_reserves = 0
+ for(var/obj/item/frame in holder)
+ if(!REAGENT_TOTAL_VOLUME(frame.reagents))
+ continue
+ var/consume = min(amt, REAGENT_TOTAL_VOLUME(frame.reagents))
+ frame.reagents.remove_any(consume)
+ amt -= consume
+ if(amt <= 0)
+ return TRUE
+ return FALSE
+
+/datum/extension/insect_hive/proc/adjust_health(amt)
+ current_health = clamp(current_health + amt, 0, 100)
+ if(current_health <= 0)
+ var/atom/movable/hive = holder
+ hive.visible_message(SPAN_DANGER("\The [holding_species.nest_name] sags and collapses."))
+ remove_extension(holder, base_type)
+
+/datum/extension/insect_hive/proc/create_hive_products()
+
+ var/atom/movable/hive = holder
+ if(!istype(hive) || !holding_species)
+ return TRUE
+
+ if(!swarm_at_hive()) // nobody home to do the work
+ return TRUE
+
+ // Naturally build up enough material for a new frame (or repairs).
+ if(!has_material(FRAME_MATERIAL_COST))
+ add_material(1)
+
+ // Damaged hives cannot produce combs or honey.
+ if(current_health < 100)
+ if(consume_material(HIVE_REPAIR_MATERIAL_COST))
+ adjust_health(rand(3,5))
+ return TRUE
+
+ if(!has_reserves(FRAME_RESERVE_COST))
+ return TRUE
+
+ var/list/holder_contents = hive.get_contained_external_atoms()
+ for(var/obj/item/hive_frame/frame in holder_contents)
+ if(!frame.reagents || (REAGENT_TOTAL_VOLUME(frame.reagents) >= REAGENT_MAXIMUM_VOLUME(frame.reagents)))
+ continue
+ var/fill_cost = REAGENTS_FREE_SPACE(frame.reagents)
+ if(has_material(FRAME_FILL_MATERIAL_COST) && has_reserves(fill_cost))
+ consume_material(FRAME_FILL_MATERIAL_COST)
+ consume_reserves(fill_cost)
+ holding_species.fill_hive_frame(frame)
+ return TRUE
+
+ var/obj/item/native_frame = holding_species.native_frame_type
+ var/native_frame_size = initial(native_frame.w_class)
+ var/space_left = hive.storage.max_storage_space
+ for(var/obj/item/thing in hive.get_stored_inventory())
+ space_left -= thing.w_class
+ if(space_left < native_frame_size)
+ return
+
+ // Put a timer check on this to avoid a hive filling up with combs the moment you take 2 frames out.
+ if(world.time > (frame_last_removed + 2 MINUTES) && space_left >= native_frame_size && consume_material(FRAME_MATERIAL_COST))
+ // Frames start empty, and will be filled next run.
+ // Native 'frames' (combs) are bigger than crafted ones and aren't reusable.
+ new native_frame(holder, holding_species.produce_material)
+ hive.storage.update_ui_after_item_insertion()
+
+/datum/extension/insect_hive/proc/get_total_swarm_intensity()
+ . = 0
+ for(var/obj/effect/insect_swarm/swarm as anything in swarms)
+ . += swarm.swarm_intensity
+
+/datum/extension/insect_hive/proc/smoked_by(mob/user, atom/source, smoke_time = 1 MINUTE)
+ smoked_until = max(smoked_until, world.time + smoke_time)
+ // this is a little weird due to telekinetic bee smoking but so it goes
+ for(var/obj/effect/insect_swarm/swarm as anything in swarms)
+ swarm.was_smoked(max(0, smoked_until-world.time))
+ return TRUE
diff --git a/mods/content/beekeeping/hives/hive_flora.dm b/mods/content/beekeeping/hives/hive_flora.dm
new file mode 100644
index 00000000000..d6bc3a50c34
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_flora.dm
@@ -0,0 +1,40 @@
+/obj/structure/flora
+ /// Percentage chance of trying to spawn an insect hive here, if appropriate.
+ var/insect_hive_chance = 20
+
+/obj/structure/flora/Initialize(ml, _mat, _reinf_mat)
+ . = ..()
+ if(insect_hive_chance && length(get_supported_insects()))
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/flora/LateInitialize()
+ ..()
+ if(prob(insect_hive_chance) && !has_extension(src, /datum/extension/insect_hive))
+ var/list/insects = get_supported_insects()
+ if(length(insects))
+ insects = insects.Copy() // don't mutate the static list.
+ for(var/species_type in insects)
+ var/decl/insect_species/species = GET_DECL(species_type)
+ if(!species.can_spawn_in_flora(src))
+ insects -= species_type
+ if(length(insects))
+ set_extension(src, /datum/extension/insect_hive, pickweight(insects))
+ update_icon()
+
+// Insect species that can hive in this flora.
+/obj/structure/flora/proc/get_supported_insects()
+ return
+
+/obj/structure/flora/tree/get_supported_insects()
+ var/static/list/_insects = list(
+ /decl/insect_species/honeybees = 10,
+ ///decl/insect_species/wasps = 1
+ )
+ return _insects
+
+/obj/structure/flora/stump/get_supported_insects()
+ var/static/list/_insects = list(
+ /decl/insect_species/honeybees = 10,
+ ///decl/insect_species/wasps = 1
+ )
+ return _insects
diff --git a/mods/content/beekeeping/hives/hive_frame.dm b/mods/content/beekeeping/hives/hive_frame.dm
new file mode 100644
index 00000000000..473e667e521
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_frame.dm
@@ -0,0 +1,91 @@
+/obj/item/hive_frame
+ abstract_type = /obj/item/hive_frame
+ icon_state = ICON_STATE_WORLD
+ w_class = ITEM_SIZE_SMALL
+ material_alteration = MAT_FLAG_ALTERATION_ALL
+ chem_volume = 20
+ var/destroy_on_centrifuge = FALSE
+
+/obj/item/hive_frame/on_reagent_change()
+ . = ..()
+ if(REAGENT_TOTAL_VOLUME(reagents))
+ SetName("filled [initial(name)] ([reagents.get_primary_reagent_name()])")
+ else
+ SetName(initial(name))
+ queue_icon_update()
+
+/obj/item/hive_frame/on_update_icon()
+ . = ..()
+ var/mesh_state = "[icon_state]-mesh"
+ if(check_state_in_icon(mesh_state, icon))
+ add_overlay(overlay_image(icon, mesh_state, COLOR_WHITE, RESET_COLOR))
+ if(REAGENT_TOTAL_VOLUME(reagents))
+ var/comb_state = "[icon_state]-comb"
+ if(check_state_in_icon(comb_state, icon))
+ add_overlay(overlay_image(icon, comb_state, reagents.get_color(), RESET_COLOR))
+ compile_overlays()
+
+/obj/item/hive_frame/handle_centrifuge_process(obj/machinery/centrifuge/centrifuge)
+ if(!(. = ..()))
+ return
+ if(REAGENT_TOTAL_VOLUME(reagents))
+ reagents.trans_to_holder(centrifuge.loaded_beaker.reagents, REAGENT_TOTAL_VOLUME(reagents))
+ for(var/obj/item/thing in contents)
+ thing.dropInto(centrifuge.loc)
+ if(destroy_on_centrifuge)
+ for(var/atom/movable/thing in convert_matter_to_lumps())
+ thing.dropInto(centrifuge.loc)
+
+/obj/item/hive_frame/honey/populate_reagents()
+ . = ..()
+ var/decl/insect_species/bees = GET_DECL(/decl/insect_species/honeybees)
+ bees.fill_hive_frame(src)
+
+/obj/item/hive_frame/forceMove(atom/dest)
+ var/atom/old_loc = loc
+ . = ..()
+ if(. && istype(old_loc))
+ check_hive_loc(old_loc)
+
+/obj/item/hive_frame/Move()
+ var/atom/old_loc = loc
+ . = ..()
+ if(. && istype(old_loc))
+ check_hive_loc(old_loc)
+
+/obj/item/hive_frame/proc/check_hive_loc(atom/check_loc)
+ var/datum/extension/insect_hive/hive = get_extension(check_loc, /datum/extension/insect_hive)
+ if(istype(hive) && loc != hive.holder)
+ hive.frame_removed(src)
+
+// Crafted frame used in apiaries.
+/obj/item/hive_frame/crafted
+ name = "hive frame"
+ desc = "A wooden frame for insect hives that the workers will fill with products like honey."
+ icon = 'mods/content/beekeeping/icons/frame.dmi'
+ material = /decl/material/solid/organic/wood/oak
+
+// Raw version of honeycomb for wild hives.
+/obj/item/hive_frame/comb
+ name = "comb"
+ icon = 'mods/content/beekeeping/icons/comb.dmi'
+ material = /decl/material/solid/organic/wax
+ destroy_on_centrifuge = TRUE
+ material_alteration = MAT_FLAG_ALTERATION_COLOR
+ is_spawnable_type = FALSE
+ w_class = ITEM_SIZE_NORMAL // Larger than crafted frames, because you should use crafted frames in your hive.
+
+/obj/item/hive_frame/comb/Initialize(ml, material_key, decl/insect_species/spawning_hive)
+ . = ..()
+ if(istype(spawning_hive))
+ SetName(spawning_hive.native_frame_name)
+ desc = spawning_hive.native_frame_desc
+ spawning_hive.fill_hive_frame(src)
+
+// Comb subtype for mapping and debugging.
+/obj/item/hive_frame/comb/honey
+ is_spawnable_type = TRUE
+ color = COLOR_GOLD
+
+/obj/item/hive_frame/comb/honey/Initialize(ml, material_key)
+ return ..(ml, material_key, GET_DECL(/decl/insect_species/honeybees))
diff --git a/mods/content/beekeeping/hives/hive_queen.dm b/mods/content/beekeeping/hives/hive_queen.dm
new file mode 100644
index 00000000000..599b487d243
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_queen.dm
@@ -0,0 +1,23 @@
+/obj/item/bee_pack
+ name = "bee pack"
+ desc = "Contains a queen bee and some worker bees. Everything you'll need to start a hive!"
+ icon = 'mods/content/beekeeping/icons/bee_pack.dmi'
+ material = /decl/material/solid/organic/plastic
+ var/contains_insects = /decl/insect_species/honeybees
+
+/obj/item/bee_pack/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/bee_pack/on_update_icon()
+ . = ..()
+ if(contains_insects)
+ add_overlay("[icon_state]-full")
+ else
+ add_overlay("[icon_state]-empty")
+
+/obj/item/bee_pack/proc/empty()
+ SetName("empty [initial(name)]")
+ desc = "A stasis pack for moving bees. It's empty."
+ contains_insects = null
+ update_icon()
diff --git a/mods/content/beekeeping/hives/hive_structure.dm b/mods/content/beekeeping/hives/hive_structure.dm
new file mode 100644
index 00000000000..855f9e42c7b
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_structure.dm
@@ -0,0 +1,86 @@
+/obj/structure/attackby(obj/item/used_item, mob/user)
+ if((. = ..()))
+ return
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ if(istype(hive) && hive.handle_item_interaction(user, used_item))
+ return TRUE
+
+/obj/structure/attack_hand(mob/user)
+ if(has_extension(src, /datum/extension/insect_hive))
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ if(hive.try_hand_harvest(user, src))
+ return TRUE
+ return ..()
+
+/obj/structure/attackby(obj/item/used_item, mob/user)
+ if(has_extension(src, /datum/extension/insect_hive))
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ if(hive.try_tool_harvest(user, used_item))
+ return TRUE
+ return ..()
+
+/obj/structure/examined_by(mob/user, distance, infix, suffix)
+ . = ..()
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ if(istype(hive))
+ hive.examined(user, (distance <= 1))
+
+/atom/physically_destroyed(var/skip_qdel)
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ hive?.drop_nest(loc)
+ return ..()
+
+/obj/structure/dismantle_structure(mob/user)
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ hive?.drop_nest(loc)
+ return ..()
+
+// 'proper' nest structure for building and mapping
+/obj/structure/apiary
+ name = "apiary"
+ desc = "An artificial hive for raising insects, like bees, and harvesting products like honey."
+ icon = 'mods/content/beekeeping/icons/apiary.dmi'
+ icon_state = ICON_STATE_WORLD
+ density = TRUE
+ anchored = TRUE
+ storage = /datum/storage/apiary
+ material_alteration = MAT_FLAG_ALTERATION_ALL
+ material = /decl/material/solid/organic/wood/oak
+ color = /decl/material/solid/organic/wood/oak::color
+ obj_flags = OBJ_FLAG_ANCHORABLE
+ tool_interaction_flags = (TOOL_INTERACTION_ANCHOR | TOOL_INTERACTION_DECONSTRUCT)
+
+/obj/structure/apiary/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+ return air_group || height == 0 || !density || (istype(mover) && mover.checkpass(PASS_FLAG_TABLE))
+
+/obj/structure/apiary/attackby(obj/item/used_item, mob/user)
+
+ if(istype(used_item, /obj/item/bee_pack))
+ var/datum/extension/insect_hive/hive = get_extension(src, /datum/extension/insect_hive)
+ if(istype(hive))
+ to_chat(user, SPAN_WARNING("\The [src] already contains \a [hive.holding_species.nest_name]."))
+ return TRUE
+ var/obj/item/bee_pack/pack = used_item
+ if(!pack.contains_insects)
+ to_chat(user, SPAN_WARNING("\The [pack] is empty!"))
+ return TRUE
+ user.visible_message(SPAN_NOTICE("\The [user] transfers the contents of \the [pack] into \the [src]."))
+ set_extension(src, /datum/extension/insect_hive, pack.contains_insects)
+ pack.empty()
+ return TRUE
+
+ . = ..()
+
+/datum/storage/apiary
+ can_hold = list(/obj/item/hive_frame)
+ max_w_class = ITEM_SIZE_NORMAL
+ max_storage_space = ITEM_SIZE_SMALL * 5 // Five regular frames.
+
+/obj/structure/apiary/mapped/Initialize(ml, _mat, _reinf_mat)
+ . = ..()
+ for(var/_ = 1 to 5)
+ new /obj/item/hive_frame/crafted(src)
+
+/obj/structure/apiary/mapped/bees/Initialize(ml, _mat, _reinf_mat)
+ set_extension(src, /datum/extension/insect_hive, /decl/insect_species/honeybees)
+ . = ..()
diff --git a/mods/content/beekeeping/hives/hive_swarm.dm b/mods/content/beekeeping/hives/hive_swarm.dm
new file mode 100644
index 00000000000..c05a7d9972d
--- /dev/null
+++ b/mods/content/beekeeping/hives/hive_swarm.dm
@@ -0,0 +1,371 @@
+/obj/effect/insect_swarm
+ anchored = TRUE
+ is_spawnable_type = FALSE
+ icon_state = "0"
+ gender = NEUTER
+ default_pixel_z = 8
+ layer = ABOVE_HUMAN_LAYER
+ pass_flags = PASS_FLAG_TABLE
+ movement_handlers = list(/datum/movement_handler/delay/insect_swarm = list(1 SECOND))
+
+ /// Current movement target for automove (ie. hive, flowers or victim)
+ VAR_PRIVATE/atom/move_target
+ /// Reference to our owning hive.
+ var/datum/extension/insect_hive/owner
+ /// Reference to our insect archetype.
+ var/decl/insect_species/insect_type
+ /// A counter for disturbances to the hive or this swarm, causes them to sting people.
+ var/swarm_agitation = 0
+ /// Percentage value; if it drops to 0, the swarm will be destroyed.
+ var/swarm_intensity = 1
+ /// Cooldown timer for next tick.
+ VAR_PRIVATE/next_work = 0
+ /// Time that smoke will wear off.
+ var/smoked_until = 0
+
+/datum/movement_handler/delay/insect_swarm/DoMove(direction, mob/mover, is_external)
+ ..()
+ step(host, direction)
+ return MOVEMENT_HANDLED
+
+/obj/effect/insect_swarm/debug/Initialize(mapload)
+ . = ..(mapload, _insect_type = /decl/insect_species/honeybees)
+
+/obj/effect/insect_swarm/Initialize(mapload, _insect_type, _hive)
+ . = ..()
+ insect_type = istype(_insect_type, /decl/insect_species) ? _insect_type : GET_DECL(_insect_type)
+ owner = _hive
+ if(!istype(insect_type))
+ PRINT_STACK_TRACE("Insect swarm created with invalid insect type: '[_insect_type]'")
+ return INITIALIZE_HINT_QDEL
+ if(!istype(owner))
+ PRINT_STACK_TRACE("Insect swarm created with invalid hive: '[owner]'")
+ return INITIALIZE_HINT_QDEL
+ update_transform()
+ update_swarm()
+ LAZYDISTINCTADD(owner.swarms, src)
+ START_PROCESSING(SSobj, src)
+
+/obj/effect/insect_swarm/Destroy()
+ if(owner)
+ owner.swarm_destroyed(src)
+ LAZYREMOVE(owner.swarms, src)
+ owner = null
+ stop_automove()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+// Resolves the current swarm amount to a coarser value used for icon state selection.
+/obj/effect/insect_swarm/proc/get_swarm_state()
+ return ceil((swarm_intensity / insect_type.max_swarm_intensity) * insect_type.max_swarm_state)
+
+/obj/effect/insect_swarm/on_update_icon()
+ . = ..()
+ color = insect_type.swarm_color
+ icon = insect_type.swarm_icon
+ icon_state = num2text(get_swarm_state())
+ if(is_smoked())
+ icon_state = "[icon_state]_smoked"
+
+/obj/effect/insect_swarm/update_transform()
+ . = ..()
+ // Some icon variation via transform.
+ if(prob(75))
+ var/matrix/swarm_transform = transform || matrix()
+ swarm_transform.Turn(pick(90, 180, 270))
+ transform = swarm_transform
+
+/obj/effect/insect_swarm/proc/update_swarm()
+ update_icon()
+ if(get_swarm_state() == 1)
+ SetName(insect_type.name_singular)
+ desc = insect_type.insect_desc
+ gender = NEUTER
+ else
+ SetName(insect_type.name_plural)
+ desc = insect_type.swarm_desc
+ gender = PLURAL
+
+/obj/effect/insect_swarm/proc/is_agitated()
+ return QDELETED(owner) || (swarm_agitation > 0 && !is_smoked())
+
+/obj/effect/insect_swarm/proc/find_sting_target()
+ for(var/mob/living/victim in view(7, src))
+ if(victim.simulated && !victim.is_playing_dead())
+ return victim
+
+/obj/effect/insect_swarm/proc/merge(obj/effect/insect_swarm/other_swarm)
+
+ // If we can fit into one swarm, just merge us together.
+ var/total_intensity = swarm_intensity + other_swarm.swarm_intensity
+ if(total_intensity <= insect_type.max_swarm_intensity)
+ swarm_intensity = total_intensity
+ swarm_agitation = max(swarm_agitation, other_swarm.swarm_agitation)
+ update_swarm()
+ qdel(other_swarm)
+ return
+
+ // Otherwise equalize between swarms.
+ swarm_intensity = floor(total_intensity / 2)
+ other_swarm.swarm_intensity = total_intensity - swarm_intensity
+ swarm_agitation = max(swarm_agitation, other_swarm.swarm_agitation)
+ other_swarm.swarm_agitation = max(swarm_agitation, other_swarm.swarm_agitation)
+ update_swarm()
+ other_swarm.update_swarm()
+
+/obj/effect/insect_swarm/Move()
+ . = ..()
+ // Swarms from the same hive in the same loc merge together.
+ if(. && loc && !QDELETED(src))
+ try_consolidate_swarms()
+
+/obj/effect/insect_swarm/Process()
+
+ // Swarms on a loc should try to merge if possible.
+ try_consolidate_swarms()
+ if(QDELETED(src))
+ return
+
+ // Swarms with no hive gradually decay to nothing.
+ if(!owner)
+ adjust_swarm_intensity(-(rand(1,3)))
+ if(QDELETED(src))
+ return
+
+ if(!move_target || !(move_target in view(5, src)))
+ stop_automove()
+
+ if(is_smoked())
+ return
+
+ // Angry swarms move with purpose.
+ if(is_agitated())
+ swarm_agitation = max(0, swarm_agitation-1)
+ if(!ismob(move_target))
+ var/mob/new_move_target = find_sting_target()
+ if(istype(new_move_target))
+ move_target = new_move_target
+ if(move_target)
+ start_automove(move_target)
+ if(insect_type.sting_amount || insect_type.sting_reagent)
+ insect_type.try_sting(src, loc)
+ return
+
+ // Large swarms split if they aren't agitated.
+ if(swarm_can_split() && isturf(loc))
+ var/turf/our_turf = loc
+ for(var/turf/swarm_turf as anything in RANGE_TURFS(our_turf, 1))
+ if(swarm_turf == loc || !swarm_turf.CanPass(src))
+ continue
+ var/new_intensity = round(swarm_intensity/2)
+ var/obj/effect/insect_swarm/new_swarm = new type(swarm_turf, insect_type, owner)
+ new_swarm.swarm_intensity = new_intensity
+ new_swarm.swarm_agitation = swarm_agitation
+ new_swarm.update_swarm()
+ swarm_intensity -= new_intensity
+ update_swarm()
+ break
+
+ // Sting people, if we are so inclined.
+ if(insect_type.sting_amount || insect_type.sting_reagent)
+ insect_type.try_sting(src, loc)
+
+ // Hive behavior is dictated by the hive.
+ if(owner)
+ handle_hive_behavior()
+ return
+
+ // If we're not agitated and don't have a hive, we probably shouldn't be pathing somewhere.
+ stop_automove()
+
+ // Idle swarms with no hive just wander around.
+ if(prob(5))
+ SelfMove(pick(global.alldirs))
+
+/obj/effect/insect_swarm/proc/is_first_swarm_at_hive()
+ var/atom/movable/hive = owner?.holder
+ if(!isturf(hive?.loc) || loc != hive.loc)
+ return FALSE
+ if(length(owner?.swarms) == 1)
+ return TRUE
+ for(var/obj/effect/insect_swarm/swarm in hive.loc)
+ if(swarm == src)
+ return TRUE
+ if(swarm in owner.swarms)
+ break
+ return FALSE
+
+/obj/effect/insect_swarm/finished_automove()
+ ..()
+ next_work = world.time // we'be a busy bee, check to for new work once you reach your destination
+ return FALSE
+
+/obj/effect/insect_swarm/get_automove_target(datum/automove_metadata/metadata)
+ return move_target
+
+/obj/effect/insect_swarm/stop_automove()
+ move_target = null
+ . = ..()
+
+/obj/effect/insect_swarm/can_do_automated_move(variant_move_delay)
+ return ..() && !is_smoked()
+
+/obj/effect/insect_swarm/start_automove(target, movement_type, datum/automove_metadata/metadata)
+ move_target = target
+ . = ..()
+
+/obj/effect/insect_swarm/get_default_automove_controller_type()
+ return /decl/automove_controller/stop_on_fail_or_completion
+
+/obj/effect/insect_swarm/proc/handle_hive_behavior()
+
+ var/atom/movable/hive = owner?.holder
+ if(!isturf(loc))
+ // We've just been created; shunt us out onto the turf.
+ if(loc == hive)
+ dropInto(hive.loc)
+ else
+ return
+
+ // If we are the first (or only) of our owner swarms in the loc, and we aren't needed, we don't move. Hive needs workers.
+ if(owner?.has_reserves(FRAME_RESERVE_COST))
+ if(is_first_swarm_at_hive())
+ stop_automove()
+ return
+ if(!hive_has_swarm() && loc != hive.loc)
+ start_automove(hive)
+ return
+
+ do_work()
+
+/obj/effect/insect_swarm/proc/do_work()
+ stop_automove()
+ if(prob(25))
+ var/step_dir = pick(global.alldirs)
+ if(get_dist(owner.holder, get_step(loc, step_dir)) <= 2)
+ SelfMove(step_dir)
+
+/obj/effect/insect_swarm/proc/hive_has_swarm()
+ var/atom/movable/hive = owner?.holder
+ if(!isturf(hive?.loc))
+ return FALSE
+ for(var/obj/item/swarm as anything in owner.swarms)
+ if(swarm.loc == hive.loc)
+ return TRUE
+ return FALSE
+
+/obj/effect/insect_swarm/proc/adjust_swarm_intensity(amount)
+ var/old_intensity = swarm_intensity
+ swarm_intensity = clamp(swarm_intensity + amount, 0, insect_type.max_swarm_intensity)
+ if(old_intensity != swarm_intensity)
+ if(swarm_intensity <= 0)
+ qdel(src)
+ else
+ update_swarm()
+
+/obj/effect/insect_swarm/proc/can_grow()
+ // higher swarm intensity is only seen during agitated states when they converge on a victim and merge.
+ return swarm_intensity < insect_type.max_swarm_growth_intensity
+
+/obj/effect/insect_swarm/proc/can_merge()
+ return swarm_intensity < (is_agitated() ? insect_type.max_swarm_intensity : insect_type.max_swarm_growth_intensity)
+
+/obj/effect/insect_swarm/proc/swarm_can_split()
+ return !is_agitated() && swarm_intensity > insect_type.max_swarm_growth_intensity
+
+/obj/effect/insect_swarm/proc/try_consolidate_swarms()
+ if(!can_merge())
+ return
+ for(var/obj/effect/insect_swarm/other_swarm in loc)
+ if(other_swarm == src || !other_swarm.can_merge() || other_swarm.owner != owner || other_swarm.insect_type != insect_type)
+ continue
+ merge(other_swarm)
+ return
+
+/obj/effect/insect_swarm/pollinator
+ var/pollen = 0
+
+/obj/effect/insect_swarm/pollinator/do_work()
+
+ // Have a rest/do some work.
+ if(world.time < next_work)
+ return
+
+ var/atom/movable/hive = owner?.holder
+
+ // Move to move target (hive or flowers)
+ if(move_target)
+ if(!(move_target in view(src, 7))) // no longer able to see our move target
+ stop_automove()
+ // don't bail early if we just stopped automove, that would introduce stutter as it'd take one tick to decide what to do next
+ else
+ // let us automove, don't restart it
+ return
+
+ // Unload pollen into hive.
+ if(pollen)
+ if(loc == get_turf(hive))
+ owner.add_reserves(pollen)
+ pollen = 0
+ next_work = world.time + 5 SECONDS
+ stop_automove()
+ else
+ start_automove(hive)
+ return
+
+ // Harvest from flowers in our loc.
+ for(var/obj/machinery/portable_atmospherics/hydroponics/flower in loc)
+ if(!flower.pollen)
+ continue
+ if(flower.seed && !flower.dead)
+ flower.plant_health += rand(3, 5)
+ flower.check_plant_health()
+ pollen += flower.pollen
+ flower.pollen = 0
+ next_work = world.time + 5 SECONDS
+ stop_automove()
+ return
+
+ // Same logic for flora. TODO unify these when seeds are rewritten to be less bespoke.
+ for(var/obj/structure/flora/plant/flower in loc)
+ if(!flower.pollen)
+ continue
+ pollen += flower.pollen
+ flower.pollen = 0
+ next_work = world.time + 5 SECONDS
+ stop_automove()
+ return
+
+ // Find a flower.
+ var/list/all_potential_targets = list()
+ for(var/thing in view(src, 7))
+ if(istype(thing, /obj/machinery/portable_atmospherics/hydroponics))
+ var/obj/machinery/portable_atmospherics/hydroponics/flower = thing
+ if(flower.pollen)
+ all_potential_targets += flower
+ else if(istype(thing, /obj/structure/flora/plant))
+ var/obj/structure/flora/plant/flower = thing
+ if(flower.pollen)
+ all_potential_targets += flower
+
+ var/closest_dist
+ var/atom/closest_target
+ for(var/atom/thing as anything in shuffle(all_potential_targets))
+ var/next_dist = get_dist(src, thing)
+ if(isnull(closest_target) || next_dist < closest_dist)
+ closest_target = thing
+ closest_dist = next_dist
+
+ if(closest_target)
+ start_automove(closest_target)
+ else
+ start_automove(hive)
+
+/obj/effect/insect_swarm/proc/was_smoked(smoke_time = 1 MINUTE)
+ smoked_until = max(smoked_until, world.time + smoke_time)
+ swarm_agitation = round(swarm_agitation * 0.75)
+ update_icon()
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), TRUE), smoke_time, (TIMER_UNIQUE|TIMER_OVERRIDE))
+
+/obj/effect/insect_swarm/proc/is_smoked()
+ return world.time < smoked_until
\ No newline at end of file
diff --git a/mods/content/beekeeping/hives/insect_species/_insects.dm b/mods/content/beekeeping/hives/insect_species/_insects.dm
new file mode 100644
index 00000000000..d05460b9a5e
--- /dev/null
+++ b/mods/content/beekeeping/hives/insect_species/_insects.dm
@@ -0,0 +1,200 @@
+/decl/insect_species
+ abstract_type = /decl/insect_species
+
+ // Descriptive strings for individual insects and swarms.
+ var/name_singular
+ var/name_plural
+ var/insect_desc
+
+ // Vars for nest description and products.
+ var/nest_name
+ var/list/produce_reagents
+ var/decl/material/produce_material
+ var/produce_material_amount = 1
+ var/native_frame_name = "comb"
+ var/native_frame_desc = "A wax comb from an insect nest."
+ var/native_frame_type = /obj/item/hive_frame/comb
+
+ // Visual appearance and behavior of swarms.
+ var/swarm_desc
+ var/swarm_color = COLOR_BROWN
+ var/swarm_icon = 'mods/content/beekeeping/icons/swarm.dmi'
+ var/swarm_type = /obj/effect/insect_swarm
+ var/max_swarm_growth_intensity = 50
+ var/max_swarm_intensity = 100
+ var/max_swarm_state = 6
+
+ // Venom delivered by swarms whens stinging a victim.
+ var/sting_reagent
+ var/sting_amount
+ var/per_sting_reagents = 0.1
+ var/per_sting_pain = 1
+
+/decl/insect_species/Initialize()
+ if(produce_material)
+ produce_material = GET_DECL(produce_material)
+ return ..()
+
+/decl/insect_species/validate()
+ . = ..()
+
+ if(!name_singular)
+ . += "no singular name set"
+ if(!name_plural)
+ . += "no plural name set"
+ if(!nest_name)
+ . += "no nest name set"
+ if(!insect_desc)
+ . += "no insect desc set"
+
+ if(swarm_type)
+ if(!ispath(swarm_type, /obj/effect/insect_swarm))
+ . += "invalid swarm path (must be /obj/effect/insect_swarm or subtype): '[swarm_type]'"
+ if(!swarm_desc)
+ . += "no swarm description set"
+
+ if(produce_reagents)
+ if(!length(produce_reagents) || !islist(produce_reagents))
+ . += "empty or non-list produce_reagents"
+ else
+ var/total = 0
+ for(var/reagent in produce_reagents)
+ if(!ispath(reagent, /decl/material))
+ . += "non-material produce_reagents entry '[reagent]'"
+ continue
+ var/amt = produce_reagents[reagent]
+ if(!isnum(amt) || amt <= 0)
+ . += "non-numerical or 0 produce_reagents value: '[reagent]', '[amt]'"
+ total += amt
+ if(total != 1)
+ . += "produce_reagents weighting does not sum to 1: '[total]'"
+
+ if(produce_material)
+ if(!isnum(produce_material_amount) || produce_material_amount <= 0)
+ . += "non-numeric or zero produce amount: '[produce_material_amount]'"
+ if(!istype(produce_material, /decl/material))
+ . += "non-material product material type: '[produce_material]'"
+
+ if(!swarm_icon)
+ . += "null swarm icon"
+ else
+ for(var/i = 0 to max_swarm_state)
+ var/check_state = num2text(i)
+ if(!check_state_in_icon(check_state, swarm_icon))
+ . += "missing active icon_state '[check_state]'"
+ check_state = "[check_state]_smoked"
+ if(!check_state_in_icon(check_state, swarm_icon))
+ . += "missing smoked icon_state '[check_state]'"
+
+/decl/insect_species/proc/fill_hive_frame(obj/item/frame)
+
+ if(!istype(frame) || QDELETED(frame))
+ return FALSE
+
+ var/frame_space = REAGENTS_FREE_SPACE(frame.reagents)
+ if(frame_space <= 0)
+ return FALSE
+
+ if(REAGENT_MAXIMUM_VOLUME(frame.reagents) && length(produce_reagents))
+ var/reagent_split = max(1, floor(min(REAGENTS_FREE_SPACE(frame.reagents), 20) / length(produce_reagents)))
+ for(var/reagent in produce_reagents)
+ frame.reagents.add_reagent(reagent, max(1, (reagent_split * produce_reagents[reagent])), defer_update = TRUE)
+ frame.reagents.handle_update()
+ if(produce_material && (frame.material != produce_material) && !(locate(/obj/item/stack/material/lump) in frame))
+ for(var/atom/movable/thing in produce_material.create_object(frame, produce_material_amount, /obj/item/stack/material/lump))
+ thing.forceMove(frame)
+ return TRUE
+
+/decl/insect_species/proc/try_sting(obj/effect/insect_swarm/swarm, atom/loc)
+ if(!istype(swarm) || QDELETED(swarm) || !istype(loc))
+ return FALSE
+ // If we're agitated, always sting. Otherwise, % chance equal to a quarter of our overall swarm intensity.
+ if(!swarm.is_agitated() && !prob(max(1, round(swarm.swarm_intensity/4))))
+ return FALSE
+ var/base_sting_chance = (sting_amount * clamp(round(swarm.swarm_intensity/10), 1, 10))
+ var/sting_mult = swarm.is_agitated() ? max(base_sting_chance, 15) : base_sting_chance
+ for(var/mob/living/victim in loc)
+ if(!victim.simulated || victim.stat || victim.current_posture?.prone)
+ continue
+ var/datum/reagents/injected_reagents = victim.get_injected_reagents()
+ var/obj/item/organ/external/affecting = victim.get_organ(pick(global.all_limb_tags))
+ if(!affecting || BP_IS_PROSTHETIC(affecting) || BP_IS_CRYSTAL(affecting))
+ continue
+ if(!injected_reagents || !victim.can_inject(null, affecting.organ_tag))
+ continue
+
+ to_chat(victim, SPAN_DANGER("\A [swarm] stings you [sting_mult <= sting_amount * 2 ? "" : "multiple times"] on your [affecting.name]!"))
+
+ var/sting_venom = (per_sting_reagents * sting_mult) - REAGENT_VOLUME(injected_reagents, sting_reagent)
+ if(sting_venom > 0)
+ injected_reagents.add_reagent(sting_reagent, sting_venom)
+
+ var/sting_pain = (per_sting_pain * sting_mult) - victim.getHalLoss()
+ if(sting_pain > 0)
+ affecting.add_pain(sting_pain)
+
+ . = TRUE
+
+/decl/insect_species/proc/can_spawn_in_flora(var/obj/structure/flora)
+
+ // Territory range.
+ for(var/obj/structure/flora/plant in view(flora, 7))
+ if(has_extension(plant, /datum/extension/insect_hive))
+ return FALSE
+
+ // Food source.
+ for(var/obj/machinery/portable_atmospherics/hydroponics/flower in view(flora, 7))
+ if(flower.seed?.produces_pollen)
+ return TRUE
+
+ for(var/obj/structure/flora/plant/flower in view(flora, 7))
+ if(flower.plant?.produces_pollen)
+ return TRUE
+
+
+ return FALSE
+
+/decl/insect_species/proc/process_hive(datum/extension/insect_hive/hive_metadata)
+
+ // Sanity check.
+ var/atom/movable/hive = hive_metadata.holder
+ if(!istype(hive) || !swarm_type || !istype(hive_metadata))
+ return
+
+ // Make sure we always have at least one swarm.
+ if(!length(hive_metadata.swarms))
+ new swarm_type(hive, src, hive_metadata)
+
+ // Reduce swarms if we have too many.
+ var/swarm_intensity = hive_metadata.get_total_swarm_intensity()
+ if(swarm_intensity > max_swarm_intensity && length(hive_metadata.swarms))
+ var/obj/effect/insect_swarm/swarm = hive_metadata.swarms[1]
+ swarm.adjust_swarm_intensity(-(swarm_intensity-max_swarm_intensity))
+ return
+
+ // Try to grow an existing swarm until we're at our max.
+ if(hive_metadata.has_reserves(SWARM_GROWTH_COST) && length(hive_metadata.swarms))
+ for(var/obj/effect/insect_swarm/swarm as anything in hive_metadata.swarms)
+ if(swarm.can_grow() && hive_metadata.consume_reserves(SWARM_GROWTH_COST))
+ swarm.adjust_swarm_intensity(min(max_swarm_growth_intensity-swarm_intensity, rand(3,5)))
+ return
+
+ // If we have sufficient filled combs, create a new swarm. Otherwise, expand a swarm.
+ if(hive.loc && hive_metadata.has_reserves(SWARM_GROWTH_COST))
+
+ var/obj/effect/insect_swarm/swarm
+ for(var/obj/effect/insect_swarm/check_swarm as anything in hive_metadata.swarms)
+ if(check_swarm.loc == hive.loc && check_swarm.can_grow())
+ swarm = check_swarm
+ break
+
+ if(!swarm)
+ var/comb_count = 0
+ for(var/obj/item/hive_frame/frame in hive)
+ if(REAGENT_TOTAL_VOLUME(frame.reagents) >= REAGENT_MAXIMUM_VOLUME(frame.reagents))
+ comb_count++
+ if(length(hive_metadata.swarms) < comb_count)
+ swarm = new swarm_type(hive.loc, src, hive_metadata)
+
+ if(!QDELETED(swarm) && istype(swarm) && hive_metadata.consume_reserves(SWARM_GROWTH_COST))
+ swarm.adjust_swarm_intensity(min((max_swarm_growth_intensity-swarm_intensity), rand(3,5)))
diff --git a/mods/content/beekeeping/hives/insect_species/insects_pollinators.dm b/mods/content/beekeeping/hives/insect_species/insects_pollinators.dm
new file mode 100644
index 00000000000..460ca2ef16b
--- /dev/null
+++ b/mods/content/beekeeping/hives/insect_species/insects_pollinators.dm
@@ -0,0 +1,28 @@
+/decl/insect_species/honeybees
+ name_singular = "honeybee"
+ name_plural = "honeybees"
+ nest_name = "beehive"
+ native_frame_name = "honeycomb"
+ native_frame_desc = "A lattice of hexagonal wax cells usually filled with honey."
+ native_frame_type = /obj/item/hive_frame/comb
+ swarm_desc = "A swarm of buzzing honeybees."
+ insect_desc = "A single buzzing honeybee."
+ swarm_color = COLOR_GOLD
+ swarm_type = /obj/effect/insect_swarm/pollinator
+ sting_reagent = /decl/material/liquid/bee_venom
+ sting_amount = 0.2
+ produce_reagents = list(/decl/material/liquid/nutriment/honey = 1)
+ produce_material = /decl/material/solid/organic/wax
+
+/*
+/decl/insect_species/wasps
+ name_singular = "wasp"
+ name_plural = "wasps"
+ nest_name = "wasp hive"
+ swarm_desc = "A swarm of humming wasps."
+ insect_desc = "A solitary wasp."
+ sting_reagent = /decl/material/liquid/cyanide
+ sting_amount = 1
+ swarm_color = COLOR_BRONZE
+ swarm_type = /obj/effect/insect_swarm/pollinator // tarantula hunter...
+*/
\ No newline at end of file
diff --git a/mods/content/beekeeping/icons/apiary.dmi b/mods/content/beekeeping/icons/apiary.dmi
new file mode 100644
index 00000000000..7ad80a4408f
Binary files /dev/null and b/mods/content/beekeeping/icons/apiary.dmi differ
diff --git a/mods/content/beekeeping/icons/apiary_bees_etc.dmi b/mods/content/beekeeping/icons/apiary_bees_etc.dmi
deleted file mode 100644
index 130120bb08f..00000000000
Binary files a/mods/content/beekeeping/icons/apiary_bees_etc.dmi and /dev/null differ
diff --git a/mods/content/beekeeping/icons/bee_pack.dmi b/mods/content/beekeeping/icons/bee_pack.dmi
new file mode 100644
index 00000000000..fe68dad8b4b
Binary files /dev/null and b/mods/content/beekeeping/icons/bee_pack.dmi differ
diff --git a/mods/content/beekeeping/icons/beehive.dmi b/mods/content/beekeeping/icons/beehive.dmi
new file mode 100644
index 00000000000..9b58ec19c1b
Binary files /dev/null and b/mods/content/beekeeping/icons/beehive.dmi differ
diff --git a/mods/content/beekeeping/icons/beekeeping.dmi b/mods/content/beekeeping/icons/beekeeping.dmi
deleted file mode 100644
index 569122d4a58..00000000000
Binary files a/mods/content/beekeeping/icons/beekeeping.dmi and /dev/null differ
diff --git a/mods/content/beekeeping/icons/comb.dmi b/mods/content/beekeeping/icons/comb.dmi
new file mode 100644
index 00000000000..edb611c93ae
Binary files /dev/null and b/mods/content/beekeeping/icons/comb.dmi differ
diff --git a/mods/content/beekeeping/icons/smoker.dmi b/mods/content/beekeeping/icons/smoker.dmi
index 5109ca468e5..e6b14a8576c 100644
Binary files a/mods/content/beekeeping/icons/smoker.dmi and b/mods/content/beekeeping/icons/smoker.dmi differ
diff --git a/mods/content/beekeeping/icons/swarm.dmi b/mods/content/beekeeping/icons/swarm.dmi
new file mode 100644
index 00000000000..e55d936c1f1
Binary files /dev/null and b/mods/content/beekeeping/icons/swarm.dmi differ
diff --git a/mods/content/beekeeping/items.dm b/mods/content/beekeeping/items.dm
index 2c15fa75cd0..0c7774e6f1f 100644
--- a/mods/content/beekeeping/items.dm
+++ b/mods/content/beekeeping/items.dm
@@ -1,47 +1,34 @@
-/obj/item/beehive_assembly
- name = "beehive assembly"
- desc = "Contains everything you need to build a beehive."
- icon = 'mods/content/beekeeping/icons/apiary_bees_etc.dmi'
- icon_state = "apiary"
- material = /decl/material/solid/organic/wood/oak
-
-/obj/item/beehive_assembly/attack_self(var/mob/user)
- to_chat(user, "You start assembling \the [src]...")
- if(do_after(user, 30, src))
- user.visible_message("\The [user] constructs a beehive.", "You construct a beehive.")
- new /obj/machinery/beehive(get_turf(user))
- qdel(src)
-
-/obj/item/bee_smoker
- name = "bee smoker"
- desc = "A device used to calm down bees before harvesting honey."
+/obj/item/smoker
+ name = "smoker"
+ desc = "A device used to calm insects down before harvesting from a hive."
icon = 'mods/content/beekeeping/icons/smoker.dmi'
icon_state = ICON_STATE_WORLD
w_class = ITEM_SIZE_SMALL
material = /decl/material/solid/metal/steel
-/obj/item/bee_pack
- name = "bee pack"
- desc = "Contains a queen bee and some worker bees. Everything you'll need to start a hive!"
- icon = 'mods/content/beekeeping/icons/beekeeping.dmi'
- icon_state = "beepack"
- material = /decl/material/solid/organic/plastic
- var/full = 1
+// TODO: consume reagents or charges? Unnecessary complexity?
+/obj/item/smoker/resolve_attackby(atom/A, mob/user, click_params)
+
+ if(!user.check_dexterity(get_required_attack_dexterity(user, A)))
+ return TRUE
+
+ var/smoked = FALSE
+ if(has_extension(A, /datum/extension/insect_hive))
+ var/datum/extension/insect_hive/hive = get_extension(A, /datum/extension/insect_hive)
+ if(hive.smoked_by(user, A))
+ smoked = TRUE
-/obj/item/bee_pack/Initialize()
- . = ..()
- overlays += "beepack-full"
+ if(!smoked && isturf(A))
+ for(var/obj/effect/insect_swarm/swarm in A)
+ swarm.was_smoked(smoke_time = 1 MINUTE)
+ smoked = TRUE
-/obj/item/bee_pack/proc/empty()
- full = 0
- name = "empty bee pack"
- desc = "A stasis pack for moving bees. It's empty."
- overlays.Cut()
- overlays += "beepack-empty"
+ if(smoked)
+ var/turf/smoked_turf = get_turf(A)
+ if(smoked_turf)
+ playsound(smoked_turf, 'sound/effects/refill.ogg', 25, 1)
+ user.visible_message(SPAN_NOTICE("\The [user] douses \the [A] in smoke from \the [src]."))
+ new /obj/effect/effect/smoke(smoked_turf, 2 SECONDS)
+ return TRUE
-/obj/item/bee_pack/proc/fill()
- full = initial(full)
- SetName(initial(name))
- desc = initial(desc)
- overlays.Cut()
- overlays += "beepack-full"
+ return ..()
diff --git a/mods/content/beekeeping/materials.dm b/mods/content/beekeeping/materials.dm
new file mode 100644
index 00000000000..d5fab8c75d2
--- /dev/null
+++ b/mods/content/beekeeping/materials.dm
@@ -0,0 +1,22 @@
+/decl/material/liquid/bee_venom
+ name = "bee venom"
+ uid = "liquid_venom_bee"
+ lore_text = "An irritant used by bees to drive off predators."
+ taste_description = "noxious bitterness"
+ color = "#d7d891"
+ heating_products = list(
+ /decl/material/liquid/denatured_toxin = 1
+ )
+ heating_point = 100 CELSIUS
+ heating_message = "becomes clear."
+ taste_mult = 1.2
+ metabolism = REM * 0.25
+ exoplanet_rarity_plant = MAT_RARITY_UNCOMMON
+ exoplanet_rarity_gas = MAT_RARITY_EXOTIC
+ var/pain_mult = 10
+ var/pain_threshold = 100
+
+/decl/material/liquid/bee_venom/affect_blood(mob/living/M, removed, datum/reagents/holder)
+ . = ..()
+ if(istype(M) && M.getHalLoss() < pain_threshold)
+ M.adjustHalLoss(max(1, ceil(removed * pain_mult)))
diff --git a/mods/content/beekeeping/recipes.dm b/mods/content/beekeeping/recipes.dm
index 8494617d347..3d851511382 100644
--- a/mods/content/beekeeping/recipes.dm
+++ b/mods/content/beekeeping/recipes.dm
@@ -1,6 +1,5 @@
-/decl/stack_recipe/planks/beehive_assembly
- result_type = /obj/item/beehive_assembly
- category = "furniture"
+/decl/stack_recipe/planks/furniture/apiary
+ result_type = /obj/structure/apiary
/decl/stack_recipe/planks/beehive_frame
- result_type = /obj/item/hive_frame/crafted
+ result_type = /obj/item/hive_frame/crafted
diff --git a/mods/content/beekeeping/trading.dm b/mods/content/beekeeping/trading.dm
index 45009265f1b..5e8a8dc18b1 100644
--- a/mods/content/beekeeping/trading.dm
+++ b/mods/content/beekeeping/trading.dm
@@ -1,15 +1,15 @@
/datum/trader/trading_beacon/manufacturing/New()
- LAZYSET(possible_trading_items, /obj/item/bee_pack, TRADER_THIS_TYPE)
- LAZYSET(possible_trading_items, /obj/item/bee_smoker, TRADER_THIS_TYPE)
- LAZYSET(possible_trading_items, /obj/item/beehive_assembly, TRADER_THIS_TYPE)
- LAZYSET(possible_trading_items, /obj/item/hive_frame/crafted, TRADER_THIS_TYPE)
+ LAZYSET(possible_trading_items, /obj/item/bee_pack, TRADER_THIS_TYPE)
+ LAZYSET(possible_trading_items, /obj/item/smoker, TRADER_THIS_TYPE)
+ LAZYSET(possible_trading_items, /obj/item/hive_frame/crafted, TRADER_THIS_TYPE)
+ LAZYSET(possible_trading_items, /obj/item/stack/material/plank/mapped/wood/ten, TRADER_THIS_TYPE)
..()
/decl/hierarchy/supply_pack/hydroponics/bee_keeper
name = "Equipment - Beekeeping"
contains = list(
- /obj/item/beehive_assembly,
- /obj/item/bee_smoker,
+ /obj/item/stack/material/plank/mapped/wood/ten,
+ /obj/item/smoker,
/obj/item/hive_frame/crafted = 5,
/obj/item/bee_pack
)
diff --git a/mods/content/corporate/away_sites/lar_maria/lar_maria_areas.dm b/mods/content/corporate/away_sites/lar_maria/lar_maria_areas.dm
index 65115dbaf27..7aa337a145e 100644
--- a/mods/content/corporate/away_sites/lar_maria/lar_maria_areas.dm
+++ b/mods/content/corporate/away_sites/lar_maria/lar_maria_areas.dm
@@ -1,4 +1,5 @@
/area/lar_maria
+ abstract_type = /area/lar_maria
icon = 'mods/content/corporate/away_sites/lar_maria/lar_maria_sprites.dmi'
/////////////////////////////Upper level areas
diff --git a/mods/content/fantasy/submaps/_submaps.dm b/mods/content/fantasy/submaps/_submaps.dm
index da60d375fd6..b92c691ab14 100644
--- a/mods/content/fantasy/submaps/_submaps.dm
+++ b/mods/content/fantasy/submaps/_submaps.dm
@@ -47,6 +47,7 @@
area_flags = AREA_FLAG_EXTERNAL | AREA_FLAG_IS_BACKGROUND
/area/fantasy/outside/point_of_interest
+ abstract_type = /area/fantasy/outside/point_of_interest
name = "Point Of Interest"
description = null
area_blurb_category = /area/fantasy/outside/point_of_interest
diff --git a/mods/content/fishing/_fishing.dm b/mods/content/fishing/_fishing.dm
new file mode 100644
index 00000000000..f2f9bc00d27
--- /dev/null
+++ b/mods/content/fishing/_fishing.dm
@@ -0,0 +1,2 @@
+/decl/modpack/fishing
+ name = "Fishing Modpack"
\ No newline at end of file
diff --git a/mods/content/fishing/_fishing.dme b/mods/content/fishing/_fishing.dme
new file mode 100644
index 00000000000..c68d52fd9e9
--- /dev/null
+++ b/mods/content/fishing/_fishing.dme
@@ -0,0 +1,13 @@
+#ifndef CONTENT_PACK_FISHING
+#define CONTENT_PACK_FISHING
+// BEGIN_INCLUDE
+#include "_fishing.dm"
+#include "area_fishing.dm"
+#include "fishing_bait.dm"
+#include "fishing_designs.dm"
+#include "fishing_line.dm"
+#include "fishing_recipes.dm"
+#include "fishing_rod.dm"
+#include "turf_fishing.dm"
+// END_INCLUDE
+#endif
diff --git a/mods/content/fishing/area_fishing.dm b/mods/content/fishing/area_fishing.dm
new file mode 100644
index 00000000000..5e046d58fbc
--- /dev/null
+++ b/mods/content/fishing/area_fishing.dm
@@ -0,0 +1,63 @@
+/area
+ var/fishing_failure_prob = 95
+ // Hardcoding the contents of /obj/random/junk to avoid hacks for getting results from /obj/random.
+ var/list/fishing_results = list(
+ /obj/item/remains/mouse = 1,
+ /obj/item/remains/robot = 1,
+ /obj/item/paper/crumpled = 1,
+ /obj/item/inflatable/torn = 1,
+ /obj/item/shard = 1,
+ /obj/item/hand/missing_card = 1
+ )
+
+/area/Initialize()
+ var/list/additional_fishing_results = get_additional_fishing_results()
+ if(LAZYLEN(additional_fishing_results))
+ LAZYINITLIST(fishing_results)
+ for(var/fish in additional_fishing_results)
+ fishing_results[fish] = additional_fishing_results[fish]
+ . = ..()
+
+/area/proc/get_additional_fishing_results()
+ return
+
+/area/proc/get_fishing_result(turf/origin, obj/item/food/bait)
+ if(!length(fishing_results) || prob(fishing_failure_prob))
+ return null
+ return pickweight(fishing_results)
+
+// overrides down here
+
+// Let's make a token effort at making the fish somewhat alien I guess.
+/area/exoplanet/get_fishing_result(turf/origin, obj/item/food/bait)
+ . = ..()
+ if(ismob(.))
+ var/mob/M = .
+ M.SetName("xeno-[M.name]")
+ M.set_color(get_random_colour(simple = TRUE))
+
+//Fishing results for the grass exoplanet surface
+/area/exoplanet/grass
+ fishing_failure_prob = 10
+ // TODO: waterweed?
+ // Hardcoding the contents of /obj/random/natural_debris to avoid hacks to get results out of /obj/random.
+ fishing_results = list(
+ /mob/living/simple_animal/aquatic/fish = 10,
+ /mob/living/simple_animal/aquatic/fish/grump = 10,
+ /obj/item/mollusc = 5,
+ /obj/item/mollusc/barnacle/fished = 5,
+ /mob/living/simple_animal/aquatic/fish/large = 5,
+ /mob/living/simple_animal/aquatic/fish/large/bass = 5,
+ /mob/living/simple_animal/aquatic/fish/large/salmon = 5,
+ /mob/living/simple_animal/aquatic/fish/large/trout = 5,
+ /mob/living/simple_animal/aquatic/fish/large/pike = 3,
+ /mob/living/simple_animal/aquatic/fish/large/javelin = 3,
+ /obj/item/mollusc/clam/fished/pearl = 3,
+ /obj/item/trash/mollusc_shell/clam = 2,
+ /obj/item/trash/mollusc_shell/barnacle = 2,
+ /obj/item/remains/mouse = 2,
+ /obj/item/remains/lizard = 2,
+ /obj/item/stick = 1,
+ /obj/item/trash/mollusc_shell = 1,
+ /mob/living/simple_animal/aquatic/fish/large/koi = 1
+ )
\ No newline at end of file
diff --git a/mods/content/fishing/fishing_bait.dm b/mods/content/fishing/fishing_bait.dm
new file mode 100644
index 00000000000..a0f3db926f6
--- /dev/null
+++ b/mods/content/fishing/fishing_bait.dm
@@ -0,0 +1,37 @@
+// Returns a value used as a multiplier in the fishing delay calc. Higher represents a stronger reduction in fishing time.
+#define BAIT_VALUE_CONSTANT 0.1
+/obj/item/proc/get_bait_value()
+ . = 0
+ for(var/mat in matter)
+ var/decl/material/bait_mat = GET_DECL(mat)
+ if(bait_mat.fishing_bait_value)
+ . += MATERIAL_UNITS_TO_REAGENTS_UNITS(matter[mat]) * bait_mat.fishing_bait_value * BAIT_VALUE_CONSTANT
+ for(var/decl/material/reagent as anything in REAGENT_VOLUMES(reagents))
+ if(reagent.fishing_bait_value)
+ . += REAGENT_VOLUME(reagents, reagent) * reagent.fishing_bait_value * BAIT_VALUE_CONSTANT
+#undef BAIT_VALUE_CONSTANT
+
+/decl/material
+ /// A multiplier for this material when used in fishing bait.
+ var/fishing_bait_value = 0
+
+/decl/material/solid/organic/meat
+ fishing_bait_value = 1
+
+/decl/material/solid/organic/plantmatter
+ fishing_bait_value = 0.75
+
+/decl/material/liquid/nutriment
+ fishing_bait_value = 0.65
+
+/decl/material/liquid/oil
+ fishing_bait_value = 0
+
+/decl/material/solid/organic/skin
+ fishing_bait_value = 0.75
+
+/decl/material/solid/organic/skin/feathers
+ fishing_bait_value = 0
+
+/decl/material/solid/organic/skin/fur
+ fishing_bait_value = 0
\ No newline at end of file
diff --git a/mods/content/fishing/fishing_designs.dm b/mods/content/fishing/fishing_designs.dm
new file mode 100644
index 00000000000..9d1a864cbcc
--- /dev/null
+++ b/mods/content/fishing/fishing_designs.dm
@@ -0,0 +1,5 @@
+/datum/fabricator_recipe/fishing_line
+ path = /obj/item/fishing_line
+
+/datum/fabricator_recipe/fishing_line_high_quality
+ path = /obj/item/fishing_line/high_quality
\ No newline at end of file
diff --git a/code/modules/fishing/fishing_line.dm b/mods/content/fishing/fishing_line.dm
similarity index 93%
rename from code/modules/fishing/fishing_line.dm
rename to mods/content/fishing/fishing_line.dm
index 28afa6aa1a2..7455c8af6b3 100644
--- a/code/modules/fishing/fishing_line.dm
+++ b/mods/content/fishing/fishing_line.dm
@@ -1,6 +1,6 @@
/obj/item/fishing_line
name = "fishing line"
- icon = 'icons/obj/fishing_line.dmi'
+ icon = 'mods/content/fishing/icons/fishing_line.dmi'
icon_state = ICON_STATE_WORLD
material_alteration = MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_DESC
max_health = 100
diff --git a/mods/content/fishing/fishing_recipes.dm b/mods/content/fishing/fishing_recipes.dm
new file mode 100644
index 00000000000..405773b3426
--- /dev/null
+++ b/mods/content/fishing/fishing_recipes.dm
@@ -0,0 +1,2 @@
+/decl/stack_recipe/planks/fishing_rod
+ result_type = /obj/item/fishing_rod
\ No newline at end of file
diff --git a/code/modules/fishing/fishing_rod.dm b/mods/content/fishing/fishing_rod.dm
similarity index 98%
rename from code/modules/fishing/fishing_rod.dm
rename to mods/content/fishing/fishing_rod.dm
index ae8342c0f67..eabc2f57cb0 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/mods/content/fishing/fishing_rod.dm
@@ -9,7 +9,7 @@
color = /decl/material/solid/organic/wood/oak::color
matter = null
material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC
- icon = 'icons/obj/fishing_rod.dmi'
+ icon = 'mods/content/fishing/icons/fishing_rod.dmi'
icon_state = ICON_STATE_WORLD
w_class = ITEM_SIZE_LARGE
@@ -346,7 +346,7 @@
matter = list(
/decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT
)
- icon = 'icons/obj/fishing_rod_advanced.dmi'
+ icon = 'mods/content/fishing/icons/fishing_rod_advanced.dmi'
material_alteration = MAT_FLAG_ALTERATION_COLOR
fishing_rod_quality = 0.2
line = /obj/item/fishing_line/high_quality
diff --git a/mods/content/fishing/icons/fishing_line.dmi b/mods/content/fishing/icons/fishing_line.dmi
new file mode 100644
index 00000000000..4824616fa1a
Binary files /dev/null and b/mods/content/fishing/icons/fishing_line.dmi differ
diff --git a/icons/obj/fishing_rod.dmi b/mods/content/fishing/icons/fishing_rod.dmi
similarity index 100%
rename from icons/obj/fishing_rod.dmi
rename to mods/content/fishing/icons/fishing_rod.dmi
diff --git a/icons/obj/fishing_rod_advanced.dmi b/mods/content/fishing/icons/fishing_rod_advanced.dmi
similarity index 100%
rename from icons/obj/fishing_rod_advanced.dmi
rename to mods/content/fishing/icons/fishing_rod_advanced.dmi
diff --git a/mods/content/fishing/turf_fishing.dm b/mods/content/fishing/turf_fishing.dm
new file mode 100644
index 00000000000..cc796cdcb3c
--- /dev/null
+++ b/mods/content/fishing/turf_fishing.dm
@@ -0,0 +1,3 @@
+/turf/proc/get_fishing_result(obj/item/food/bait)
+ var/area/A = get_area(src)
+ return A.get_fishing_result(src, bait)
\ No newline at end of file
diff --git a/mods/content/government/away_sites/icarus/icarus_areas.dm b/mods/content/government/away_sites/icarus/icarus_areas.dm
index 6ebe40524fb..000d9a7c529 100644
--- a/mods/content/government/away_sites/icarus/icarus_areas.dm
+++ b/mods/content/government/away_sites/icarus/icarus_areas.dm
@@ -1,4 +1,5 @@
/area/icarus
+ abstract_type = /area/icarus
icon = 'mods/content/government/away_sites/icarus/icarus_sprites.dmi'
/area/icarus/vessel
diff --git a/mods/content/holodeck/_holodeck.dm b/mods/content/holodeck/_holodeck.dm
new file mode 100644
index 00000000000..491e56bf744
--- /dev/null
+++ b/mods/content/holodeck/_holodeck.dm
@@ -0,0 +1,3 @@
+/decl/modpack/holodeck
+ name = "Holodecks and Hardlight Holograms"
+ desc = "Adds holodecks and support for hardlight hologram objects."
\ No newline at end of file
diff --git a/mods/content/holodeck/_holodeck.dme b/mods/content/holodeck/_holodeck.dme
new file mode 100644
index 00000000000..80d4c5be2cd
--- /dev/null
+++ b/mods/content/holodeck/_holodeck.dme
@@ -0,0 +1,18 @@
+#ifndef CONTENT_PACK_HOLODECK
+#define CONTENT_PACK_HOLODECK
+// BEGIN_INCLUDE
+#include "_holodeck.dm"
+#include "holo_items.dm"
+#include "holo_mobs.dm"
+#include "holo_objects.dm"
+#include "holo_racks.dm"
+#include "holo_tables.dm"
+#include "holo_turfs.dm"
+#include "holodeck_control_circuit.dm"
+#include "holodeck_control_console.dm"
+#include "holodeck_designs.dm"
+#include "holodeck_programs.dm"
+#include "maps_holodeck.dm"
+#include "trader_overrides.dm"
+// END_INCLUDE
+#endif
\ No newline at end of file
diff --git a/mods/content/holodeck/holo_items.dm b/mods/content/holodeck/holo_items.dm
new file mode 100644
index 00000000000..b62da36bd4f
--- /dev/null
+++ b/mods/content/holodeck/holo_items.dm
@@ -0,0 +1,8 @@
+/obj/machinery/destructive_analyzer/can_deconstruct(var/obj/item/used_item)
+ if(used_item.holographic)
+ return FALSE
+
+/obj/item/grenade/spawnergrenade/fake_carp
+ origin_tech = @'{"materials":2,"magnets":2,"wormholes":5}'
+ spawner_type = /mob/living/simple_animal/hostile/carp/holodeck/fake
+ deliveryamt = 4
\ No newline at end of file
diff --git a/mods/content/holodeck/holo_mobs.dm b/mods/content/holodeck/holo_mobs.dm
new file mode 100644
index 00000000000..a9e914b20f6
--- /dev/null
+++ b/mods/content/holodeck/holo_mobs.dm
@@ -0,0 +1,61 @@
+//Holocarp
+
+/mob/living/simple_animal/hostile/carp/holodeck
+ icon = 'icons/mob/simple_animal/holocarp.dmi'
+ alpha = 127
+ butchery_data = null
+ worthless = TRUE
+
+/mob/living/simple_animal/hostile/carp/holodeck/carp_randomify()
+ return
+
+/mob/living/simple_animal/hostile/carp/holodeck/on_update_icon()
+ SHOULD_CALL_PARENT(FALSE)
+ return
+
+/mob/living/simple_animal/hostile/carp/holodeck/Initialize()
+ . = ..()
+ set_light(2) //hologram lighting
+
+/mob/living/simple_animal/hostile/carp/holodeck/proc/set_safety(var/safe)
+ if (safe)
+ faction = MOB_FACTION_NEUTRAL
+ natural_weapon.set_base_attack_force(0)
+ environment_smash = 0
+ ai?.try_destroy_surroundings = FALSE
+ else
+ faction = "carp"
+ natural_weapon.set_base_attack_force(natural_weapon.get_initial_base_attack_force())
+
+/mob/living/simple_animal/hostile/carp/holodeck/gib(do_gibs = TRUE)
+ SHOULD_CALL_PARENT(FALSE)
+ if(stat != DEAD)
+ death(gibbed = TRUE)
+ if(stat == DEAD)
+ qdel(src)
+ return TRUE
+ return FALSE
+
+/mob/living/simple_animal/hostile/carp/holodeck/get_death_message(gibbed)
+ return "fades away..."
+
+/mob/living/simple_animal/hostile/carp/holodeck/get_self_death_message(gibbed)
+ return "You have been destroyed."
+
+/mob/living/simple_animal/hostile/carp/holodeck/death(gibbed)
+ . = ..()
+ if(. && !gibbed)
+ gib()
+
+// Non-dangerous holocarp
+/mob/living/simple_animal/hostile/carp/holodeck/fake
+ faction = null
+ natural_weapon = /obj/item/natural_weapon/bite/fake
+ environment_smash = 0
+ ai = /datum/mob_controller/aggressive/carp/fake
+
+/obj/item/natural_weapon/bite/fake
+ _base_attack_force = 0
+
+/datum/mob_controller/aggressive/carp/fake
+ try_destroy_surroundings = FALSE
\ No newline at end of file
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/mods/content/holodeck/holo_objects.dm
similarity index 57%
rename from code/modules/holodeck/HolodeckObjects.dm
rename to mods/content/holodeck/holo_objects.dm
index 407b1b196da..08f617da4fb 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/mods/content/holodeck/holo_objects.dm
@@ -3,130 +3,28 @@
// Holographic tables are in code/modules/tables/presets.dm
// Holographic racks are in code/modules/tables/rack.dm
-/turf/floor/holofloor
- thermal_conductivity = 0
-
-/turf/floor/holofloor/get_lumcount(var/minlum = 0, var/maxlum = 1)
- return 0.8
-
-/turf/floor/holofloor/attackby(obj/item/used_item, mob/user)
- return TRUE
- // HOLOFLOOR DOES NOT GIVE A FUCK
-
-/turf/floor/holofloor/carpet
- name = "brown carpet"
- icon = 'icons/turf/flooring/carpet.dmi'
- icon_state = "brown"
- _flooring = /decl/flooring/carpet
-
-/turf/floor/holofloor/concrete
- name = "brown carpet"
- icon = 'icons/turf/flooring/carpet.dmi'
- icon_state = "brown"
- _flooring = /decl/flooring/carpet
-
-/turf/floor/holofloor/concrete
- name = "floor"
- icon = 'icons/turf/flooring/misc.dmi'
- icon_state = "concrete"
- _flooring = null
-
-/turf/floor/holofloor/tiled
- name = "floor"
- icon = 'icons/turf/flooring/tiles.dmi'
- icon_state = "steel"
- _flooring = /decl/flooring/tiling
-
-/turf/floor/holofloor/tiled/dark
- name = "dark floor"
- icon_state = "dark"
- _flooring = /decl/flooring/tiling/dark
-
-/turf/floor/holofloor/tiled/stone
- name = "stone floor"
- icon_state = "stone"
- _flooring = /decl/flooring/tiling/stone
-
-/turf/floor/holofloor/lino
- name = "lino"
- icon = 'icons/turf/flooring/linoleum.dmi'
- icon_state = "lino"
- _flooring = /decl/flooring/linoleum
-
-/turf/floor/holofloor/wood
- name = "wooden floor"
- icon = 'icons/turf/flooring/wood.dmi'
- icon_state = "wood0"
- color = WOOD_COLOR_CHOCOLATE
- _flooring = /decl/flooring/wood
-
-/turf/floor/holofloor/grass
- name = "lush grass"
- icon = 'icons/turf/flooring/fakegrass.dmi'
- icon_state = "grass0"
- _flooring = /decl/flooring/grass/fake
-
-/turf/floor/holofloor/snow
- name = "snow"
- icon = 'icons/turf/flooring/snow.dmi'
- icon_state = "snow0"
- _flooring = /decl/flooring/snow/fake
-
-/turf/floor/holofloor/space
- name = "\proper space"
- icon = 'icons/turf/flooring/fake_space.dmi'
- icon_state = "space0"
- _flooring = /decl/flooring/fake_space
-
-/turf/floor/holofloor/reinforced
- name = "reinforced holofloor"
- icon = 'icons/turf/flooring/tiles.dmi'
- _flooring = /decl/flooring/reinforced
- icon_state = "reinforced"
-
-/turf/floor/holofloor/beach
- desc = "Uncomfortably gritty for a hologram."
- icon = 'icons/misc/beach.dmi'
- _flooring = /decl/flooring/sand/fake
- abstract_type = /turf/floor/holofloor/beach
-
-/turf/floor/holofloor/beach/sand
- name = "sand"
- icon_state = "desert0"
-
-/turf/floor/holofloor/beach/coastline
- name = "coastline"
- icon = 'icons/misc/beach2.dmi'
- icon_state = "sandwater"
- _flooring = /decl/flooring/sand/fake
-
-/turf/floor/holofloor/beach/water
- name = "water"
- icon_state = "seashallow"
- _flooring = /decl/flooring/fake_water
-
-/turf/floor/holofloor/desert
- name = "desert sand"
- desc = "Uncomfortably gritty for a hologram."
- icon = 'icons/turf/flooring/barren.dmi'
- icon_state = "barren"
- _flooring = /decl/flooring/sand/fake
-
-/turf/floor/holofloor/desert/Initialize(var/ml)
- . = ..()
- if(prob(10))
- LAZYADD(decals, image('icons/turf/flooring/decals.dmi', "asteroid[rand(0,9)]"))
+/obj
+ /// if the obj is a holographic object spawned by the holodeck
+ var/holographic = FALSE
/obj/structure/holostool
name = "stool"
desc = "Apply butt."
- icon = 'icons/obj/furniture.dmi'
+ icon = 'icons/obj/stool.dmi'
icon_state = "stool_padded_preview"
anchored = TRUE
+ worthless = TRUE
+ holographic = TRUE
/obj/item/clothing/gloves/boxing/hologlove
name = "boxing gloves"
desc = "Because you really needed another excuse to punch your crewmates."
+ worthless = TRUE
+ holographic = TRUE
+
+/obj/structure/window/reinforced/holowindow
+ worthless = TRUE
+ holographic = TRUE
/obj/structure/window/reinforced/holowindow/full
dir = NORTHEAST
@@ -148,27 +46,31 @@
// This subtype is deleted when a ready button in the same area is pressed.
/obj/structure/window/reinforced/holowindow/disappearing
+/obj/machinery/door/window/holowindoor
+ holographic = TRUE
+ worthless = TRUE
+
/obj/machinery/door/window/holowindoor/attackby(obj/item/used_item, mob/user)
- if (src.operating == 1)
+ if (operating)
return TRUE
- if(src.density && istype(used_item, /obj/item) && !istype(used_item, /obj/item/card))
- playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+ if(density && istype(used_item, /obj/item) && !istype(used_item, /obj/item/card))
+ playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("\The [src] was hit by \the [used_item].")
if(used_item.atom_damage_type == BRUTE || used_item.atom_damage_type == BURN)
take_damage(used_item.expend_attack_force(user))
return TRUE
- src.add_fingerprint(user)
- if (src.allowed(user))
- if (src.density)
+ add_fingerprint(user)
+ if (allowed(user))
+ if (density)
open()
else
close()
return TRUE
- else if (src.density)
+ else if (density)
flick("[base_state]deny", src)
return TRUE
return FALSE
@@ -184,14 +86,18 @@
/obj/structure/bed/holobed
tool_interaction_flags = 0
holographic = TRUE
+ worthless = TRUE
material = /decl/material/solid/metal/aluminium/holographic
/obj/structure/chair/holochair
tool_interaction_flags = 0
holographic = TRUE
+ worthless = TRUE
material = /decl/material/solid/metal/aluminium/holographic
/obj/item/holo
+ holographic = TRUE
+ worthless = TRUE
atom_damage_type = PAIN
no_attack_log = 1
max_health = ITEM_HEALTH_NO_DAMAGE
@@ -258,6 +164,8 @@
anchored = TRUE
density = TRUE
throwpass = 1
+ holographic = TRUE
+ worthless = TRUE
/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item) && mover.throwing)
@@ -284,6 +192,8 @@
layer = TABLE_LAYER
throwpass = 1
dir = EAST
+ holographic = TRUE
+ worthless = TRUE
/obj/structure/holonet/end
icon_state = "volleynet_end"
@@ -315,6 +225,8 @@
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON
+ holographic = TRUE
+ worthless = TRUE
/obj/machinery/readybutton/attack_ai(mob/living/silicon/ai/user)
to_chat(user, "The AI is not to interact with these devices!")
@@ -364,51 +276,3 @@
for(var/mob/M in currentarea)
to_chat(M, "FIGHT!")
-
-//Holocarp
-
-/mob/living/simple_animal/hostile/carp/holodeck
- icon = 'icons/mob/simple_animal/holocarp.dmi'
- alpha = 127
- butchery_data = null
-
-/mob/living/simple_animal/hostile/carp/holodeck/carp_randomify()
- return
-
-/mob/living/simple_animal/hostile/carp/holodeck/on_update_icon()
- SHOULD_CALL_PARENT(FALSE)
- return
-
-/mob/living/simple_animal/hostile/carp/holodeck/Initialize()
- . = ..()
- set_light(2) //hologram lighting
-
-/mob/living/simple_animal/hostile/carp/holodeck/proc/set_safety(var/safe)
- if (safe)
- faction = MOB_FACTION_NEUTRAL
- natural_weapon.set_base_attack_force(0)
- environment_smash = 0
- ai?.try_destroy_surroundings = FALSE
- else
- faction = "carp"
- natural_weapon.set_base_attack_force(natural_weapon.get_initial_base_attack_force())
-
-/mob/living/simple_animal/hostile/carp/holodeck/gib(do_gibs = TRUE)
- SHOULD_CALL_PARENT(FALSE)
- if(stat != DEAD)
- death(gibbed = TRUE)
- if(stat == DEAD)
- qdel(src)
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/carp/holodeck/get_death_message(gibbed)
- return "fades away..."
-
-/mob/living/simple_animal/hostile/carp/holodeck/get_self_death_message(gibbed)
- return "You have been destroyed."
-
-/mob/living/simple_animal/hostile/carp/holodeck/death(gibbed)
- . = ..()
- if(. && !gibbed)
- gib()
diff --git a/mods/content/holodeck/holo_racks.dm b/mods/content/holodeck/holo_racks.dm
new file mode 100644
index 00000000000..9745f215b88
--- /dev/null
+++ b/mods/content/holodeck/holo_racks.dm
@@ -0,0 +1,12 @@
+/obj/structure/rack/holorack
+ holographic = TRUE
+ worthless = TRUE
+ color = COLOR_OFF_WHITE
+ material = /decl/material/solid/metal/aluminium/holographic
+ reinf_material = /decl/material/solid/metal/aluminium/holographic
+
+/obj/structure/rack/holorack/dismantle_structure(mob/user)
+ material = null
+ reinf_material = null
+ parts_type = null
+ . = ..()
\ No newline at end of file
diff --git a/mods/content/holodeck/holo_tables.dm b/mods/content/holodeck/holo_tables.dm
new file mode 100644
index 00000000000..fe1e52be43c
--- /dev/null
+++ b/mods/content/holodeck/holo_tables.dm
@@ -0,0 +1,22 @@
+/obj/structure/table/holotable
+ icon_state = "holo_preview"
+ holographic = TRUE
+ worthless = TRUE
+ color = COLOR_OFF_WHITE
+ material = /decl/material/solid/metal/aluminium/holographic
+ reinf_material = /decl/material/solid/metal/aluminium/holographic
+
+/obj/structure/table/holo_plastictable
+ icon_state = "holo_preview"
+ holographic = TRUE
+ worthless = TRUE
+ color = COLOR_OFF_WHITE
+ material = /decl/material/solid/organic/plastic/holographic
+ reinf_material = /decl/material/solid/organic/plastic/holographic
+
+/obj/structure/table/holo_woodentable
+ holographic = TRUE
+ worthless = TRUE
+ icon_state = "holo_preview"
+ material = /decl/material/solid/organic/wood/holographic
+ reinf_material = /decl/material/solid/organic/wood/holographic
\ No newline at end of file
diff --git a/mods/content/holodeck/holo_turfs.dm b/mods/content/holodeck/holo_turfs.dm
new file mode 100644
index 00000000000..44b28b5fc96
--- /dev/null
+++ b/mods/content/holodeck/holo_turfs.dm
@@ -0,0 +1,114 @@
+/turf/floor/holofloor
+ abstract_type = /turf/floor/holofloor
+ thermal_conductivity = 0
+
+/turf/floor/holofloor/get_lumcount(var/minlum = 0, var/maxlum = 1)
+ return 0.8
+
+/turf/floor/holofloor/attackby(obj/item/used_item, mob/user)
+ return TRUE
+ // HOLOFLOOR DOES NOT GIVE A FUCK
+
+/turf/floor/holofloor/carpet
+ name = "brown carpet"
+ icon = 'icons/turf/flooring/carpet.dmi'
+ icon_state = "brown"
+ _flooring = /decl/flooring/carpet
+
+/turf/floor/holofloor/concrete
+ name = "brown carpet"
+ icon = 'icons/turf/flooring/carpet.dmi'
+ icon_state = "brown"
+ _flooring = /decl/flooring/carpet
+
+/turf/floor/holofloor/concrete
+ name = "floor"
+ icon = 'icons/turf/flooring/misc.dmi'
+ icon_state = "concrete"
+ _flooring = null
+
+/turf/floor/holofloor/tiled
+ name = "floor"
+ icon = 'icons/turf/flooring/tiles.dmi'
+ icon_state = "steel"
+ _flooring = /decl/flooring/tiling
+
+/turf/floor/holofloor/tiled/dark
+ name = "dark floor"
+ icon_state = "dark"
+ _flooring = /decl/flooring/tiling/dark
+
+/turf/floor/holofloor/tiled/stone
+ name = "stone floor"
+ icon_state = "stone"
+ _flooring = /decl/flooring/tiling/stone
+
+/turf/floor/holofloor/lino
+ name = "lino"
+ icon = 'icons/turf/flooring/linoleum.dmi'
+ icon_state = "lino"
+ _flooring = /decl/flooring/linoleum
+
+/turf/floor/holofloor/wood
+ name = "wooden floor"
+ icon = 'icons/turf/flooring/wood.dmi'
+ icon_state = "wood0"
+ color = WOOD_COLOR_CHOCOLATE
+ _flooring = /decl/flooring/wood
+
+/turf/floor/holofloor/grass
+ name = "lush grass"
+ icon = 'icons/turf/flooring/fakegrass.dmi'
+ icon_state = "grass0"
+ _flooring = /decl/flooring/grass/fake
+
+/turf/floor/holofloor/snow
+ name = "snow"
+ icon = 'icons/turf/flooring/snow.dmi'
+ icon_state = "snow0"
+ _flooring = /decl/flooring/snow/fake
+
+/turf/floor/holofloor/space
+ name = "\proper space"
+ icon = 'icons/turf/flooring/fake_space.dmi'
+ icon_state = "space0"
+ _flooring = /decl/flooring/fake_space
+
+/turf/floor/holofloor/reinforced
+ name = "reinforced holofloor"
+ icon = 'icons/turf/flooring/tiles.dmi'
+ _flooring = /decl/flooring/reinforced
+ icon_state = "reinforced"
+
+/turf/floor/holofloor/beach
+ desc = "Uncomfortably gritty for a hologram."
+ icon = 'icons/misc/beach.dmi'
+ _flooring = /decl/flooring/sand/fake
+ abstract_type = /turf/floor/holofloor/beach
+
+/turf/floor/holofloor/beach/sand
+ name = "sand"
+ icon_state = "desert0"
+
+/turf/floor/holofloor/beach/coastline
+ name = "coastline"
+ icon = 'icons/misc/beach2.dmi'
+ icon_state = "sandwater"
+ _flooring = /decl/flooring/sand/fake
+
+/turf/floor/holofloor/beach/water
+ name = "water"
+ icon_state = "seashallow"
+ _flooring = /decl/flooring/fake_water
+
+/turf/floor/holofloor/desert
+ name = "desert sand"
+ desc = "Uncomfortably gritty for a hologram."
+ icon = 'icons/turf/flooring/barren.dmi'
+ icon_state = "barren"
+ _flooring = /decl/flooring/sand/fake
+
+/turf/floor/holofloor/desert/Initialize(var/ml)
+ . = ..()
+ if(prob(10))
+ LAZYADD(decals, image('icons/turf/flooring/decals.dmi', "asteroid[rand(0,9)]"))
\ No newline at end of file
diff --git a/code/game/objects/items/circuitboards/computer/holodeckcontrol.dm b/mods/content/holodeck/holodeck_control_circuit.dm
similarity index 100%
rename from code/game/objects/items/circuitboards/computer/holodeckcontrol.dm
rename to mods/content/holodeck/holodeck_control_circuit.dm
diff --git a/code/modules/holodeck/HolodeckControl.dm b/mods/content/holodeck/holodeck_control_console.dm
similarity index 99%
rename from code/modules/holodeck/HolodeckControl.dm
rename to mods/content/holodeck/holodeck_control_console.dm
index f5db252b01d..80b2597f9c0 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/mods/content/holodeck/holodeck_control_console.dm
@@ -276,6 +276,7 @@
for(var/obj/holo_obj in holographic_objs)
holo_obj.alpha *= 0.8 //give holodeck objs a slight transparency
holo_obj.holographic = TRUE
+ holo_obj.worthless = TRUE
if(HP.ambience)
linkedholodeck.forced_ambience = HP.ambience
diff --git a/mods/content/holodeck/holodeck_designs.dm b/mods/content/holodeck/holodeck_designs.dm
new file mode 100644
index 00000000000..2160366208d
--- /dev/null
+++ b/mods/content/holodeck/holodeck_designs.dm
@@ -0,0 +1,2 @@
+/datum/fabricator_recipe/imprinter/circuit/holo
+ path = /obj/item/stock_parts/circuitboard/holodeck_control
\ No newline at end of file
diff --git a/code/modules/holodeck/HolodeckPrograms.dm b/mods/content/holodeck/holodeck_programs.dm
similarity index 100%
rename from code/modules/holodeck/HolodeckPrograms.dm
rename to mods/content/holodeck/holodeck_programs.dm
diff --git a/mods/content/holodeck/maps_holodeck.dm b/mods/content/holodeck/maps_holodeck.dm
new file mode 100644
index 00000000000..427fd2af9ba
--- /dev/null
+++ b/mods/content/holodeck/maps_holodeck.dm
@@ -0,0 +1,9 @@
+/datum/map
+ var/list/holodeck_programs = list() // map of string ids to /datum/holodeck_program instances
+ var/list/holodeck_supported_programs = list() // map of maps - first level maps from list-of-programs string id (e.g. "BarPrograms") to another map
+ // this is in order to support multiple holodeck program listings for different holodecks
+ // second level maps from program friendly display names ("Picnic Area") to program string ids ("picnicarea")
+ // as defined in holodeck_programs
+ var/list/holodeck_restricted_programs = list() // as above... but EVIL!
+ var/list/holodeck_default_program = list() // map of program list string ids to default program string id
+ var/list/holodeck_off_program = list() // as above... but for being off i guess
\ No newline at end of file
diff --git a/mods/content/holodeck/trader_overrides.dm b/mods/content/holodeck/trader_overrides.dm
new file mode 100644
index 00000000000..f3f957c0819
--- /dev/null
+++ b/mods/content/holodeck/trader_overrides.dm
@@ -0,0 +1,3 @@
+/datum/trader/ship/prank_shop/New()
+ LAZYSET(possible_trading_items, /obj/item/grenade/spawnergrenade/fake_carp, TRADER_THIS_TYPE)
+ ..()
\ No newline at end of file
diff --git a/mods/content/sealant_gun/sealant_gun.dm b/mods/content/sealant_gun/sealant_gun.dm
index 23a753cc010..79e7a251d4f 100644
--- a/mods/content/sealant_gun/sealant_gun.dm
+++ b/mods/content/sealant_gun/sealant_gun.dm
@@ -4,6 +4,7 @@
icon = 'mods/content/sealant_gun/icons/sealant_gun.dmi'
icon_state = ICON_STATE_WORLD
autofire_enabled = TRUE
+ autofire_delay = 0.5 SECONDS
has_safety = FALSE
waterproof = TRUE
w_class = ITEM_SIZE_GARGANTUAN
diff --git a/mods/content/turbolift/_turbolift.dm b/mods/content/turbolift/_turbolift.dm
new file mode 100644
index 00000000000..794dac19865
--- /dev/null
+++ b/mods/content/turbolift/_turbolift.dm
@@ -0,0 +1,3 @@
+/decl/modpack/turbolift
+ name = "Turbolifts"
+ desc = "Adds elevators and supporting code."
\ No newline at end of file
diff --git a/mods/content/turbolift/_turbolift.dme b/mods/content/turbolift/_turbolift.dme
new file mode 100644
index 00000000000..27c46ca72c8
--- /dev/null
+++ b/mods/content/turbolift/_turbolift.dme
@@ -0,0 +1,14 @@
+#ifndef MODPACK_TURBOLIFT
+#define MODPACK_TURBOLIFT
+// BEGIN_INCLUDE
+#include "_turbolift.dm"
+#include "turbolift.dm"
+#include "turbolift_areas.dm"
+#include "turbolift_console.dm"
+#include "turbolift_door.dm"
+#include "turbolift_floor.dm"
+#include "turbolift_init.dm"
+#include "turbolift_map.dm"
+#include "turbolift_turfs.dm"
+// END_INCLUDE
+#endif
\ No newline at end of file
diff --git a/icons/obj/doors/elevator/door.dmi b/mods/content/turbolift/icons/door/door.dmi
similarity index 100%
rename from icons/obj/doors/elevator/door.dmi
rename to mods/content/turbolift/icons/door/door.dmi
diff --git a/icons/obj/doors/elevator/fill_glass.dmi b/mods/content/turbolift/icons/door/fill_glass.dmi
similarity index 100%
rename from icons/obj/doors/elevator/fill_glass.dmi
rename to mods/content/turbolift/icons/door/fill_glass.dmi
diff --git a/icons/obj/doors/elevator/fill_steel.dmi b/mods/content/turbolift/icons/door/fill_steel.dmi
similarity index 100%
rename from icons/obj/doors/elevator/fill_steel.dmi
rename to mods/content/turbolift/icons/door/fill_steel.dmi
diff --git a/icons/obj/doors/elevator/lights_bolts.dmi b/mods/content/turbolift/icons/door/lights_bolts.dmi
similarity index 100%
rename from icons/obj/doors/elevator/lights_bolts.dmi
rename to mods/content/turbolift/icons/door/lights_bolts.dmi
diff --git a/icons/obj/doors/elevator/lights_deny.dmi b/mods/content/turbolift/icons/door/lights_deny.dmi
similarity index 100%
rename from icons/obj/doors/elevator/lights_deny.dmi
rename to mods/content/turbolift/icons/door/lights_deny.dmi
diff --git a/icons/obj/doors/elevator/lights_green.dmi b/mods/content/turbolift/icons/door/lights_green.dmi
similarity index 100%
rename from icons/obj/doors/elevator/lights_green.dmi
rename to mods/content/turbolift/icons/door/lights_green.dmi
diff --git a/icons/obj/turbolift.dmi b/mods/content/turbolift/icons/turbolift.dmi
similarity index 100%
rename from icons/obj/turbolift.dmi
rename to mods/content/turbolift/icons/turbolift.dmi
diff --git a/icons/obj/turbolift_preview_3x3.dmi b/mods/content/turbolift/icons/turbolift_preview_3x3.dmi
similarity index 100%
rename from icons/obj/turbolift_preview_3x3.dmi
rename to mods/content/turbolift/icons/turbolift_preview_3x3.dmi
diff --git a/icons/obj/turbolift_preview_5x5.dmi b/mods/content/turbolift/icons/turbolift_preview_5x5.dmi
similarity index 100%
rename from icons/obj/turbolift_preview_5x5.dmi
rename to mods/content/turbolift/icons/turbolift_preview_5x5.dmi
diff --git a/icons/obj/turbolift_preview_nowalls_3x3.dmi b/mods/content/turbolift/icons/turbolift_preview_nowalls_3x3.dmi
similarity index 100%
rename from icons/obj/turbolift_preview_nowalls_3x3.dmi
rename to mods/content/turbolift/icons/turbolift_preview_nowalls_3x3.dmi
diff --git a/icons/obj/turbolift_preview_nowalls_4x4.dmi b/mods/content/turbolift/icons/turbolift_preview_nowalls_4x4.dmi
similarity index 100%
rename from icons/obj/turbolift_preview_nowalls_4x4.dmi
rename to mods/content/turbolift/icons/turbolift_preview_nowalls_4x4.dmi
diff --git a/code/modules/turbolift/turbolift.dm b/mods/content/turbolift/turbolift.dm
similarity index 100%
rename from code/modules/turbolift/turbolift.dm
rename to mods/content/turbolift/turbolift.dm
diff --git a/code/modules/turbolift/turbolift_areas.dm b/mods/content/turbolift/turbolift_areas.dm
similarity index 91%
rename from code/modules/turbolift/turbolift_areas.dm
rename to mods/content/turbolift/turbolift_areas.dm
index 893f07ab67c..8874a14f998 100644
--- a/code/modules/turbolift/turbolift_areas.dm
+++ b/mods/content/turbolift/turbolift_areas.dm
@@ -1,5 +1,6 @@
// Used for creating the exchange areas.
/area/turbolift
+ abstract_type = /area/turbolift
name = "\improper Turbolift"
base_turf = /turf/open
requires_power = FALSE
diff --git a/code/modules/turbolift/turbolift_console.dm b/mods/content/turbolift/turbolift_console.dm
similarity index 98%
rename from code/modules/turbolift/turbolift_console.dm
rename to mods/content/turbolift/turbolift_console.dm
index 03c3be6b0e4..4f09b77619f 100644
--- a/code/modules/turbolift/turbolift_console.dm
+++ b/mods/content/turbolift/turbolift_console.dm
@@ -1,7 +1,7 @@
// Base type, do not use.
/obj/structure/lift
name = "turbolift control component"
- icon = 'icons/obj/turbolift.dmi'
+ icon = 'mods/content/turbolift/icons/turbolift.dmi'
anchored = TRUE
density = FALSE
layer = ABOVE_OBJ_LAYER
@@ -72,6 +72,7 @@
update_icon()
/obj/structure/lift/button/standalone
+ directional_offset = null
icon_state = "plinth"
/obj/structure/lift/button/on_update_icon()
diff --git a/code/modules/turbolift/turbolift_door.dm b/mods/content/turbolift/turbolift_door.dm
similarity index 77%
rename from code/modules/turbolift/turbolift_door.dm
rename to mods/content/turbolift/turbolift_door.dm
index f1254ef4f35..faed7d4ea29 100644
--- a/code/modules/turbolift/turbolift_door.dm
+++ b/mods/content/turbolift/turbolift_door.dm
@@ -5,12 +5,12 @@
autoclose = 0
glass = 1
airlock_type = "Lift"
- icon = 'icons/obj/doors/elevator/door.dmi'
- fill_file = 'icons/obj/doors/elevator/fill_steel.dmi'
- glass_file = 'icons/obj/doors/elevator/fill_glass.dmi'
- bolts_file = 'icons/obj/doors/elevator/lights_bolts.dmi'
- deny_file = 'icons/obj/doors/elevator/lights_deny.dmi'
- lights_file = 'icons/obj/doors/elevator/lights_green.dmi'
+ icon = 'mods/content/turbolift/icons/door/door.dmi'
+ fill_file = 'mods/content/turbolift/icons/door/fill_steel.dmi'
+ glass_file = 'mods/content/turbolift/icons/door/fill_glass.dmi'
+ bolts_file = 'mods/content/turbolift/icons/door/lights_bolts.dmi'
+ deny_file = 'mods/content/turbolift/icons/door/lights_deny.dmi'
+ lights_file = 'mods/content/turbolift/icons/door/lights_green.dmi'
paintable = PAINT_WINDOW_PAINTABLE
diff --git a/code/modules/turbolift/turbolift_floor.dm b/mods/content/turbolift/turbolift_floor.dm
similarity index 100%
rename from code/modules/turbolift/turbolift_floor.dm
rename to mods/content/turbolift/turbolift_floor.dm
diff --git a/mods/content/turbolift/turbolift_init.dm b/mods/content/turbolift/turbolift_init.dm
new file mode 100644
index 00000000000..f5010303d30
--- /dev/null
+++ b/mods/content/turbolift/turbolift_init.dm
@@ -0,0 +1,16 @@
+/decl/modpack/turbolift
+ /// A list of turbolift holders to initialize.
+ var/list/obj/abstract/turbolift_spawner/turbolifts_to_initialize = list()
+ /// A list of turbolift datums whose currently-selected floor will open on misc-late init.
+ var/list/datum/turbolift/turbolifts_to_open = list()
+
+/decl/modpack/turbolift/on_mapping_pre_finalize()
+ // Generate turbolifts last, since away sites may have elevators to generate too.
+ for(var/obj/abstract/turbolift_spawner/turbolift as anything in turbolifts_to_initialize)
+ turbolift.build_turbolift()
+
+/decl/modpack/turbolift/on_misc_late_init()
+ for(var/datum/turbolift/lift in turbolifts_to_open)
+ if(!QDELETED(lift))
+ lift.open_doors()
+ turbolifts_to_open.Cut()
diff --git a/code/modules/turbolift/turbolift_map.dm b/mods/content/turbolift/turbolift_map.dm
similarity index 94%
rename from code/modules/turbolift/turbolift_map.dm
rename to mods/content/turbolift/turbolift_map.dm
index d69a39fd5bb..eeed3f1976a 100644
--- a/code/modules/turbolift/turbolift_map.dm
+++ b/mods/content/turbolift/turbolift_map.dm
@@ -1,7 +1,7 @@
// Map object.
/obj/abstract/turbolift_spawner
name = "turbolift map placeholder"
- icon = 'icons/obj/turbolift_preview_3x3.dmi'
+ icon = 'mods/content/turbolift/icons/turbolift_preview_3x3.dmi'
dir = SOUTH // Direction of the holder determines the placement of the lift control panel and doors.
var/depth = 1 // Number of floors to generate, including the initial floor.
var/lift_size_x = 2 // Number of turfs on each axis to generate in addition to the first
@@ -31,10 +31,12 @@ INITIALIZE_IMMEDIATE(/obj/abstract/turbolift_spawner)
if(SSmapping.initialized)
build_turbolift()
else
- SSmapping.turbolifts_to_initialize += src
+ var/decl/modpack/turbolift/turbolift_modpack = IMPLIED_DECL
+ turbolift_modpack.turbolifts_to_initialize += src
/obj/abstract/turbolift_spawner/Destroy()
- SSmapping.turbolifts_to_initialize -= src
+ var/decl/modpack/turbolift/turbolift_modpack = IMPLIED_DECL
+ turbolift_modpack.turbolifts_to_initialize -= src
return ..()
/obj/abstract/turbolift_spawner/proc/build_turbolift()
@@ -254,6 +256,7 @@ INITIALIZE_IMMEDIATE(/obj/abstract/turbolift_spawner)
if(SSmisc_late.initialized)
lift.open_doors()
else
- SSmisc_late.turbolifts_to_open += lift
+ var/decl/modpack/turbolift/turbolift_modpack = IMPLIED_DECL
+ turbolift_modpack.turbolifts_to_open += lift
qdel(src) // We're done.
diff --git a/mods/content/turbolift/turbolift_turfs.dm b/mods/content/turbolift/turbolift_turfs.dm
new file mode 100644
index 00000000000..4095ad376e6
--- /dev/null
+++ b/mods/content/turbolift/turbolift_turfs.dm
@@ -0,0 +1,2 @@
+/turf/wall/elevator
+ material = /decl/material/solid/metal/alienalloy/elevatorium
diff --git a/mods/content/xenobiology/slime/items.dm b/mods/content/xenobiology/slime/items.dm
index 26304f3e971..28c96213663 100644
--- a/mods/content/xenobiology/slime/items.dm
+++ b/mods/content/xenobiology/slime/items.dm
@@ -15,7 +15,7 @@
var/Uses = 1 // uses before it goes inert
var/enhanced = 0 //has it been enhanced before?
-/obj/item/slime_extract/get_base_value()
+/obj/item/slime_extract/get_value_multiplier()
. = ..() * Uses
/obj/item/slime_extract/attackby(obj/item/used_item, mob/user)
diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl
index 698f7b162c9..ee7fc4f0a2c 100644
--- a/nano/templates/request_console.tmpl
+++ b/nano/templates/request_console.tmpl
@@ -66,7 +66,7 @@ Used In File(s): \code\game\machinery\requests_console.dm
Message sent successfully.
{{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}
{{else data.screen == 5}}
- An Error occurred. Message not sent.
+ An error occurred and your message could not be sent. Retry in 30 seconds. If the issue persists, contact your system administrator for assistance.
{{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}
{{else data.screen == 6}}
@@ -104,9 +104,9 @@ Used In File(s): \code\game\machinery\requests_console.dm
{{else}}
{{if data.newmessagepriority == 1}}
- There are new messages
+ There are new messages.
{{else data.newmessagepriority == 2}}
- NEW PRIORITY MESSAGES
+ NEW PRIORITY MESSAGE!
{{/if}}
{{:helper.link('View Messages', data.newmessagepriority ? 'mail-closed' : 'mail-open', { 'setScreen' : 6 })}}
diff --git a/nebula.dme b/nebula.dme
index b40eee57081..fb2bf99de08 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -176,7 +176,7 @@
#include "code\_onclick\drag_drop.dm"
#include "code\_onclick\ghost.dm"
#include "code\_onclick\item_attack.dm"
-#include "code\_onclick\MouseDrag.dm"
+#include "code\_onclick\mouse_drag.dm"
#include "code\_onclick\other_mobs.dm"
#include "code\_onclick\rig.dm"
#include "code\_onclick\hud\_defines.dm"
@@ -273,6 +273,7 @@
#include "code\controllers\subsystems\ambience.dm"
#include "code\controllers\subsystems\ao.dm"
#include "code\controllers\subsystems\atoms.dm"
+#include "code\controllers\subsystems\clickdrag.dm"
#include "code\controllers\subsystems\configuration.dm"
#include "code\controllers\subsystems\daycycle.dm"
#include "code\controllers\subsystems\disposals.dm"
@@ -782,7 +783,6 @@
#include "code\game\antagonist\antagonist_update.dm"
#include "code\game\area\area_abstract.dm"
#include "code\game\area\area_access.dm"
-#include "code\game\area\area_fishing.dm"
#include "code\game\area\area_power.dm"
#include "code\game\area\area_space.dm"
#include "code\game\area\areas.dm"
@@ -834,6 +834,7 @@
#include "code\game\machinery\dehumidifier.dm"
#include "code\game\machinery\deployable.dm"
#include "code\game\machinery\doppler_array.dm"
+#include "code\game\machinery\emitter.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\floodlight.dm"
#include "code\game\machinery\floor_light.dm"
@@ -886,6 +887,7 @@
#include "code\game\machinery\_machines_base\machine_construction\blast_doors.dm"
#include "code\game\machinery\_machines_base\machine_construction\computer.dm"
#include "code\game\machinery\_machines_base\machine_construction\default.dm"
+#include "code\game\machinery\_machines_base\machine_construction\emitter.dm"
#include "code\game\machinery\_machines_base\machine_construction\frame.dm"
#include "code\game\machinery\_machines_base\machine_construction\item_chassis.dm"
#include "code\game\machinery\_machines_base\machine_construction\noninteractive.dm"
@@ -1159,7 +1161,6 @@
#include "code\game\objects\items\circuitboards\wall.dm"
#include "code\game\objects\items\circuitboards\computer\air_management.dm"
#include "code\game\objects\items\circuitboards\computer\computer.dm"
-#include "code\game\objects\items\circuitboards\computer\holodeckcontrol.dm"
#include "code\game\objects\items\circuitboards\computer\modular.dm"
#include "code\game\objects\items\circuitboards\computer\shuttle.dm"
#include "code\game\objects\items\circuitboards\computer\station_alert.dm"
@@ -1443,7 +1444,6 @@
#include "code\game\objects\structures\drying_rack.dm"
#include "code\game\objects\structures\emergency_dispenser.dm"
#include "code\game\objects\structures\extinguisher.dm"
-#include "code\game\objects\structures\fences.dm"
#include "code\game\objects\structures\fireaxe_cabinet.dm"
#include "code\game\objects\structures\fires.dm"
#include "code\game\objects\structures\fishtanks.dm"
@@ -1548,6 +1548,8 @@
#include "code\game\objects\structures\decorations\_decoration.dm"
#include "code\game\objects\structures\decorations\gargoyle.dm"
#include "code\game\objects\structures\doors\_door.dm"
+#include "code\game\objects\structures\fences\_fences.dm"
+#include "code\game\objects\structures\fences\fence_types.dm"
#include "code\game\objects\structures\flora\_flora.dm"
#include "code\game\objects\structures\flora\bush.dm"
#include "code\game\objects\structures\flora\grass.dm"
@@ -2429,9 +2431,6 @@
#include "code\modules\fabrication\designs\textile\protective.dm"
#include "code\modules\fabrication\designs\textile\space.dm"
#include "code\modules\fabrication\designs\textile\storage.dm"
-#include "code\modules\fishing\bait.dm"
-#include "code\modules\fishing\fishing_line.dm"
-#include "code\modules\fishing\fishing_rod.dm"
#include "code\modules\fission\core.dm"
#include "code\modules\fission\core_control.dm"
#include "code\modules\fission\fission_circuits.dm"
@@ -2595,9 +2594,6 @@
#include "code\modules\holidays\holiday_hook.dm"
#include "code\modules\holidays\holiday_name.dm"
#include "code\modules\holidays\holiday_special.dm"
-#include "code\modules\holodeck\HolodeckControl.dm"
-#include "code\modules\holodeck\HolodeckObjects.dm"
-#include "code\modules\holodeck\HolodeckPrograms.dm"
#include "code\modules\holomap\holomap.dm"
#include "code\modules\hotloading\_admin.dm"
#include "code\modules\hotloading\note.dm"
@@ -2614,6 +2610,7 @@
#include "code\modules\hydroponics\seed_mobs.dm"
#include "code\modules\hydroponics\seed_packets.dm"
#include "code\modules\hydroponics\seed_storage.dm"
+#include "code\modules\hydroponics\worm.dm"
#include "code\modules\hydroponics\plant_types\seeds_herbs.dm"
#include "code\modules\hydroponics\plant_types\seeds_misc.dm"
#include "code\modules\hydroponics\spreading\spreading.dm"
@@ -3475,25 +3472,12 @@
#include "code\modules\power\cable\heavycable.dm"
#include "code\modules\power\cell\_cell.dm"
#include "code\modules\power\cell\cell_types.dm"
-#include "code\modules\power\singularity\collector.dm"
-#include "code\modules\power\singularity\containment_field.dm"
-#include "code\modules\power\singularity\emitter.dm"
-#include "code\modules\power\singularity\field_generator.dm"
-#include "code\modules\power\singularity\generator.dm"
-#include "code\modules\power\singularity\singularity.dm"
-#include "code\modules\power\singularity\singularity_events.dm"
-#include "code\modules\power\singularity\singularity_stages.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle_accelerator.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle_chamber.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle_control.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
-#include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
#include "code\modules\power\solar\solar_control.dm"
#include "code\modules\power\solar\solar_panel.dm"
#include "code\modules\power\solar\tracker.dm"
+#include "code\modules\projectiles\_gun.dm"
#include "code\modules\projectiles\ammunition.dm"
-#include "code\modules\projectiles\gun.dm"
+#include "code\modules\projectiles\autofire.dm"
#include "code\modules\projectiles\projectile.dm"
#include "code\modules\projectiles\secure.dm"
#include "code\modules\projectiles\ammunition\boxes.dm"
@@ -3809,6 +3793,19 @@
#include "code\modules\shuttles\shuttle_specops.dm"
#include "code\modules\shuttles\shuttle_supply.dm"
#include "code\modules\shuttles\shuttles_multi.dm"
+#include "code\modules\singularity\collector.dm"
+#include "code\modules\singularity\containment_field.dm"
+#include "code\modules\singularity\field_generator.dm"
+#include "code\modules\singularity\generator.dm"
+#include "code\modules\singularity\singularity.dm"
+#include "code\modules\singularity\singularity_events.dm"
+#include "code\modules\singularity\singularity_stages.dm"
+#include "code\modules\singularity\particle_accelerator\particle.dm"
+#include "code\modules\singularity\particle_accelerator\particle_accelerator.dm"
+#include "code\modules\singularity\particle_accelerator\particle_chamber.dm"
+#include "code\modules\singularity\particle_accelerator\particle_control.dm"
+#include "code\modules\singularity\particle_accelerator\particle_emitter.dm"
+#include "code\modules\singularity\particle_accelerator\particle_power.dm"
#include "code\modules\smes\_smes.dm"
#include "code\modules\smes\smes_buildable.dm"
#include "code\modules\smes\smes_circuit.dm"
@@ -3937,13 +3934,6 @@
#include "code\modules\turbines\largeturbine.dm"
#include "code\modules\turbines\smallturbine.dm"
#include "code\modules\turbines\turbine_circuits.dm"
-#include "code\modules\turbolift\turbolift.dm"
-#include "code\modules\turbolift\turbolift_areas.dm"
-#include "code\modules\turbolift\turbolift_console.dm"
-#include "code\modules\turbolift\turbolift_door.dm"
-#include "code\modules\turbolift\turbolift_floor.dm"
-#include "code\modules\turbolift\turbolift_map.dm"
-#include "code\modules\turbolift\turbolift_turfs.dm"
#include "code\modules\vehicles\bike.dm"
#include "code\modules\vehicles\cargo_train.dm"
#include "code\modules\vehicles\cargo_trolley.dm"
diff --git a/tools/map_migrations/5229_breakerbox.txt b/tools/map_migrations/5229_breakerbox.txt
new file mode 100644
index 00000000000..74f298b033c
--- /dev/null
+++ b/tools/map_migrations/5229_breakerbox.txt
@@ -0,0 +1 @@
+/obj/machinery/power/breakerbox/@SUBTYPES : /obj/machinery/breakerbox{@OLD}
\ No newline at end of file
diff --git a/tools/map_migrations/5401_emitter_construct_state.txt b/tools/map_migrations/5401_emitter_construct_state.txt
new file mode 100644
index 00000000000..8ce764621f5
--- /dev/null
+++ b/tools/map_migrations/5401_emitter_construct_state.txt
@@ -0,0 +1,8 @@
+# emitters use construct states instead of a bespoke state var
+# handle redundant var sets if present
+/obj/machinery/emitter/anchored{state = 2} : @OLD{@OLD; state = @SKIP; anchored = @SKIP}
+/obj/machinery/emitter/gyrotron/anchored{state = 2} : @OLD{@OLD; state = @SKIP; anchored = @SKIP}
+# remove state/anchored vars, change subtype if needed
+/obj/machinery/emitter/@SUBTYPES{state = 2} : /obj/machinery/emitter/@SUBTYPES/anchored{@OLD; state = @SKIP; anchored = @SKIP}
+/obj/machinery/emitter/@SUBTYPES{state = 1} : /obj/machinery/emitter/@SUBTYPES{@OLD; state = @SKIP; anchored = @SKIP}
+/obj/machinery/emitter/@SUBTYPES{state = 0} : /obj/machinery/emitter/@SUBTYPES{@OLD; state = @SKIP; anchored = @SKIP}