Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/datums/brain_damage/hypnosis.dm

@@ -63,7 +63,7 @@
 	if(prob(2))
 		switch(rand(1,2))
 			if(1)
-				to_chat(owner, "<i>...[lowertext(hypnotic_phrase)]...</i>")
+				to_chat(owner, "<span class='hypnophrase'><i>...[lowertext(hypnotic_phrase)]...</i></span>")
 			if(2)
 				new /datum/hallucination/chat(owner, TRUE, FALSE, "<span class='hypnophrase'>[hypnotic_phrase]</span>")
 

code/datums/brain_damage/severe.dm

@@ -265,3 +265,37 @@
 	..()
 	if(prob(1) && !owner.has_status_effect(/datum/status_effect/trance))
 		owner.apply_status_effect(/datum/status_effect/trance, rand(100,300), FALSE)
+
+/datum/brain_trauma/severe/hypnotic_trigger
+	name = "Hypnotic Trigger"
+	desc = "Patient has a trigger phrase set in their subconscious that will trigger a suggestible trance-like state."
+	scan_desc = "oneiric feedback loop"
+	gain_text = "<span class='warning'>You feel odd, like you just forgot something important.</span>"
+	lose_text = "<span class='notice'>You feel like a weight was lifted from your mind.</span>"
+	random_gain = FALSE
+	var/trigger_phrase = "Nanotrasen"
+
+/datum/brain_trauma/severe/hypnotic_trigger/New(phrase)
+	..()
+	if(phrase)
+		trigger_phrase = phrase
+
+/datum/brain_trauma/severe/hypnotic_trigger/on_lose() //hypnosis must be cleared separately, but brain surgery should get rid of both anyway
+	..()
+	owner.remove_status_effect(/datum/status_effect/trance)
+
+/datum/brain_trauma/severe/hypnotic_trigger/handle_hearing(datum/source, list/hearing_args)
+	if(!owner.can_hear())
+		return
+	if(owner == hearing_args[HEARING_SPEAKER])
+		return
+
+	var/regex/reg = new("(\\b[REGEX_QUOTE(trigger_phrase)]\\b)","ig")
+
+	if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
+		addtimer(CALLBACK(src, .proc/hypnotrigger), 10) //to react AFTER the chat message
+		hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "<span class='hypnophrase'>*********</span>")
+
+/datum/brain_trauma/severe/hypnotic_trigger/proc/hypnotrigger()
+	to_chat(owner, "<span class='warning'>The words trigger something deep within you, and you feel your consciousness slipping away...</span>")
+	owner.apply_status_effect(/datum/status_effect/trance, rand(100,300), FALSE)

code/datums/components/empprotection.dm

@@ -1,11 +0,0 @@
-/datum/component/empprotection
-	var/flags = NONE
-
-/datum/component/empprotection/Initialize(_flags)
-	if(!istype(parent, /atom))
-		return COMPONENT_INCOMPATIBLE
-	flags = _flags
-	RegisterSignal(parent, list(COMSIG_ATOM_EMP_ACT), .proc/getEmpFlags)
-
-/datum/component/empprotection/proc/getEmpFlags(datum/source, severity)
-	return flags

code/datums/components/fantasy/_fantasy.dm

@@ -9,6 +9,7 @@
 	var/originalName
 	var/list/affixes
 	var/list/appliedComponents
+	var/list/appliedElements
 
 	var/static/list/affixListing
 
@@ -22,6 +23,7 @@
 
 	src.affixes = affixes
 	appliedComponents = list()
+	appliedElements = list()
 	randomAffixes()
 
 /datum/component/fantasy/Destroy()
@@ -118,6 +120,8 @@
 		affix.remove(src)
 	for(var/i in appliedComponents)
 		qdel(i)
+	for(var/i in appliedElements)
+		master._RemoveElement(i)
 
 	master.force = max(0, master.force - quality)
 	master.throwforce = max(0, master.throwforce - quality)

code/datums/components/fantasy/prefixes.dm

@@ -45,7 +45,8 @@
 
 /datum/fantasy_affix/tactical/apply(datum/component/fantasy/comp, newName)
 	var/obj/item/master = comp.parent
-	comp.appliedComponents += master.AddComponent(/datum/component/tactical)
+	master.AddElement(/datum/element/tactical)
+	comp.appliedElements += list(/datum/element/tactical)
 	return "tactical [newName]"
 
 /datum/fantasy_affix/pyromantic

code/datums/components/forced_gravity.dm

@@ -1,20 +0,0 @@
-/datum/component/forced_gravity
-	var/gravity
-	var/ignore_space = FALSE	//If forced gravity should also work on space turfs
-
-/datum/component/forced_gravity/Initialize(forced_value = 1)
-	if(!isatom(parent))
-		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check)
-	if(isturf(parent))
-		RegisterSignal(COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check)
-
-	gravity = forced_value
-
-/datum/component/forced_gravity/proc/gravity_check(datum/source, turf/location, list/gravs)
-	if(!ignore_space && isspaceturf(location))
-		return
-	gravs += gravity
-
-/datum/component/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs)
-	return gravity_check(parent, gravs)

