Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25172

code/__DEFINES/dcs/signals/signals_object.dm

@@ -12,6 +12,8 @@
 /// from /obj/item/toy/crayon/spraycan/afterattack: (user, spraycan, color_is_dark)
 #define COMSIG_OBJ_PAINTED "obj_painted"
 	#define DONT_USE_SPRAYCAN_CHARGES (1<<0)
+/// from /obj/obj_reskin: (mob/user, skin)
+#define COMSIG_OBJ_RESKIN "obj_reskin"
 
 // /obj/machinery signals
 
@@ -361,9 +363,9 @@
 
 // /obj/projectile signals (sent to the firer)
 
-///from base of /obj/projectile/proc/on_hit(), like COMSIG_PROJECTILE_ON_HIT but on the projectile itself and with the hit limb (if any): (atom/movable/firer, atom/target, angle, hit_limb)
+///from base of /obj/projectile/proc/on_hit(), like COMSIG_PROJECTILE_ON_HIT but on the projectile itself and with the hit limb (if any): (atom/movable/firer, atom/target, angle, hit_limb, blocked)
 #define COMSIG_PROJECTILE_SELF_ON_HIT "projectile_self_on_hit"
-///from base of /obj/projectile/proc/on_hit(): (atom/movable/firer, atom/target, angle, hit_limb)
+///from base of /obj/projectile/proc/on_hit(): (atom/movable/firer, atom/target, angle, hit_limb, blocked)
 #define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit"
 ///from base of /obj/projectile/proc/fire(): (obj/projectile, atom/original_target)
 #define COMSIG_PROJECTILE_BEFORE_FIRE "projectile_before_fire"
@@ -387,6 +389,9 @@
 ///sent to targets during the process_hit proc of projectiles
 #define COMSIG_FIRE_CASING "fire_casing"
 
+///from the base of /obj/item/ammo_casing/ready_proj() : (atom/target, mob/living/user, quiet, zone_override, atom/fired_from)
+#define COMSIG_CASING_READY_PROJECTILE "casing_ready_projectile"
+
 ///sent to the projectile after an item is spawned by the projectile_drop element: (new_item)
 #define COMSIG_PROJECTILE_ON_SPAWN_DROP "projectile_on_spawn_drop"
 ///sent to the projectile when spawning the item (shrapnel) that may be embedded: (new_item)
@@ -448,6 +453,12 @@
 #define COMSIG_ITEM_AFTERATTACK_SECONDARY "item_afterattack_secondary"
 ///from base of obj/item/attack_qdeleted(): (atom/target, mob/user, params)
 #define COMSIG_ITEM_ATTACK_QDELETED "item_attack_qdeleted"
+///from base of obj/item/embedded(): (atom/target, obj/item/bodypart/part)
+#define COMSIG_ITEM_EMBEDDED "item_embedded"
+///from base of datum/component/embedded/safeRemove(): (mob/living/carbon/victim)
+#define COMSIG_ITEM_UNEMBEDDED "item_unembedded"
+/// from base of obj/item/failedEmbed()
+#define COMSIG_ITEM_FAILED_EMBED "item_failed_embed"
 
 ///from /obj/item/assembly/proc/pulsed(mob/pulser)
 #define COMSIG_ASSEMBLY_PULSED "assembly_pulsed"
@@ -481,3 +492,26 @@
 
 /// from /obj/structure/cursed_slot_machine/determine_victor() when someone finally wins.
 #define COMSIG_GLOB_CURSED_SLOT_MACHINE_WON "cursed_slot_machine_won"
+
+/// from /datum/component/dart_insert/add_to_dart() : (obj/item/ammo_casing, mob/user)
+#define COMSIG_DART_INSERT_ADDED "dart_insert_added"
+
+/// from /datum/component/dart_insert/remove_from_dart() : (obj/ammo_casing/dart, mob/user)
+#define COMSIG_DART_INSERT_REMOVED "dart_insert_removed"
+
+/**
+ * from /datum/component/dart_insert/get_dart_var_modifiers() : (list/out_modifiers)
+ *
+ * valid indices for `out_modifiers` are:
+ * - `damage`: number
+ * - `speed`: number
+ * - `armour_penetration`: number
+ * - `wound_bonus`: number
+ * - `bare_wound_bonus`: number
+ * - `demolition_mod`: number
+ * - `embedding`: list with embedding params
+ */
+#define COMSIG_DART_INSERT_GET_VAR_MODIFIERS "dart_insert_get_var_modifiers"
+
+/// from /datum/component/dart_insert/on_reskin()
+#define COMSIG_DART_INSERT_PARENT_RESKINNED "dart_insert_parent_reskinned"

