guncode update (and misc refactors) (#6740)

Author: silicons

citadel.dme

@@ -86,12 +86,15 @@ DEFINE_BITFIELD(movable_flags, list(
 /// let buckled mobs pass always
 #define ATOM_PASS_BUCKLED			(1<<8)
 /// "please don't interact with us"
+/// todo: is this the same as PHASING movement?
 #define ATOM_PASS_INCORPOREAL		(1<<9)
 
 /// all actual pass flags / maximum pass
-#define ATOM_PASS_ALL (ATOM_PASS_TABLE | ATOM_PASS_GLASS | ATOM_PASS_GRILLE | \
+#define ATOM_PASS_FLAGS_ALL (ATOM_PASS_TABLE | ATOM_PASS_GLASS | ATOM_PASS_GRILLE | \
  ATOM_PASS_BLOB | ATOM_PASS_MOB | ATOM_PASS_THROWN | ATOM_PASS_CLICK | \
  ATOM_PASS_OVERHEAD_THROW | ATOM_PASS_BUCKLED | ATOM_PASS_INCORPOREAL)
+/// used for beams
+#define ATOM_PASS_FLAGS_BEAM (ATOM_PASS_TABLE | ATOM_PASS_GLASS)
 
 DEFINE_BITFIELD(pass_flags, list(
 	BITFIELD(ATOM_PASS_TABLE),

code/__DEFINES/_flags/atom_flags.dm

@@ -14,7 +14,7 @@
 #define ITEM_THROW_UNCATCHABLE	(1<<5)
 /// we cannot be used a tool on click, no matter what
 #define ITEM_NO_TOOL_ATTACK		(1<<6)
-/// we're dual wielded - multi-wielding coming later tm
+/// we're wielded, usually via /datum/component/wielding
 #define ITEM_MULTIHAND_WIELDED	(1<<7)
 /// don't allow help intent attacking
 #define ITEM_CAREFUL_BLUDGEON	(1<<8)

code/__DEFINES/_flags/item_flags.dm

@@ -1,13 +1,7 @@
 /// Percentage of tick to leave for master controller to run
 #define MAPTICK_MC_MIN_RESERVE 70
 
-/// ~~internal_tick_usage is updated every tick by extools~~
-/// sike we use byond now
-#if DM_VERSION > 513
 #define MAPTICK_LAST_INTERNAL_TICK_USAGE world.map_cpu
-#else
-#define MAPTICK_LAST_INTERNAL_TICK_USAGE 20
-#endif
 
 /// Tick limit while running normally
 #define TICK_BYOND_RESERVE 2

code/__DEFINES/_tick.dm

@@ -1,5 +1,5 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2023 Citadel Station developers.          *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
 
 //? --- armor defines ---
 //* Want to add more?
@@ -38,6 +38,9 @@
 #define ARMOR_FIRE "fire"
 #define ARMOR_ACID "acid"
 
+/**
+ * All armor enums that can be stored in an armor datum
+ */
 GLOBAL_REAL_LIST(armor_enums) = list(
 	ARMOR_MELEE,
 	ARMOR_MELEE_TIER,
@@ -59,6 +62,9 @@ GLOBAL_REAL_LIST(armor_enums) = list(
 	ARMOR_ACID,
 )
 
+/**
+ * Actual armor types that can be checked for with `damage_flag`
+ */
 GLOBAL_REAL_LIST(armor_types) = list(
 	ARMOR_MELEE,
 	ARMOR_BULLET,
@@ -110,7 +116,7 @@ GLOBAL_REAL_LIST(armor_types) = list(
 #define BULLET_TIER_MEDIUM ARMOR_TIER_ABOVE
 /// rifles
 #define BULLET_TIER_HIGH ARMOR_TIER_HIGH
-/// lmgs, light mech weapons
+/// hmgs, light mech weapons
 #define BULLET_TIER_EXTREME ARMOR_TIER_OVERWHELMING
 /// heavy mech weapons
 #define BULLET_TIER_RIDICULOUS ARMOR_TIER_RIDICULOUS

code/__DEFINES/combat/armor.dm

@@ -1,5 +1,5 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2023 Citadel Station developers.          *//
+//* Copyright (c) 2023 Citadel Station Developers           *//
 
 //* Atom destruction types, used in /deconstruct() and its derived/child/called functions.
 

code/__DEFINES/combat/atom_damage.dm

@@ -23,9 +23,6 @@
 
 //* special hybrid types; processed specially depending on type *//
 
-/// passed to electrocute_act()
-/// todo: remove
-#define DAMAGE_TYPE_ELECTROCUTE "electrocute"
 /// bioacid ; toxins for organics, acid for synthetics
 /// todo: better hybrid type handling
 #define DAMAGE_TYPE_BIOACID "bioacid"

code/__DEFINES/combat/damage.dm

@@ -0,0 +1,10 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2025 Citadel Station Developers           *//
+
+//*                              Combat Impact FX Classifiers                                   *//
+//* These are returned from an atom on query so the attacker knows what sound / visual to play. *//
+
+#define COMBAT_IMPACT_FX_GENERIC "generic"
+#define COMBAT_IMPACT_FX_FLESH   "flesh"
+#define COMBAT_IMPACT_FX_WOOD    "wood"
+#define COMBAT_IMPACT_FX_METAL   "metal"

code/__DEFINES/combat/fx.dm

@@ -1,21 +1,3 @@
-//? lathe_type bitfield
-
-#define LATHE_TYPE_AUTOLATHE (1<<0)
-#define LATHE_TYPE_PROTOLATHE (1<<1)
-#define LATHE_TYPE_CIRCUIT (1<<2)
-#define LATHE_TYPE_PROSTHETICS (1<<3)
-#define LATHE_TYPE_MECHA (1<<4)
-#define LATHE_TYPE_BIOPRINTER (1<<5)
-
-DEFINE_BITFIELD(lathe_type, list(
-	BITFIELD(LATHE_TYPE_AUTOLATHE),
-	BITFIELD(LATHE_TYPE_PROTOLATHE),
-	BITFIELD(LATHE_TYPE_CIRCUIT),
-	BITFIELD(LATHE_TYPE_PROSTHETICS),
-	BITFIELD(LATHE_TYPE_MECHA),
-	BITFIELD(LATHE_TYPE_BIOPRINTER),
-))
-
 //? design_unlock bitfield
 
 /// any lathe that can print us should have us always
@@ -75,6 +57,7 @@ DEFINE_BITFIELD(design_flags, list(
 
 //munition subcategories
 #define DESIGN_SUBCATEGORY_BALLISTIC "Ballistic"
+#define DESIGN_SUBCATEGORY_MAGNETIC "Magnetic"
 #define DESIGN_SUBCATEGORY_ENERGY "Energy"
 #define DESIGN_SUBCATEGORY_MELEE "Melee"
 #define DESIGN_SUBCATEGORY_AMMO "Ammo"
@@ -103,3 +86,56 @@ DEFINE_BITFIELD(design_flags, list(
 //science subcategories
 #define DESIGN_SUBCATEGORY_XENOBIOLOGY "Xenobiology"
 #define DESIGN_SUBCATEGORY_XENOARCHEOLOGY "Xenoarcheology"
+
+//* Design Helpers - Generic *//
+
+/**
+ * Generate a design for an entity.
+ *
+ * * Design path is appended to `/datum/prototype/design/generated`.
+ */
+#define GENERATE_DESIGN(ENTITY_PATH, DESIGN_PATH, DESIGN_ID) \
+/datum/prototype/design/generated##DESIGN_PATH { \
+	id = DESIGN_ID; \
+	build_path = ENTITY_PATH; \
+}; \
+/datum/prototype/design/generated##DESIGN_PATH
+
+//* Design Helpers - For a specific lathe *//
+
+/**
+ * Generates for all lathes.
+ * * Implicitly allows protolathes to build it.
+ */
+#define GENERATE_DESIGN_FOR_AUTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID) \
+GENERATE_DESIGN(ENTITY_PATH, DESIGN_PATH, DESIGN_ID); \
+/datum/prototype/design/generated##DESIGN_PATH { \
+	lathe_type = LATHE_TYPE_AUTOLATHE | LATHE_TYPE_PROTOLATHE; \
+}; \
+/datum/prototype/design/generated##DESIGN_PATH
+
+/**
+ * Generates for protolathes.
+ */
+#define GENERATE_DESIGN_FOR_PROTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID) \
+GENERATE_DESIGN(ENTITY_PATH, DESIGN_PATH, DESIGN_ID); \
+/datum/prototype/design/generated##DESIGN_PATH { \
+	lathe_type = LATHE_TYPE_PROTOLATHE; \
+}; \
+/datum/prototype/design/generated##DESIGN_PATH
+
+//* Design Helpers - For a specific lathe & faction *//
+
+/**
+ * Generates for Nanotrasen-standard autolathes. In the future, we might have flags
+ * for what factions get it automatically.
+ */
+#define GENERATE_DESIGN_FOR_NT_AUTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID) \
+GENERATE_DESIGN_FOR_AUTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID)
+
+/**
+ * Generates for Nanotrasen-standard protolathes. In the future, we might have flags
+ * for what factions get it automatically.
+ */
+#define GENERATE_DESIGN_FOR_NT_PROTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID) \
+GENERATE_DESIGN_FOR_PROTOLATHE(ENTITY_PATH, DESIGN_PATH, DESIGN_ID)

code/__DEFINES/datums/design.dm

@@ -0,0 +1,46 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+//* Firing Cycles *//
+
+/**
+ * Called before initiation of a firing cycle, with (datum/gun_firing_cycle/cycle).
+ */
+#define COMSIG_GUN_FIRING_CYCLE_START "gun-firing-start"
+
+/**
+ * Called on end of a firing cycle, with (datum/gun_firing_cycle/cycle).
+ */
+#define COMSIG_GUN_FIRING_CYCLE_END "gun-firing-end"
+
+//* Fire() Injections *//
+
+/**
+ * Signature: (datum/gun_firing_cycle/cycle)
+ * * Raised before every fire() call.
+ */
+#define COMSIG_GUN_FIRING_PREFIRE "gun-firing-prefire"
+
+/**
+ * Signature: (datum/gun_firing_cycle/cycle, obj/projectile/proj)
+ * * Raised before every fire() call, after consume_next_projectile().
+ * * Only valid on /obj/item/gun/projectile
+ * * This happens after the nominal PNR, so anything like energy drains and whatnot would have already
+ *   been done by now. Keep that in mind.
+ */
+#define COMSIG_GUN_FIRING_PROJECTILE_INJECTION "gun-firing-projectile"
+
+/**
+ * Signature: (datum/gun_firing_cycle/cycle, atom/movable/proj)
+ * * Raised before every fire() call, after consume_next_throwable().
+ * * Only valid on /obj/item/gun/launcher
+ * * This happens after the nominal PNR, so anything like energy drains and whatnot would have already
+ *   been done by now. Keep that in mind.
+ */
+#define COMSIG_GUN_FIRING_THROWABLE_INJECTION "gun-firing-throwable"
+
+/**
+ * Signature: (datum/gun_firing_cycle/cycle)
+ * * Raised after every fire() call, before post_fire().
+ */
+#define COMSIG_GUN_FIRING_POSTFIRE "gun-firing-postfire"