[MODULAR] Refactors Soulcatcher Souls into a Component (Skyrat-SS13#2…

…4717) * It's a start * more stuff * a * nice * Update attachable_soulcatcher.dm * code work better :3 * mal requested proc * let's move this little file over * Update soulcatcher_mob.dm * hehe :) * say * some more touches * Update soulcatcher_component.dm * working on signals * a * more * sending some signals :) * Update soulcatcher_component.dm * a instance I missed * some slimming down * whoops * Update declarations.dm * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_user_component.dm Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_user_component.dm Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_user_component.dm Co-authored-by: Bloop <[email protected]> * Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm Co-authored-by: Bloop <[email protected]> * Update soulcatcher_tgui.dm * wew * woag * I don't want this PR to be hell to review * okay, just a little bit of moving * a * defines, they do exist * man * more renaming * mob * Update carrier_component.dm * Update soulcatcher_component.dm * a * some more moving * Update soulcatcher_verbs.dm * more tweaks * a * Update carrier_user_component.dm * chat fixes * updates how verbs work * getting the code to work * more adjustments * aaaaaa * Update carrier_tgui.dm * final fixes * Update carrier_tgui.dm --------- Co-authored-by: Bloop <[email protected]>
destrucktoid · Feb 23, 2024 · 3a039e6 · 3a039e6
1 parent 95a6748
commit 3a039e6
Show file tree

Hide file tree

Showing 21 changed files with 1,454 additions and 1,048 deletions.
diff --git a/code/__DEFINES/~skyrat_defines/signals.dm b/code/__DEFINES/~skyrat_defines/signals.dm
@@ -87,3 +87,24 @@
 
 /// Whenever we need to get the soul of the mob inside of the soulcatcher.
 #define COMSIG_SOULCATCHER_SCAN_BODY "soulcatcher_scan_body"
+
+/// Whenever we need to change the current room of a soulcatcher soul.
+#define COMSIG_CARRIER_MOB_CHANGE_ROOM "carrier_mob_change_room"
+
+/// Whenever we need to toggle the senses of a soulcatcher soul.
+#define COMSIG_CARRIER_MOB_TOGGLE_SENSE "carrier_mob_toggle_sense"
+
+/// Whenever we need to rename a soulcatcher soul.
+#define COMSIG_CARRIER_MOB_RENAME "carrier_mob_rename"
+
+/// Whenever we need to reset the name of a soulcatcher soul.
+#define COMSIG_CARRIER_MOB_RESET_NAME "carrier_mob_reset_name"
+
+/// Whenever we need to check if our soulcatcher soul is able to internally hear/see?
+#define COMSIG_CARRIER_MOB_CHECK_INTERNAL_SENSES "carrier_mob_internal_senses"
+
+/// Whenever we need to refresh the internal appearance of a soulcatcher soul.area
+#define COMSIG_CARRIER_MOB_REFRESH_APPEARANCE "carrier_mob_refresh_appearance"
+
+/// Whenever we need the soulcatcher soul to communicate something.
+#define COMSIG_CARRIER_MOB_SAY "carrier_mob_communicate"
diff --git a/code/__DEFINES/~skyrat_defines/traits.dm b/code/__DEFINES/~skyrat_defines/traits.dm
@@ -3,3 +3,4 @@
 #define SLIPPERY_MIN 5
 /// The maximum amount of tiles a TRAIT_SLIPPERY haver will slide on slip
 #define SLIPPERY_MAX 9
+
diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm
@@ -109,6 +109,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait that was granted by a NIFSoft
 #define TRAIT_NIFSOFT "nifsoft"
 
+/// Trait that was granted by a soulcatcher
+#define TRAIT_CARRIER "soulcatcher"
+
 /// Trait given to a piece of eyewear that allows the user to use NIFSoft HUDs
 #define TRAIT_NIFSOFT_HUD_GRANTER "nifsoft_hud_granter"
 

diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -631,6 +631,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NEVERBONER" = TRAIT_NEVERBONER,
 		"TRAIT_NIFSOFT" = TRAIT_NIFSOFT,
 		"TRAIT_NIFSOFT_HUD_GRANTER" = TRAIT_NIFSOFT_HUD_GRANTER,
+		"TRAIT_CARRIER" = TRAIT_CARRIER,
 		"TRAIT_NO_HUSK" = TRAIT_NO_HUSK,
 		"TRAIT_NORUNNING" = TRAIT_NORUNNING,
 		"TRAIT_NUMBED" = TRAIT_NUMBED,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		#define SLIPPERY_MIN 5
		/// The maximum amount of tiles a TRAIT_SLIPPERY haver will slide on slip
		#define SLIPPERY_MAX 9