code/__DEFINES/surgery.dm

@@ -43,6 +43,8 @@
 #define BODYPART_PSEUDOPART (1<<1)
 /// Bodypart did not match the owner's default bodypart limb_id when surgically implanted
 #define BODYPART_IMPLANTED (1<<2)
+/// Bodypart never displays as a husk
+#define BODYPART_UNHUSKABLE (1<<3)
 
 // Bodypart change blocking flags
 ///Bodypart does not get replaced during set_species()

code/__DEFINES/traits/declarations.dm

@@ -124,6 +124,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NUKEIMMUNE "nuke_immunity"
 /// Can't be given viruses
 #define TRAIT_VIRUSIMMUNE "virus_immunity"
+/// Won't become a husk under any circumstances
+#define TRAIT_UNHUSKABLE "trait_unhuskable"
 /// Reduces the chance viruses will spread to this mob, and if the mob has a virus, slows its advancement
 #define TRAIT_VIRUS_RESISTANCE "virus_resistance"
 #define TRAIT_GENELESS "geneless"
@@ -538,6 +540,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Disables the floating animation. See above.
 #define TRAIT_NO_FLOATING_ANIM "no-floating-animation"
 
+/// Cannot be turned into a funny skeleton by the plasma river
+#define TRAIT_NO_PLASMA_TRANSFORM "no_plasma_transform"
+
 /// Weather immunities, also protect mobs inside them.
 #define TRAIT_LAVA_IMMUNE "lava_immune" //Used by lava turfs and The Floor Is Lava.
 #define TRAIT_ASHSTORM_IMMUNE "ashstorm_immune"
@@ -978,4 +983,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait given to mobs that we do not want to mindswap
 #define TRAIT_NO_MINDSWAP "no_mindswap"
 
+/// Trait given to foam darts that have an insert in them
+#define TRAIT_DART_HAS_INSERT "dart_has_insert"
 // END TRAIT DEFINES

code/__DEFINES/vv.dm

@@ -103,6 +103,8 @@
 #define VV_HK_ARMOR_MOD "mod_obj_armor"
 
 // /atom/movable
+#define VV_HK_OBSERVE_FOLLOW "observe_follow"
+#define VV_HK_GET_MOVABLE "get_movable"
 #define VV_HK_DEADCHAT_PLAYS "deadchat_plays"
 
 // /obj
@@ -138,7 +140,6 @@
 #define VV_HK_GIVE_GUARDIAN_SPIRIT "give_guardian_spirit"
 
 // /mob/living/carbon
-#define VV_HK_MAKE_AI "aiify"
 #define VV_HK_MODIFY_BODYPART "mod_bodypart"
 #define VV_HK_MODIFY_ORGANS "organs_modify"
 #define VV_HK_MARTIAL_ART "give_martial_art"

code/__DEFINES/~skyrat_defines/combat.dm

@@ -1,4 +1,3 @@
-#define PUNCH_STAMINA_MULTIPLIER 2.6
 
 //Stamina threshold from which resisting a grab becomes hard
 #define STAMINA_THRESHOLD_HARD_RESIST 80

code/__HELPERS/colors.dm

@@ -17,6 +17,18 @@
 
 	return final_color
 
+/// Given a color in the format of "#RRGGBB" or "#RRGGBBAA", gives back a 4 entry list with the number values of each
+/proc/split_color(color)
+	var/list/output = list()
+	output += hex2num(copytext(color, 2, 4))
+	output += hex2num(copytext(color, 4, 6))
+	output += hex2num(copytext(color, 6, 8))
+	if(length(color) == 9)
+		output += hex2num(copytext(color, 8, 10))
+	else
+		output += 255
+	return output
+
 ///Returns a random color picked from a list, has 2 modes (0 and 1), mode 1 doesn't pick white, black or gray
 /proc/random_colour(mode = 0)
 	switch(mode)

code/__HELPERS/maths.dm

@@ -217,3 +217,8 @@
 		return max(new_value, threshold)
 	if(sign == -1)
 		return min(new_value, threshold * -1)
+
+/// Takes two values x and y, and returns 1/((1/x) + y)
+/// Useful for providing an additive modifier to a value that is used as a divisor, such as `/obj/projectile/var/speed`
+/proc/reciprocal_add(x, y)
+	return 1/((1/x)+y)