code/datums/components/rotation.dm

@@ -23,18 +23,12 @@
 
 	if(can_user_rotate)
 		src.can_user_rotate = can_user_rotate
-	else
-		src.can_user_rotate = CALLBACK(src,.proc/default_can_user_rotate)
 
 	if(can_be_rotated)
 		src.can_be_rotated = can_be_rotated
-	else
-		src.can_be_rotated = CALLBACK(src,.proc/default_can_be_rotated)
 
 	if(after_rotation)
 		src.after_rotation = after_rotation
-	else
-		src.after_rotation = CALLBACK(src,.proc/default_after_rotation)
 
 	//Try Clockwise,counter,flip in order
 	if(src.rotation_flags & ROTATION_FLIP)
@@ -103,14 +97,34 @@
 		examine_list += "<span class='notice'>Alt-click to rotate it clockwise.</span>"
 
 /datum/component/simple_rotation/proc/HandRot(datum/source, mob/user, rotation = default_rotation_direction)
-	if(!can_be_rotated.Invoke(user, rotation) || !can_user_rotate.Invoke(user, rotation))
-		return
+	if(can_be_rotated)
+		if(!can_be_rotated.Invoke(user, default_rotation_direction))
+			return
+	else
+		if(!default_can_be_rotated(user, default_rotation_direction))
+			return
+	if(can_user_rotate)
+		if(!can_user_rotate.Invoke(user, default_rotation_direction))
+			return
+	else
+		if(!default_can_user_rotate(user, default_rotation_direction))
+			return
 	BaseRot(user, rotation)
 	return TRUE
 
 /datum/component/simple_rotation/proc/WrenchRot(datum/source, obj/item/I, mob/living/user)
-	if(!can_be_rotated.Invoke(user,default_rotation_direction) || !can_user_rotate.Invoke(user,default_rotation_direction))
-		return
+	if(can_be_rotated)
+		if(!can_be_rotated.Invoke(user, default_rotation_direction))
+			return
+	else
+		if(!default_can_be_rotated(user, default_rotation_direction))
+			return
+	if(can_user_rotate)
+		if(!can_user_rotate.Invoke(user, default_rotation_direction))
+			return
+	else
+		if(!default_can_user_rotate(user, default_rotation_direction))
+			return
 	if(istype(I,/obj/item/wrench))
 		BaseRot(user,default_rotation_direction)
 		return COMPONENT_NO_AFTERATTACK
@@ -126,7 +140,10 @@
 		if(ROTATION_FLIP)
 			rot_degree = 180
 	AM.setDir(turn(AM.dir,rot_degree))
-	after_rotation.Invoke(user,rotation_type)
+	if(after_rotation)
+		after_rotation.Invoke(user, rotation_type)
+	else
+		default_after_rotation(user, rotation_type)
 
 /datum/component/simple_rotation/proc/default_can_user_rotate(mob/living/user, rotation_type)
 	if(!istype(user) || !user.canUseTopic(parent, BE_CLOSE, NO_DEXTERY))

code/datums/components/storage/concrete/_concrete.dm

@@ -136,9 +136,7 @@
 		var/mob/M = parent.loc
 		I.dropped(M)
 	if(new_location)
-		//Reset the items values
-		_removal_reset(AM)
-		AM.forceMove(new_location)
+		AM.forceMove(new_location)		// exited comsig will handle removal reset.
 		//We don't want to call this if the item is being destroyed
 		AM.on_exit_storage(src)
 	else

code/datums/components/storage/storage.dm

@@ -351,7 +351,6 @@
 	return master._removal_reset(thing)
 
 /datum/component/storage/proc/_remove_and_refresh(datum/source, atom/movable/thing)
-	_removal_reset(thing)
 	if(LAZYACCESS(ui_item_blocks, thing))
 		var/obj/screen/storage/volumetric_box/center/C = ui_item_blocks[thing]
 		for(var/i in can_see_contents())		//runtimes result if mobs can access post deletion.
@@ -359,6 +358,7 @@
 			M.client?.screen -= C.on_screen_objects()
 		ui_item_blocks -= thing
 		qdel(C)
+	_removal_reset(thing)		// THIS NEEDS TO HAPPEN AFTER SO LAYERING DOESN'T BREAK!
 	refresh_mob_views()
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted

code/datums/components/tactical.dm

