Merge branch 'DopplerShift13:master' into master

Author: Paxilmaniac

_maps/map_files/Mining/Iceland.dmm

@@ -37,6 +37,8 @@
 #define TRAIT_PERMITTED_CYBERNETIC "permitted_cybernetic"
 /// No step on glass
 #define TRAIT_HARD_SOLES "hard_soles"
+/// Can detach cybernetic limbs voluntarily
+#define TRAIT_ROBOTIC_LIMBATTACHMENT "robotic_limbattachment"
 
 ////
 // Jobs

code/__DEFINES/~doppler_defines/traits.dm

@@ -136,13 +136,13 @@
 	return list("gasmixes" = last_gasmix_data)
 
 /obj/item/analyzer/attack_self(mob/user, modifiers)
-	if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind())
+	if(user.stat != CONSCIOUS || !user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again
 		return
 	atmos_scan(user=user, target=get_turf(src), silent=FALSE)
 	on_analyze(source=src, target=get_turf(src))
 
 /obj/item/analyzer/attack_self_secondary(mob/user, modifiers)
-	if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind())
+	if(user.stat != CONSCIOUS || !user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again
 		return
 
 	ui_interact(user)

code/game/objects/items/devices/scanners/gas_analyzer.dm

@@ -47,7 +47,7 @@
 	return BRUTELOSS
 
 /obj/item/healthanalyzer/attack_self(mob/user)
-	if(!user.can_read(src) || user.is_blind())
+	if(!user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again
 		return
 
 	scanmode = (scanmode + 1) % SCANMODE_COUNT
@@ -80,7 +80,7 @@
 		floor_text += "<span class='alert ml-1'>Subject lacks a brain.</span><br>"
 		floor_text += "<span class='info ml-1'>Body temperature: [scan_turf?.return_air()?.return_temperature() || "???"]</span><br>"
 
-		if(user.can_read(src) && !user.is_blind())
+		if(!user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again
 			to_chat(user, examine_block(floor_text))
 		last_scan_text = floor_text
 		return
@@ -93,7 +93,7 @@
 	balloon_alert(user, "analyzing vitals")
 	playsound(user.loc, 'sound/items/healthanalyzer.ogg', 50)
 
-	var/readability_check = user.can_read(src) && !user.is_blind()
+	var/readability_check = user.can_read(src) //DOPPLER EDIT - Blind People Can Analyze Again
 	switch (scanmode)
 		if (SCANMODE_HEALTH)
 			last_scan_text = healthscan(user, M, mode, advanced, tochat = readability_check)
@@ -106,7 +106,7 @@
 /obj/item/healthanalyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!isliving(interacting_with))
 		return NONE
-	if(user.can_read(src) && !user.is_blind())
+	if(user.can_read(src)) //DOPPLER EDIT - Blind People can Analyze Again
 		chemscan(user, interacting_with)
 	return ITEM_INTERACT_SUCCESS
 
@@ -626,7 +626,7 @@
 /obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!isliving(interacting_with))
 		return NONE
-	if(!user.can_read(src) || user.is_blind())
+	if(!user.can_read(src)) //DOPPLER EDIT - Blind People Can Analyze Again
 		return ITEM_INTERACT_BLOCKING
 
 	add_fingerprint(user)

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -16,7 +16,7 @@
 /obj/item/slime_scanner/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!isliving(interacting_with))
 		return NONE
-	if(!user.can_read(src) || user.is_blind())
+	if(!user.can_read(src)) //DOPPLER EDIT - Blind People Can Analyze Again
 		return ITEM_INTERACT_BLOCKING
 	if (!isslime(interacting_with))
 		to_chat(user, span_warning("This device can only scan slimes!"))

code/game/objects/items/devices/scanners/slime_scanner.dm

@@ -372,10 +372,13 @@
 
 	if(ishuman(victim))
 		var/mob/living/carbon/human/human_victim = victim
-		if(HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT) || HAS_TRAIT(src, TRAIT_EASY_ATTACH) || HAS_TRAIT(victim, TRAIT_GOLEM_LIMBATTACHMENT)) // DOPPLER EDIT CHANGE - ORIGINAL: if(HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT) || HAS_TRAIT(src, TRAIT_EASY_ATTACH))
-			// DOPPLER EDIT ADDITION START - golems lol
+		if(HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT) || HAS_TRAIT(src, TRAIT_EASY_ATTACH) || HAS_TRAIT(victim, TRAIT_GOLEM_LIMBATTACHMENT) || HAS_TRAIT(victim, TRAIT_ROBOTIC_LIMBATTACHMENT)) // DOPPLER EDIT CHANGE - ORIGINAL: if(HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT) || HAS_TRAIT(src, TRAIT_EASY_ATTACH))
+			// DOPPLER EDIT ADDITION START - golems lol && cybernetic limb mount quirk
 			if(HAS_TRAIT(victim, TRAIT_GOLEM_LIMBATTACHMENT) && !(bodytype & BODYTYPE_GOLEM)) //if we're trying to attach something that isn't a fuggin rock, end out
 				return
+			if (!(HAS_TRAIT(src, TRAIT_EASY_ATTACH)) && !HAS_TRAIT(victim, TRAIT_LIMBATTACHMENT) && HAS_TRAIT(victim, TRAIT_ROBOTIC_LIMBATTACHMENT) && !(bodytype & BODYTYPE_ROBOTIC)) //if we're trying to attach something that's not robotic, end out - but ONLY if we have this quirk
+				to_chat(user, span_warning("[human_victim]'s body rejects [src]! It can only accept robotic limbs."))
+				return
 			// DOPPLER EDIT ADDITION END
 			if(!human_victim.get_bodypart(body_zone))
 				user.temporarilyRemoveItemFromInventory(src, TRUE)