code/_globalvars/traits/_traits.dm

@@ -282,6 +282,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_DNA_SCRAMBLE" = TRAIT_NO_DNA_SCRAMBLE,
 		"TRAIT_NO_FLOATING_ANIM" = TRAIT_NO_FLOATING_ANIM,
 		"TRAIT_NO_GLIDE" = TRAIT_NO_GLIDE,
+		"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM,
 		"TRAIT_NO_GUN_AKIMBO" = TRAIT_NO_GUN_AKIMBO,
 		"TRAIT_NO_IMMOBILIZE" = TRAIT_NO_IMMOBILIZE,
 		"TRAIT_NO_JUMPSUIT" = TRAIT_NO_JUMPSUIT,
@@ -423,6 +424,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNBREAKABLE" = TRAIT_UNBREAKABLE,
 		"TRAIT_UNDENSE" = TRAIT_UNDENSE,
 		"TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE" = TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE,
+		"TRAIT_UNHUSKABLE" = TRAIT_UNHUSKABLE,
 		"TRAIT_UNINTELLIGIBLE_SPEECH" = TRAIT_UNINTELLIGIBLE_SPEECH,
 		"TRAIT_UNKNOWN" = TRAIT_UNKNOWN,
 		"TRAIT_UNNATURAL_RED_GLOWY_EYES" = TRAIT_UNNATURAL_RED_GLOWY_EYES,
@@ -473,6 +475,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNCATCHABLE" = TRAIT_UNCATCHABLE,
 		"TRAIT_WIELDED" = TRAIT_WIELDED,
 	),
