Merge branch 'master220' into reagents_perevod

Author: PlayerUnknown14

_maps/map_files/Delta/delta.dmm

@@ -26,6 +26,7 @@
 #define ALERT_EMBEDDED "embedded"
 #define ALERT_NUTRITION "nutrition"
 #define ALERT_DIRECTION_LOCK "direction_lock"
+#define ALERT_UNPOSSESS_OBJECT "unpossess_object"
 
 /** Silicon related */
 #define ALERT_LOCKED "locked"

_maps/map_files/event/Station/delta_old.dmm

@@ -684,6 +684,11 @@
 /// From base of /client/Move(): (direction, old_dir)
 #define COMSIG_MOB_CLIENT_MOVED "mob_client_moved"
 
+/// From base of /client/Move(), invoked when a non-living mob is attempting to move: (list/move_args)
+#define COMSIG_MOB_CLIENT_PRE_NON_LIVING_MOVE "mob_client_pre_non_living_move"
+	/// Cancels the move attempt
+	#define COMSIG_MOB_CLIENT_BLOCK_PRE_NON_LIVING_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+
 /// From base of /client/Move(): (list/move_args)
 #define COMSIG_MOB_CLIENT_PRE_LIVING_MOVE "mob_client_pre_living_move"
 	/// Should we stop the current living movement attempt
@@ -1285,3 +1290,6 @@
 
 /// Source: /proc/random_hair_style (mob/living/carbon/human/human, valid_hairstyles, robohead)
 #define COMSIG_RANDOM_HAIR_STYLE	"random_hair_style"
+
+/// Source: /datum/component/object_possession/proc/on_move (mob/mob, new_loc, direct)
+#define COMSIG_POSSESSED_MOVEMENT "possessed_movement"

code/__DEFINES/alerts.dm

@@ -143,6 +143,8 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 
 #define ischasm(A) (istype(A, /turf/simulated/floor/chasm))
 
+#define issingularity(atom) (istype(atom, /obj/singularity))
+
 //Structures
 #define isstructure(A) (istype(A, /obj/structure))
 

code/__DEFINES/dcs/signals.dm

@@ -872,14 +872,18 @@ so as to remain in compliance with the most up-to-date laws."
 
 /atom/movable/screen/alert/Click(location, control, params)
 	if(!usr || !usr.client)
