beeg commit

code/__DEFINES/_flags/_flags.dm

@@ -214,5 +214,17 @@ GLOBAL_LIST_INIT(bitflags, list(
 ///Turns the dir by 180 degrees
 #define DIRFLIP(d)       turn(d, 180)
 
+// timed_action_flags parameter for `/proc/do_after_mob`, `/proc/do_mob` and `/proc/do_after`
+/// Can do the action even if mob moves location
+#define IGNORE_USER_LOC_CHANGE (1<<0)
+/// Can do the action even if the target moves location
+#define IGNORE_TARGET_LOC_CHANGE (1<<1)
+/// Can do the action even if the item is no longer being held
+#define IGNORE_HELD_ITEM (1<<2)
+/// Can do the action even if the mob is incapacitated (ex. handcuffed)
+#define IGNORE_INCAPACITATED (1<<3)
+/// Used to prevent important slowdowns from being abused by drugs like kronkaine
+#define IGNORE_SLOWDOWNS (1<<4)
+
 /// 33554431 (2^24 - 1) is the maximum value our bitflags can reach.
 #define MAX_BITFLAG_DIGITS 8

code/__DEFINES/dcs/signals.dm

@@ -474,6 +474,8 @@
 #define COMSIG_ITEM_AFTERATTACK "item_afterattack"				//from base of obj/item/afterattack(): (atom/target, mob/user, params)
 #define COMSIG_ITEM_ALT_AFTERATTACK "item_alt_afterattack"		//from base of obj/item/altafterattack(): (atom/target, mob/user, proximity, params)
 #define COMSIG_ITEM_EQUIPPED "item_equip"						//from base of obj/item/equipped(): (/mob/equipper, slot)
+/// A mob has just unequipped an item.
+#define COMSIG_MOB_UNEQUIPPED_ITEM "mob_unequipped_item"
 	// Do not grant actions on equip.
 	#define COMPONENT_NO_GRANT_ACTIONS		1
 #define COMSIG_ITEM_DROPPED "item_drop"							//from base of obj/item/dropped(): (mob/user)

code/__DEFINES/dcs/signals/signals_medical.dm

@@ -0,0 +1,14 @@
+/// From /datum/surgery/New(): (datum/surgery/surgery, surgery_location (body zone), obj/item/bodypart/targeted_limb)
+#define COMSIG_MOB_SURGERY_STARTED "mob_surgery_started"
+
+/// From /datum/surgery_step/success(): (datum/surgery_step/step, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results)
+#define COMSIG_MOB_SURGERY_STEP_SUCCESS "mob_surgery_step_success"
+
+/// From /obj/item/shockpaddles/proc/do_success(): (obj/item/shockpaddles/source)
+#define COMSIG_DEFIBRILLATOR_SUCCESS "defib_success"
+	#define COMPONENT_DEFIB_STOP (1<<0)
+
+/// From /datum/surgery/can_start(): (mob/source, datum/surgery/surgery, mob/living/patient)
+#define COMSIG_SURGERY_STARTING "surgery_starting"
+	#define COMPONENT_CANCEL_SURGERY (1<<0)
+	#define COMPONENT_FORCE_SURGERY (1<<1)

code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm

@@ -1,3 +0,0 @@
-/// from base of atom/movable/Process_Spacemove(): (movement_dir)
-#define COMSIG_MOVABLE_SPACEMOVE "spacemove"
-	#define COMSIG_MOVABLE_STOP_SPACEMOVE (1<<0)

code/__DEFINES/dcs/signals/signals_mod.dm

@@ -1,7 +1,35 @@
 //MODsuit signals
-/// Called when a module is selected to be the active one from on_select()
+/// Called when a module is selected to be the active one from on_select(obj/item/mod/module/module)
 #define COMSIG_MOD_MODULE_SELECTED "mod_module_selected"
+/// Called when a MOD deploys one or more of its parts.
+#define COMSIG_MOD_DEPLOYED "mod_deployed"
+/// Called when a MOD retracts one or more of its parts.
+#define COMSIG_MOD_RETRACTED "mod_retracted"
+/// Called when a MOD is finished toggling itself.
+#define COMSIG_MOD_TOGGLED "mod_toggled"
 /// Called when a MOD activation is called from toggle_activate(mob/user)
 #define COMSIG_MOD_ACTIVATE "mod_activate"
 	/// Cancels the suit's activation
 	#define MOD_CANCEL_ACTIVATE (1 << 0)
+/// Called when a MOD finishes having a module removed from it.
+#define COMSIG_MOD_MODULE_REMOVED "mod_module_removed"
+/// Called when a MOD finishes having a module added to it.
+#define COMSIG_MOD_MODULE_ADDED "mod_module_added"
+/// Called when a MOD is having modules removed from crowbar_act(mob/user, obj/crowbar)
+#define COMSIG_MOD_MODULE_REMOVAL "mod_module_removal"
+	/// Cancels the removal of modules
+	#define MOD_CANCEL_REMOVAL (1 << 0)
+/// Called when a module attempts to activate, however it does. At the end of checks so you can add some yourself, or work on trigger behavior (mob/user)
+#define COMSIG_MODULE_TRIGGERED "mod_module_triggered"
+	/// Cancels activation, with no message. Include feedback on your cancel.
+	#define MOD_ABORT_USE (1<<0)
+/// Called when a module activates, after all checks have passed and cooldown started.
+#define COMSIG_MODULE_ACTIVATED "mod_module_activated"
+/// Called when a module deactivates, after all checks have passed.
+#define COMSIG_MODULE_DEACTIVATED "mod_module_deactivated"
+/// Called when a module is used, after all checks have passed and cooldown started.
+#define COMSIG_MODULE_USED "mod_module_used"
+/// Called when the MODsuit wearer is set.
+#define COMSIG_MOD_WEARER_SET "mod_wearer_set"
+/// Called when the MODsuit wearer is unset.
+#define COMSIG_MOD_WEARER_UNSET "mod_wearer_unset"

code/__DEFINES/mod.dm

@@ -2,7 +2,10 @@
 #define DEFAULT_MAX_COMPLEXITY 15
 
 /// Default cell drain per process on MODsuits
-#define DEFAULT_CELL_DRAIN 5
+#define DEFAULT_CHARGE_DRAIN 5
+
+/// Default time for a part to seal
+#define MOD_ACTIVATION_STEP_TIME (2 SECONDS)
 
 /// Passive module, just acts when put in naturally.
 #define MODULE_PASSIVE 0
@@ -14,18 +17,24 @@
 #define MODULE_ACTIVE 3
 
 //Defines used by the theme for clothing flags and similar
-#define HELMET_LAYER "helmet_layer"
+#define CONTROL_LAYER "control_layer"
 #define HELMET_FLAGS "helmet_flags"
 #define CHESTPLATE_FLAGS "chestplate_flags"
 #define GAUNTLETS_FLAGS "gauntlets_flags"
 #define BOOTS_FLAGS "boots_flags"
 
+#define UNSEALED_LAYER "unsealed_layer"
 #define UNSEALED_CLOTHING "unsealed_clothing"
 #define SEALED_CLOTHING "sealed_clothing"
 #define UNSEALED_INVISIBILITY "unsealed_invisibility"
 #define SEALED_INVISIBILITY "sealed_invisibility"
 #define UNSEALED_COVER "unsealed_cover"
 #define SEALED_COVER "sealed_cover"
+#define CAN_OVERSLOT "can_overslot"
+
+//Defines used to override MOD clothing's icon and worn icon files in the skin.
+#define MOD_ICON_OVERRIDE "mod_icon_override"
+#define MOD_WORN_ICON_OVERRIDE "mod_worn_icon_override"
 
 /// Global list of all /datum/mod_theme
 GLOBAL_LIST_INIT(mod_themes, setup_mod_themes())

code/__DEFINES/traits.dm

@@ -160,6 +160,7 @@
 #define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
 /// Prevents plasmamen from self-igniting
 #define TRAIT_NOSELFIGNITION "no_selfignition"
+#define TRAIT_NOSELFIGNITION_HEAD_ONLY "no_selfignition_head_only"
 /// Like antimagic, but doesn't block the user from casting
 #define TRAIT_ANTIMAGIC_NO_SELFBLOCK "anti_magic_no_selfblock"
 /// Gives us turf, mob and object vision through walls
@@ -229,8 +230,6 @@
 #define TRAIT_AUTO_CATCH_ITEM	"auto_catch_item"
 #define TRAIT_CLOWN_MENTALITY	"clown_mentality" // The future is now, clownman.
 #define TRAIT_FREESPRINT		"free_sprinting"
-#define TRAIT_XRAY_VISION       "xray_vision"
-#define TRAIT_THERMAL_VISION    "thermal_vision"
 #define TRAIT_NO_TELEPORT		"no-teleport" //you just can't
 #define TRAIT_NO_INTERNALS		"no-internals"
 #define TRAIT_TOXIC_ALCOHOL		"alcohol_intolerance"