code/modules/surgery/bodyparts/_bodyparts.dm

@@ -0,0 +1,83 @@
+/datum/quirk/robot_limb_detach
+	name = "Cybernetic Limb Mounts"
+	desc = "You are able to detach and reattach any installed robotic limbs with very little effort, as long as they're in good condition."
+	gain_text = span_notice("Internal sensors report limb disengagement protocols are ready and waiting.")
+	lose_text = span_notice("ERROR: LIMB DISENGAGEMENT PROTOCOLS OFFLINE.")
+	medical_record_text = "Patient bears quick-attach and release limb joint cybernetics."
+	value = 0
+	mob_trait = TRAIT_ROBOTIC_LIMBATTACHMENT
+	icon = FA_ICON_HANDSHAKE_SIMPLE_SLASH
+	quirk_flags = QUIRK_HUMAN_ONLY
+	/// The action we add with this quirk in add(), used for easy deletion later
+	var/datum/action/cooldown/spell/added_action
+
+/datum/quirk/robot_limb_detach/add(client/client_source)
+	var/mob/living/carbon/human/human_holder = quirk_holder
+	var/datum/action/cooldown/spell/robot_self_amputation/limb_action = new /datum/action/cooldown/spell/robot_self_amputation()
+	limb_action.Grant(human_holder)
+	added_action = limb_action
+
+/datum/quirk/robot_limb_detach/remove()
+	QDEL_NULL(added_action)
+
+/datum/action/cooldown/spell/robot_self_amputation
+	name = "Detach a robotic limb"
+	desc = "Disengage one of your robotic limbs from your cybernetic mounts. Requires you to not be restrained or otherwise under duress. Will not function on wounded limbs - tend to them first."
+	button_icon_state = "autotomy"
+
+	cooldown_time = 30 SECONDS
+	spell_requirements = NONE
+	check_flags = AB_CHECK_CONSCIOUS | AB_CHECK_HANDS_BLOCKED | AB_CHECK_INCAPACITATED
+
+/datum/action/cooldown/spell/robot_self_amputation/is_valid_target(atom/cast_on)
+	return ishuman(cast_on)
+
+/datum/action/cooldown/spell/robot_self_amputation/cast(mob/living/carbon/human/cast_on)
+	. = ..()
+
+	if(HAS_TRAIT(cast_on, TRAIT_NODISMEMBER))
+		to_chat(cast_on, span_warning("ERROR: LIMB DISENGAGEMENT PROTOCOLS OFFLINE. Seek out a maintenance technician."))
+		return
+
+	var/list/exclusions = list()
+	exclusions += BODY_ZONE_CHEST
+	exclusions += BODY_ZONE_HEAD
+	// if we ever decide to move android's brains into their chest, add this below
+	/*if (!isandroid(cast_on))
+		exclusions += BODY_ZONE_HEAD
+	*/
+
+	var/list/robot_parts = list()
+	for (var/obj/item/bodypart/possible_part as anything in cast_on.bodyparts)
+		if ((possible_part.bodytype & BODYTYPE_ROBOTIC) && !(possible_part.body_zone in exclusions)) //only robot limbs and only if they're not crucial to our like, ongoing life, you know?
+			robot_parts += possible_part
+
+	if (!length(robot_parts))
+		to_chat(cast_on, "ERROR: Limb disengagement protocols report no compatible cybernetics currently installed. Seek out a maintenance technician.")
+		return
+
+	var/obj/item/bodypart/limb_to_detach = tgui_input_list(cast_on, "Limb to detach", "Cybernetic Limb Detachment", sort_names(robot_parts))
+	if (QDELETED(src) || QDELETED(cast_on) || QDELETED(limb_to_detach))
+		return
+
+	if (length(limb_to_detach.wounds) >= 1)
+		cast_on.balloon_alert(cast_on, "can't detach wounded limbs!")
+		playsound(cast_on, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+		return
+
+	cast_on.balloon_alert(cast_on, "detaching limb...")
+	playsound(cast_on, 'sound/items/tools/rped.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+	cast_on.visible_message(span_notice("[cast_on] shuffles [cast_on.p_their()] [limb_to_detach.name] forward, actuators hissing and whirring as [cast_on.p_they()] disengage[cast_on.p_s()] the limb from its mount..."))
+
+	if(do_after(cast_on, 5 SECONDS))
+		cast_on.visible_message(span_notice("With a gentle twist, [cast_on] finally prises [cast_on.p_their()] [limb_to_detach.name] free from its socket."))
+		limb_to_detach.drop_limb()
+		cast_on.put_in_hands(limb_to_detach)
+		cast_on.balloon_alert(cast_on, "limb detached!")
+		if(prob(5))
+			playsound(cast_on, 'sound/items/champagne_pop.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+		else
+			playsound(cast_on, 'sound/items/deconstruct.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+	else
+		cast_on.balloon_alert(cast_on, "interrupted!")
+		playsound(cast_on, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)

modular_doppler/modular_quirks/cybernetic_limb_mounts/cybernetic_limb_mounts.dm

@@ -7024,6 +7024,7 @@
 #include "modular_doppler\modular_quirks\breather\nitrogen_breather\nitrogen_breather.dm"
 #include "modular_doppler\modular_quirks\breather\nitrogen_breather\nitrogen_tanks.dm"
 #include "modular_doppler\modular_quirks\breather\water_breather\water_breather.dm"
+#include "modular_doppler\modular_quirks\cybernetic_limb_mounts\cybernetic_limb_mounts.dm"
 #include "modular_doppler\modular_quirks\entombed\code\entombed.dm"
 #include "modular_doppler\modular_quirks\entombed\code\entombed_alt_actions.dm"
 #include "modular_doppler\modular_quirks\entombed\code\entombed_mod.dm"