-		return
+		return FALSE
+
 	var/paramslist = params2list(params)
 	if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
 		to_chat(usr, "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
-		return
+		return FALSE
+		
 	if(master)
 		return usr.client.Click(master, location, control, params)
 
+	return TRUE
+
 /atom/movable/screen/alert/Destroy()
 	severity = 0
 	master = null
@@ -899,3 +903,16 @@ so as to remain in compliance with the most up-to-date laws."
 	if(!istype(usr))
 		return
 	living_owner.do_succumb(TRUE)
+
+/atom/movable/screen/alert/unpossess_object
+	name = "Unpossess"
+	desc = "Этот объект под вашим контролем. Нажмите сюда для прекращения контроля."
+	icon_state = "buckled"
+
+/atom/movable/screen/alert/unpossess_object/Click(location, control, params)
+	. = ..()
+
+	if(!.)
+		return
+
+	qdel(usr.GetComponent(/datum/component/object_possession))

code/__DEFINES/is_helpers.dm

@@ -0,0 +1,130 @@
+/// Component that allows a user to control any object as if it were a mob. Does give the user incorporeal movement.
+/datum/component/object_possession
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+	/// Stores a reference to the obj that we are currently possessing.
+	var/obj/possessed
+	/// Ref to the screen object that is currently being displayed.
+	var/datum/weakref/screen_alert_ref
+	/**
+	  * back up of the real name during user possession
+	  *
+	  * When a user possesses an object it's real name is set to the user name and this
+	  * stores whatever the real name was previously. When possession ends, the real name
+	  * is reset to this value
+	  */
+	var/stashed_name
+
+/datum/component/object_possession/Initialize(obj/target)
+	. = ..()
+	if(!isobj(target) || !ismob(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	if(!bind_to_new_object(target))
+		return COMPONENT_INCOMPATIBLE
+
+	var/mob/user = parent
+	screen_alert_ref = WEAKREF(user.throw_alert(ALERT_UNPOSSESS_OBJECT, /atom/movable/screen/alert/unpossess_object))
+
+/datum/component/object_possession/RegisterWithParent()
+	RegisterSignals(parent, list(COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, COMSIG_MOB_CLIENT_PRE_NON_LIVING_MOVE), PROC_REF(on_move))
+	RegisterSignal(parent, COMSIG_MOB_GHOSTIZE, PROC_REF(end_possession))
+
+/datum/component/object_possession/UnregisterFromParent()
+    UnregisterSignal(parent, list(
+		COMSIG_MOB_CLIENT_PRE_LIVING_MOVE,
+		COMSIG_MOB_CLIENT_PRE_NON_LIVING_MOVE,
+		COMSIG_MOB_GHOSTIZE,
+	))
+
+/datum/component/object_possession/Destroy()
+	cleanup_object_binding()
+
+	var/mob/user = parent
+	var/atom/movable/screen/alert/alert_to_clear = screen_alert_ref?.resolve()
+
+	if(!QDELETED(alert_to_clear))
+		user.clear_alert(ALERT_UNPOSSESS_OBJECT)
+
+	return ..()
+
+/datum/component/object_possession/InheritComponent(datum/component/object_possession/old_component, i_am_original, obj/target)
+	cleanup_object_binding()
+
+	if(!bind_to_new_object(target))
+		qdel(src)
+
+	stashed_name = old_component?.stashed_name
+
+/// Binds the mob to the object and sets up the naming and everything.
+/// Returns FALSE if we don't bind, TRUE if we succeed.
+/datum/component/object_possession/proc/bind_to_new_object(obj/target)
+	if(issingularity(target) && CONFIG_GET(flag/forbid_singulo_possession))
+		to_chat(parent, "[target] сопротивляется вашему контролю.", confidential = TRUE)
+		return FALSE
+        
+	var/mob/user = parent
+
+	stashed_name = user.real_name
+	possessed = target
+
+	user.forceMove(target)
+	user.real_name = target.name
+	user.name = target.name
+	user.reset_perspective(target)
+
+	RegisterSignal(target, COMSIG_QDELETING, PROC_REF(end_possession))
+	SEND_SIGNAL(target, COMSIG_OBJ_POSSESSED, parent)
+
+	return TRUE
+
+/// Cleans up everything pertinent to the current possessed object.
+/datum/component/object_possession/proc/cleanup_object_binding()
+	if(QDELETED(possessed))
+		return
+
+	var/mob/poltergeist = parent
+
+	UnregisterSignal(possessed, COMSIG_QDELETING)
+
+	if(!isnull(stashed_name))
+		poltergeist.real_name = stashed_name
+		poltergeist.name = stashed_name
+
+		if(ishuman(poltergeist))
+			var/mob/living/carbon/human/human_user = poltergeist
+			human_user.name = human_user.get_visible_name()
+
+	poltergeist.forceMove(get_turf(possessed))
+	poltergeist.reset_perspective()
+
+	possessed = null
+
+/**
+ * force move the parent object instead of the source mob.
+ *
+ * Has no sanity other than checking the possed obj's density. this means it effectively has incorporeal movement, making it only good for badminnery.
+ *
+ * We always want to return `COMPONENT_MOVABLE_BLOCK_PRE_MOVE` here regardless
+ */
+/datum/component/object_possession/proc/on_move(datum/source, new_loc, direct)
+	SIGNAL_HANDLER
+
+	. = COMPONENT_MOVABLE_BLOCK_PRE_MOVE // both signals that invoke this are explicitly tied to listen for this define as the return value
+
+	if(!possessed.density)
+		possessed.forceMove(get_step(possessed, direct))
+
+	else
+		step(possessed, direct)
+
+	possessed.setDir(direct)
+	SEND_SIGNAL(possessed, COMSIG_POSSESSED_MOVEMENT, source, new_loc, direct)
+
+	return
+
+/// Just the overall "get me outta here" proc.
+/datum/component/object_possession/proc/end_possession(datum/source)
+	SIGNAL_HANDLER
+
+	SEND_SIGNAL(possessed, COMSIG_OBJ_RELEASED, parent)
+	qdel(src)

code/_onclick/hud/alert.dm

@@ -154,7 +154,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 		G.fields["rank"]		= assignment
 		G.fields["age"]			= H.age
 		G.fields["fingerprint"]	= md5(H.dna.uni_identity)
-		G.fields["p_stat"]		= "Стабильное"
+		G.fields["p_stat"]		= "Активный"
 		G.fields["m_stat"]		= "Стабильное"
 		G.fields["sex"]			= capitalize(H.gender)
 		G.fields["species"]		= H.dna.species.name

code/datums/components/object_possession.dm

@@ -31,44 +31,41 @@
 	icon_state = "borg-spray-smoke"
 
 /obj/item/reagent_containers/spray/alien/smoke/afterattack(atom/A, mob/user, proximity, params)
-	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
-		if(!A.reagents.total_volume && A.reagents)
-			to_chat(user, "<span class='notice'>\The [A] is empty.</span>")
-			return
-
-		if(reagents.total_volume >= reagents.maximum_volume)
-			to_chat(user, "<span class='notice'>\The [src] is full.</span>")
-			return
-	reagents.remove_reagent(reagents.get_master_reagent_id(),25)
 	var/datum/effect_system/smoke_spread/bad/smoke = new
 	smoke.set_up(5, 0, user.loc)
 	smoke.start()
 	playsound(user.loc, 'sound/effects/bamf.ogg', 50, 2)
+	user.changeNext_move(delay)
+
+	var/mob/living/silicon/robot/Robot = user
+	Robot.cell.use(250) // take energy from borg
 
 /obj/item/reagent_containers/spray/alien/acid
 	name = "acid synthesizer"
 	desc = "squirts burny liquids."
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "borg-spray-acid"
+	list_reagents = list("facid" = 125, "sacid" = 125)
 
 /obj/item/reagent_containers/spray/alien/stun
 	name = "paralytic toxin synthesizer"
 	desc = "squirts viagra."
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "borg-spray-stun"
-	volume = 80
 
 /obj/item/reagent_containers/spray/alien/stun/afterattack(atom/A, mob/user, proximity, params)
-	reagents.remove_reagent(reagents.get_master_reagent_id(),25)
-	var/location = get_turf(user)
 	var/datum/reagents/reagents_list = new (250)
-	reagents_list.add_reagent("cryogenic_liquid", 245)
+	reagents_list.add_reagent("blob_cryogenic_poison", 250) // new blow reagent because old was deleted
+
 	var/datum/effect_system/smoke_spread/chem/smoke = new
-	smoke.set_up(reagents_list, location)
+	smoke.set_up(reagents_list, user.loc)
 	smoke.start(3)
-	playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+	playsound(user.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+	user.changeNext_move(delay)
+
+	var/mob/living/silicon/robot/Robot = user
+	Robot.cell.use(250) // take energy from borg
 
-//SKREEEEEEEEEEEE tool
 
 /obj/item/flash/cyborg/alien
 	name = "eye flash"

code/datums/datacore.dm

@@ -335,15 +335,3 @@
 	C.Weaken(3 SECONDS)
 
 #undef CARBON_DAMAGE_FROM_OBJECTS_MODIFIER
-
-
-/// Relay movement for when user controls object via [/proc/possess()]
-/obj/proc/possessed_relay_move(mob/user, direction)
-	var/turf/new_turf = get_step(src, direction)
-	if(!new_turf)
-		return null
-	if(density)
-		. = Move(new_turf, direction)
-	else
-		. = forceMove(new_turf)
-

code/game/objects/items/weapons/alien_specific.dm

@@ -1000,15 +1000,16 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list(
 	if(!check_rights(R_EVENT))
 		return
 
-	if(mob.control_object)
-		if(!msg)
-			return
-		for(var/mob/V in hearers(mob.control_object))
-			V.show_message("<b>[mob.control_object.name]</b> says: \"" + msg + "\"", 2)
-		log_admin("[key_name(usr)] used oSay on [mob.control_object]: [msg]")
-		message_admins("[key_name_admin(usr)] used oSay on [mob.control_object]: [msg]")
+	var/datum/component/object_possession/possession_comp = mob.GetComponent(/datum/component/object_possession)
+
+	if(!possession_comp || !possession_comp.possessed || !msg)
+		return
+
+	for(var/mob/hearer in hearers(possession_comp.possessed))
+		hearer.show_message("<b>[possession_comp.possessed.name]</b> says: \"" + msg + "\"", 2)
 
-	SSblackbox.record_feedback("tally", "admin_verb", 1, "oSay") //If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
+	log_and_message_admins("[key_name_admin(usr)] used oSay on [possession_comp.possessed]: [msg]")
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "oSay") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
 
 /client/proc/force_hijack()
 	set category = "Admin.Toggles"