+	/obj/item/ammo_casing = list(
+		"TRAIT_DART_HAS_INSERT" = TRAIT_DART_HAS_INSERT,
+	),
 	/obj/item/bodypart = list(
 		"TRAIT_DISABLED_BY_WOUND" = TRAIT_DISABLED_BY_WOUND,
 		"TRAIT_IGNORED_BY_LIVING_FLESH" = TRAIT_IGNORED_BY_LIVING_FLESH,

code/_globalvars/traits/admin_tooling.dm

@@ -129,6 +129,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_NO_BLOOD_OVERLAY" = TRAIT_NO_BLOOD_OVERLAY,
 		"TRAIT_NO_DNA_COPY" = TRAIT_NO_DNA_COPY,
 		"TRAIT_NO_GLIDE" = TRAIT_NO_GLIDE,
+		"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM,
 		"TRAIT_NO_SLIP_ALL" = TRAIT_NO_SLIP_ALL,
 		"TRAIT_NO_SLIP_ICE" = TRAIT_NO_SLIP_ICE,
 		"TRAIT_NO_SLIP_SLIDE" = TRAIT_NO_SLIP_SLIDE,
@@ -214,6 +215,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_UI_BLOCKED" = TRAIT_UI_BLOCKED,
 		"TRAIT_UNDENSE" = TRAIT_UNDENSE,
 		"TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE" = TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE,
+		"TRAIT_UNHUSKABLE" = TRAIT_UNHUSKABLE,
 		"TRAIT_UNINTELLIGIBLE_SPEECH" = TRAIT_UNINTELLIGIBLE_SPEECH,
 		"TRAIT_UNKNOWN" = TRAIT_UNKNOWN,
 		"TRAIT_UNNATURAL_RED_GLOWY_EYES" = TRAIT_UNNATURAL_RED_GLOWY_EYES,

code/datums/components/dart_insert.dm

@@ -0,0 +1,161 @@
+/**
+ * Component for allowing items to be inserted into foam darts.
+ * The parent can register signal handlers for `COMSIG_DART_INSERT_ADDED`,
+ * `COMSIG_DART_INSERT_REMOVED` to define custom behavior for when the item
+ * is added to/removed from a dart, and `COMSIG_DART_INSERT_GET_VAR_MODIFIERS`
+ * to define the modifications the item makes to the vars of the fired projectile.
+ */
+/datum/component/dart_insert
+	/// List for tracking the modifications this component has made to the vars of the containing projectile
+	var/list/var_modifiers
+	/// A reference to the ammo casing this component's parent was inserted into
+	var/obj/item/ammo_casing/holder_casing
+	/// A reference to the projectile this component's parent was inserted into
+	var/obj/projectile/holder_projectile
+	/// The icon file used for the overlay applied over the containing ammo casing
+	var/casing_overlay_icon
+	/// The icon state used for the overlay applied over the containing ammo casing
+	var/casing_overlay_icon_state
+	/// The icon file used for the overlay applied over the containing projectile
+	var/projectile_overlay_icon
+	/// The icon state used for the overlay applied over the containing projectile
+	var/projectile_overlay_icon_state
+
+/datum/component/dart_insert/Initialize(_casing_overlay_icon, _casing_overlay_icon_state, _projectile_overlay_icon, _projectile_overlay_icon_state)
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+	casing_overlay_icon = _casing_overlay_icon
+	casing_overlay_icon_state = _casing_overlay_icon_state
+	projectile_overlay_icon = _projectile_overlay_icon
+	projectile_overlay_icon_state = _projectile_overlay_icon_state
+
+/datum/component/dart_insert/RegisterWithParent()
+	. = ..()
+	RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(on_preattack))
+	RegisterSignal(parent, COMSIG_OBJ_RESKIN, PROC_REF(on_reskin))
+
+/datum/component/dart_insert/UnregisterFromParent()
+	. = ..()
+	var/obj/item/parent_item = parent
+	var/parent_loc = parent_item.loc
+	if(parent_loc && (parent_loc == holder_casing || parent_loc == holder_projectile))
+		parent_item.forceMove(get_turf(parent_item))
+	remove_from_dart(holder_casing, holder_projectile)
+	UnregisterSignal(parent, COMSIG_ITEM_PRE_ATTACK)
+
+/datum/component/dart_insert/proc/on_preattack(datum/source, atom/target, mob/user, params)
+	SIGNAL_HANDLER
+	var/obj/item/ammo_casing/foam_dart/dart = target
+	if(!istype(dart))
+		return
+	if(!dart.modified)
+		to_chat(user, span_warning("The safety cap prevents you from inserting [parent] into [dart]."))
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+	if(HAS_TRAIT(dart, TRAIT_DART_HAS_INSERT))
+		to_chat(user, span_warning("There's already something in [dart]."))
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+	add_to_dart(dart, user)
+	return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/dart_insert/proc/on_reskin(datum/source, mob/user, skin)
+	SIGNAL_HANDLER
+	SEND_SIGNAL(parent, COMSIG_DART_INSERT_PARENT_RESKINNED)
+
+/datum/component/dart_insert/proc/add_to_dart(obj/item/ammo_casing/dart, mob/user)
+	var/obj/projectile/dart_projectile = dart.loaded_projectile
+	var/obj/item/parent_item = parent
+	if(user)
+		if(!user.transferItemToLoc(parent_item, dart_projectile))
+			return
+		to_chat(user, span_notice("You insert [parent_item] into [dart]."))
+	else
+		parent_item.forceMove(dart_projectile)
+	ADD_TRAIT(dart, TRAIT_DART_HAS_INSERT, REF(src))
+	RegisterSignal(dart, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_dart_attack_self))
+	RegisterSignal(dart, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_dart_examine_more))
+	RegisterSignals(parent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(on_leave_dart))
+	RegisterSignal(dart, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_casing_update_overlays))
+	RegisterSignal(dart_projectile, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_projectile_update_overlays))
+	RegisterSignals(dart_projectile, list(COMSIG_PROJECTILE_ON_SPAWN_DROP, COMSIG_PROJECTILE_ON_SPAWN_EMBEDDED), PROC_REF(on_spawn_drop))
+	apply_var_modifiers(dart_projectile)
+	dart.harmful = dart_projectile.damage > 0 || dart_projectile.wound_bonus > 0 || dart_projectile.bare_wound_bonus > 0
+	SEND_SIGNAL(parent, COMSIG_DART_INSERT_ADDED, dart)
+	dart.update_appearance()
+	dart_projectile.update_appearance()
+	holder_casing = dart
+	holder_projectile = dart_projectile
+
+/datum/component/dart_insert/proc/remove_from_dart(obj/item/ammo_casing/dart, obj/projectile/projectile, mob/user)
+	holder_casing = null
+	holder_projectile = null
+	if(istype(dart))
+		UnregisterSignal(dart, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ATOM_EXAMINE_MORE, COMSIG_ATOM_UPDATE_OVERLAYS))
+		REMOVE_TRAIT(dart, TRAIT_DART_HAS_INSERT, REF(src))
+		dart.update_appearance()
+	if(istype(projectile))
+		remove_var_modifiers(projectile)
+		UnregisterSignal(projectile, list(COMSIG_PROJECTILE_ON_SPAWN_DROP, COMSIG_PROJECTILE_ON_SPAWN_EMBEDDED, COMSIG_ATOM_UPDATE_OVERLAYS))
+		if(dart?.loaded_projectile == projectile)
+			dart.harmful = projectile.damage > 0 || projectile.wound_bonus > 0 || projectile.bare_wound_bonus > 0
+		projectile.update_appearance()
+	SEND_SIGNAL(parent, COMSIG_DART_INSERT_REMOVED, dart, projectile, user)
+	UnregisterSignal(parent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED))
+	if(user)
+		INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), parent)
+		to_chat(user, span_notice("You remove [parent] from [dart]."))
+
+/datum/component/dart_insert/proc/on_dart_attack_self(datum/source, mob/user)
+	SIGNAL_HANDLER
+	remove_from_dart(holder_casing, holder_projectile, user)
+
+/datum/component/dart_insert/proc/on_dart_examine_more(datum/source, mob/user, list/examine_list)
+	var/obj/item/parent_item = parent
+	examine_list += span_notice("You can see a [parent_item.name] inserted into it.")
+
+/datum/component/dart_insert/proc/on_leave_dart()
+	SIGNAL_HANDLER
+	remove_from_dart(holder_casing, holder_projectile)
+
+/datum/component/dart_insert/proc/on_spawn_drop(datum/source, obj/item/ammo_casing/new_casing)
+	SIGNAL_HANDLER
+	UnregisterSignal(parent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED))
+	add_to_dart(new_casing)
+
+/datum/component/dart_insert/proc/on_casing_update_overlays(datum/source, list/new_overlays)
+	SIGNAL_HANDLER
+	new_overlays += mutable_appearance(casing_overlay_icon, casing_overlay_icon_state)
+
+/datum/component/dart_insert/proc/on_projectile_update_overlays(datum/source, list/new_overlays)
+	SIGNAL_HANDLER
+	new_overlays += mutable_appearance(projectile_overlay_icon, projectile_overlay_icon_state)
+
+/datum/component/dart_insert/proc/apply_var_modifiers(obj/projectile/projectile)
+	LAZYINITLIST(var_modifiers)
+	SEND_SIGNAL(parent, COMSIG_DART_INSERT_GET_VAR_MODIFIERS, var_modifiers)
+	projectile.damage += var_modifiers["damage"]
+	if(var_modifiers["speed"])
+		var_modifiers["speed"] = reciprocal_add(projectile.speed, var_modifiers["speed"]) - projectile.speed
+	projectile.speed += var_modifiers["speed"]
+	projectile.armour_penetration += var_modifiers["armour_penetration"]
+	projectile.wound_bonus += var_modifiers["wound_bonus"]
+	projectile.bare_wound_bonus += var_modifiers["bare_wound_bonus"]
+	projectile.demolition_mod += var_modifiers["demolition_mod"]
+	if(islist(var_modifiers["embedding"]))
+		var/list/embed_params = var_modifiers["embedding"]
+		for(var/embed_param in embed_params - "ignore_throwspeed_threshold")
+			LAZYADDASSOC(projectile.embedding, embed_param, embed_params[embed_param])
+		projectile.updateEmbedding()
+
+/datum/component/dart_insert/proc/remove_var_modifiers(obj/projectile/projectile)
+	projectile.damage -= var_modifiers["damage"]
+	projectile.speed -= var_modifiers["speed"]
+	projectile.armour_penetration -= var_modifiers["armour_penetration"]
+	projectile.wound_bonus -= var_modifiers["wound_bonus"]
+	projectile.bare_wound_bonus -= var_modifiers["bare_wound_bonus"]
+	projectile.demolition_mod -= var_modifiers["demolition_mod"]
+	if(islist(var_modifiers["embedding"]))
+		var/list/embed_params = var_modifiers["embedding"]
+		for(var/embed_param in embed_params - "ignore_throwspeed_threshold")
+			LAZYADDASSOC(projectile.embedding, embed_param, -embed_params[embed_param])
+		projectile.updateEmbedding()
+	var_modifiers.Cut()

code/datums/components/embedded.dm

@@ -228,6 +228,7 @@
 	limb._unembed_object(weapon)
 	UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) // have to do it here otherwise we trigger weaponDeleted()
 
+	SEND_SIGNAL(weapon, COMSIG_ITEM_UNEMBEDDED, victim)
 	if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del
 		UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING))
 		if(to_hands)