@@ -1,44 +0,0 @@
-
-/datum/component/tactical
-	var/allowed_slot
-
-/datum/component/tactical/Initialize(allowed_slot)
-	if(!isitem(parent))
-		return COMPONENT_INCOMPATIBLE
-
-	src.allowed_slot = allowed_slot
-
-/datum/component/tactical/RegisterWithParent()
-	. = ..()
-	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/modify)
-	RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unmodify)
-
-/datum/component/tactical/UnregisterFromParent()
-	. = ..()
-	UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
-	unmodify()
-
-/datum/component/tactical/Destroy()
-	unmodify()
-	return ..()
-
-/datum/component/tactical/proc/modify(obj/item/source, mob/user, slot)
-	if(allowed_slot && slot != allowed_slot)
-		unmodify()
-		return
-
-	var/obj/item/master = parent
-	var/image/I = image(icon = master.icon, icon_state = master.icon_state, loc = user)
-	I.copy_overlays(master)
-	I.override = TRUE
-	source.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I)
-	I.layer = ABOVE_MOB_LAYER
-
-/datum/component/tactical/proc/unmodify(obj/item/source, mob/user)
-	var/obj/item/master = source || parent
-	if(!user)
-		if(!ismob(master.loc))
-			return
-		user = master.loc
-
-	user.remove_alt_appearance("sneaking_mission")

code/datums/elements/empprotection.dm

@@ -0,0 +1,18 @@
+/datum/element/empprotection
+	element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
+	id_arg_index = 2
+	var/flags = NONE
+
+/datum/element/empprotection/Attach(datum/target, _flags)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE || !isatom(target))
+		return ELEMENT_INCOMPATIBLE
+	flags = _flags
+	RegisterSignal(target, COMSIG_ATOM_EMP_ACT, .proc/getEmpFlags)
+
+/datum/element/empprotection/Detach(atom/target)
+	UnregisterSignal(target, COMSIG_ATOM_EMP_ACT)
+	return ..()
+
+/datum/element/empprotection/proc/getEmpFlags(datum/source, severity)
+	return flags

code/datums/elements/forced_gravity.dm

@@ -0,0 +1,30 @@
+/datum/element/forced_gravity
+	element_flags = ELEMENT_BESPOKE
+	id_arg_index = 2
+	var/gravity
+	var/ignore_space
+
+/datum/element/forced_gravity/Attach(datum/target, gravity=1, ignore_space=FALSE)
+	. = ..()
+	if(!isatom(target))
+		return ELEMENT_INCOMPATIBLE
+
+	src.gravity = gravity
+	src.ignore_space = ignore_space
+
+	RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check)
+	if(isturf(target))
+		RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check)
+
+/datum/element/forced_gravity/Detach(datum/source, force)
+	. = ..()
+	var/static/list/signals_b_gone = list(COMSIG_ATOM_HAS_GRAVITY, COMSIG_TURF_HAS_GRAVITY)
+	UnregisterSignal(source, signals_b_gone)
+
+/datum/element/forced_gravity/proc/gravity_check(datum/source, turf/location, list/gravs)
+	if(!ignore_space && isspaceturf(location))
+		return
+	gravs += gravity
+
+/datum/element/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs)
+	return gravity_check(null, source, gravs)

code/datums/elements/tactical.dm

@@ -0,0 +1,37 @@
+/datum/element/tactical
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	id_arg_index = 2
+	var/allowed_slot
+
+/datum/element/tactical/Attach(datum/target, allowed_slot)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE || !isitem(target))
+		return ELEMENT_INCOMPATIBLE
+
+	src.allowed_slot = allowed_slot
+	RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/modify)
+	RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/unmodify)
+
+/datum/element/tactical/Detach(datum/target)
+	UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
+	unmodify()
+	return ..()
+
+/datum/element/tactical/proc/modify(obj/item/source, mob/user, slot)
+	if(allowed_slot && slot != allowed_slot)
+		unmodify()
+		return
+
+	var/image/I = image(icon = source.icon, icon_state = source.icon_state, loc = user)
+	I.copy_overlays(source)
+	I.override = TRUE
+	source.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I)
+	I.layer = ABOVE_MOB_LAYER
+
+/datum/element/tactical/proc/unmodify(obj/item/source, mob/user)
+	if(!user)
+		if(!ismob(source.loc))
+			return
+		user = source.loc
+
+	user.remove_alt_appearance("sneaking_mission")

code/datums/position_point_vector.dm

@@ -189,6 +189,12 @@
 	x += mpx * (multiplier)
 	y += mpy * (multiplier)
 
+/datum/point/vector/proc/pixel_increment(pixels = 32, update_iteration = TRUE, realistic_iteration = FALSE)
+	if(update_iteration)
+		iteration += realistic_iteration? round(pixels / speed) : 1
+	x += sin(angle) * pixels
+	y += cos(angle) * pixels
+
 /datum/point/vector/proc/return_vector_after_increments(amount = 7, multiplier = 1, force_simulate = FALSE)
 	var/datum/point/vector/v = copy_to()
 	if(force_simulate)