Pickpocketing Backpacks (#1146)

* pick pocketing

* OVER-REACHING RENAME

* make pickpocket code better

* fix

* qol

* idk how this can happen but just in case

* fuck

* rangedreachcheck

* unzip backpack

* add controls text

* fix

Author: Kapu1178

code/__DEFINES/flags.dm

@@ -282,19 +282,21 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 
 // timed_action_flags parameter for `/proc/do_after_mob`, `/proc/do_mob` and `/proc/do_after`
 /// Can do the action even if mob moves location
-#define IGNORE_USER_LOC_CHANGE (1<<0)
+#define DO_IGNORE_USER_LOC_CHANGE (1<<0)
 /// Can do the action even if the target moves location
-#define IGNORE_TARGET_LOC_CHANGE (1<<1)
+#define DO_IGNORE_TARGET_LOC_CHANGE (1<<1)
 /// Can do the action even if the item is no longer being held
-#define IGNORE_HELD_ITEM (1<<2)
+#define DO_IGNORE_HELD_ITEM (1<<2)
 /// Can do the action even if the mob is incapacitated (ex. handcuffed)
-#define IGNORE_INCAPACITATED (1<<3)
+#define DO_IGNORE_INCAPACITATED (1<<3)
 /// Used to prevent important slowdowns from being abused by drugs like kronkaine
-#define IGNORE_SLOWDOWNS (1<<4)
+#define DO_IGNORE_SLOWDOWNS (1<<4)
+/// Used to prevent rotation by the user.
+#define DO_RESTRICT_USER_DIR_CHANGE (1<<5)
 /// If the user has their next_move value changed (usually by clicking), fail.
-#define DO_RESTRICT_CLICKING (1<<5)
+#define DO_RESTRICT_CLICKING (1<<6)
 /// Shown to all mobs not just the user
-#define DO_PUBLIC (1<<6)
+#define DO_PUBLIC (1<<7)
 
 
 

code/__DEFINES/traits.dm

@@ -617,6 +617,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_HIDES_VOICE "hides_voice"
 /// Wearing this item in the mask slot will make your voice your current ID, or unknown
 #define TRAIT_REPLACES_VOICE "replaces_voice"
+/// Pickpocketing this item takes no time.
+#define TRAIT_INSTANT_PICKPOCKET "instant_pickpocket"
 
 //quirk traits
 #define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"

code/_onclick/click.dm

@@ -256,6 +256,22 @@
 /atom/movable/IsContainedAtomAccessible(atom/contained, atom/movable/user)
 	return !!atom_storage
 
+/mob/living/IsContainedAtomAccessible(atom/contained, atom/movable/user)
+	. = ..()
+	if(.)
+		return
+
+	if(!isliving(user))
+		return
+
+	if(!isitem(contained))
+		return
+
+	var/mob/living/living_user = user
+	var/obj/item/I = contained
+	if(I.can_pickpocket(user))
+		return I.atom_storage == living_user.active_storage
+
 /atom/movable/proc/DirectAccess()
 	return list(src, loc)
 
@@ -390,6 +406,8 @@
 	if(!can_interact(user))
 		return FALSE
 
+	return TRUE
+
 /mob/living/CtrlClick(mob/user, list/params)
 	if(!isliving(user) || !IsReachableBy(user) || user.incapacitated())
 		return ..()

code/datums/components/cult_ritual_item.dm

@@ -311,7 +311,7 @@
 		scribe_mod *= 0.5
 
 	SEND_SOUND(cultist, sound('sound/weapons/slice.ogg', 0, 1, 10))
-	if(!do_after(cultist, get_turf(cultist), scribe_mod, timed_action_flags = IGNORE_SLOWDOWNS))
+	if(!do_after(cultist, get_turf(cultist), scribe_mod, timed_action_flags = DO_IGNORE_SLOWDOWNS))
 		cleanup_shields()
 		return FALSE
 	if(!can_scribe_rune(tool, cultist))

code/datums/components/food/edible.dm

@@ -310,7 +310,7 @@ Behavior that's still missing from this component that original food items had t
 	var/fullness = eater.get_fullness() + 10 //The theoretical fullness of the person eating if they were to eat this
 
 	if(eater == feeder)//If you're eating it yourself.
-		if(eat_time && !do_after(feeder, eater, eat_time, timed_action_flags = food_flags & FOOD_FINGER_FOOD ? IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE : NONE)) //Gotta pass the minimal eat time
+		if(eat_time && !do_after(feeder, eater, eat_time, timed_action_flags = food_flags & FOOD_FINGER_FOOD ? DO_IGNORE_USER_LOC_CHANGE | DO_IGNORE_TARGET_LOC_CHANGE : NONE)) //Gotta pass the minimal eat time
 			return
 		if(IsFoodGone(owner, feeder))
 			return

code/datums/elements/strippable.dm

@@ -182,13 +182,13 @@
 /// Returns the ID of this item's strippable action.
 /// Return `null` if there is no alternate action.
 /// Any return value of this must be in StripMenu.
-/datum/strippable_item/proc/get_alternate_action(atom/source, mob/user)
+/datum/strippable_item/proc/get_alternate_action(atom/source, mob/user, action)
 	return null
 
 /// Performs an alternative action on this strippable_item.
 /// `has_alternate_action` needs to be TRUE.
 /// Returns FALSE if blocked by signal, TRUE otherwise.
-/datum/strippable_item/proc/alternate_action(atom/source, mob/user)
+/datum/strippable_item/proc/alternate_action(atom/source, mob/user, action)
 	SHOULD_CALL_PARENT(TRUE)
 	if(SEND_SIGNAL(user, COMSIG_TRY_ALT_ACTION, source) & COMPONENT_CANT_ALT_ACTION)
 		return FALSE
@@ -483,7 +483,7 @@
 			LAZYORASSOCLIST(interactions, user, key)
 
 			// Potentially yielding
-			strippable_item.alternate_action(owner, user)
+			strippable_item.alternate_action(owner, user, params["action"])
 
 			LAZYREMOVEASSOC(interactions, user, key)
 

code/datums/storage/storage.dm

@@ -163,7 +163,7 @@
 	RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(mass_empty))
 	RegisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_ATTACK_HAND_SECONDARY), PROC_REF(open_storage_on_signal))
 	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY_SECONDARY, PROC_REF(open_storage_attackby_secondary))
-	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(close_distance))
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(update_viewability))
 	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(update_actions))
 
 /datum/storage/proc/on_deconstruct()
@@ -769,6 +769,9 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 
 	remove_all(dump_loc)
 
+/datum/storage/proc/is_reachable(mob/user)
+	return parent.IsReachableBy(user)
+
 /// Signal handler for whenever something gets mouse-dropped onto us.
 /datum/storage/proc/on_mousedropped_onto(datum/source, obj/item/dropping, mob/user)
 	SIGNAL_HANDLER
@@ -924,15 +927,15 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	return COMPONENT_NO_AFTERATTACK
 
 /// Opens the storage to the mob, showing them the contents to their UI.
-/datum/storage/proc/open_storage(mob/to_show, performing_quickdraw)
+/datum/storage/proc/open_storage(mob/to_show, performing_quickdraw, skip_canreach = FALSE)
 	if(isobserver(to_show))
 		if(to_show.active_storage == src)
 			hide_contents(to_show)
 		else
 			show_contents(to_show)
 		return FALSE
 
-	if(!can_be_reached_by(to_show))
+	if(!skip_canreach && !can_be_reached_by(to_show))
 		to_chat(to_show, span_warning("You cannot reach [parent]."))
 		return FALSE
 
@@ -980,8 +983,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 			to_chat(toshow, span_notice("You fumble for [toremove] and it falls on the floor."))
 		return TRUE
 
-/// Signal handler for whenever a mob walks away with us, close if they can't reach us.
-/datum/storage/proc/close_distance(datum/source)
+/// Close the storage for people who can no longer see it.
+/datum/storage/proc/update_viewability(datum/source)
 	SIGNAL_HANDLER
 
 	for(var/mob/user in can_see_contents())

code/game/atoms.dm

@@ -1164,8 +1164,13 @@
  */
 /atom/proc/setDir(newdir)
 	SHOULD_CALL_PARENT(TRUE)
+	if(newdir == dir)
+		return null
+
+	. = dir
 	SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, dir, newdir)
 	dir = newdir
+	return .
 
 /**
  * Called when the atom log's in or out

code/game/objects/items.dm

@@ -1894,3 +1894,7 @@ DEFINE_INTERACTABLE(/obj/item)
 	center["x"] = text2num(center["x"])
 	center["y"] = text2num(center["y"])
 	return center
+
+/// Returns TRUE if the passed mob can interact with this item's storage via pickpocketing.
+/obj/item/proc/can_pickpocket(mob/living/user)
+	return FALSE

code/game/objects/items/bodybag.dm

@@ -80,7 +80,7 @@
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	to_chat(user, span_notice("You claw at the fabric of [src], trying to tear it open..."))
 	to_chat(loc, span_warning("Someone starts trying to break free of [src]!"))
-	if(!do_after(user, src, 12 SECONDS, timed_action_flags = (IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM)))
+	if(!do_after(user, src, 12 SECONDS, timed_action_flags = (DO_IGNORE_TARGET_LOC_CHANGE|DO_IGNORE_HELD_ITEM)))
 		return
 	// you are still in the bag? time to go unless you KO'd, honey!
 	// if they escape during this time and you rebag them the timer is still clocking down and does NOT reset so they can very easily get out.

code/game/objects/items/cardboard_cutouts.dm

@@ -103,7 +103,7 @@
 	var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, PROC_REF(check_menu), user, crayon), radius = 36, require_near = TRUE)
 	if(!new_appearance)
 		return FALSE
-	if(!do_after(user, src, 1 SECONDS, timed_action_flags = IGNORE_HELD_ITEM))
+	if(!do_after(user, src, 1 SECONDS, timed_action_flags = DO_IGNORE_HELD_ITEM))
 		return FALSE
 	if(!check_menu(user, crayon))
 		return FALSE

code/game/objects/items/handcuffs.dm

@@ -67,7 +67,7 @@
 				to_chat(C, span_userdanger("You feel someone grab your wrists, the cold metal of [name] starting to dig into your skin!"))
 			playsound(loc, cuffsound, 30, TRUE, -2)
 			log_combat(user, C, "attempted to handcuff")
-			if(do_after(user, C, handcuff_time, timed_action_flags = IGNORE_SLOWDOWNS|DO_PUBLIC, display = src) && C.canBeHandcuffed())
+			if(do_after(user, C, handcuff_time, timed_action_flags = DO_IGNORE_SLOWDOWNS|DO_PUBLIC, display = src) && C.canBeHandcuffed())
 				if(!apply_cuffs(C, user, iscyborg(user)))
 					to_chat(user, span_warning("You fail to handcuff [C]!"))
 					log_combat(user, C, "failed to handcuff")

code/game/objects/items/storage/backpack.dm

@@ -32,11 +32,54 @@
 	equip_delay_other = EQUIP_DELAY_BACK * 1.5
 	strip_delay = EQUIP_DELAY_BACK * 1.5
 
+	var/zipper_open = FALSE
+
 /obj/item/storage/backpack/Initialize()
 	. = ..()
 	atom_storage.max_slots = 21
 	atom_storage.max_total_storage = 21
 
+/obj/item/storage/backpack/examine(mob/user)
+	. = ..()
+	. += span_info("The zipper is [zipper_open ? "open" : "closed"].")
+
+/obj/item/storage/backpack/get_controls_info()
+	. = ..()
+	. += "Control Click (while holding) - Toggle zipper."
+
+/obj/item/storage/backpack/can_pickpocket(mob/living/user)
+	var/mob/wearer = loc
+	if(!ismob(wearer))
+		return FALSE
+
+	if(wearer.get_item_by_slot(ITEM_SLOT_BACK) != src)
+		return FALSE
+
+	if(!(REVERSE_DIR(wearer.dir) & get_dir(wearer, user)))
+		return
+
+	return wearer.IsReachableBy(user)
+
+/obj/item/storage/backpack/CtrlClick(mob/user, list/params)
+	. = ..()
+	if(!.)
+		return
+
+	if(user != loc)
+		return
+
+	toggle_zipper(user)
+
+/obj/item/storage/backpack/proc/toggle_zipper(mob/user)
+	zipper_open = !zipper_open
+	user?.changeNext_move(CLICK_CD_RAPID)
+	user?.visible_message(span_notice("[user] [zipper_open ? "unzips" : "zips"] [user.p_their()] [name]."))
+
+	if(zipper_open)
+		ADD_TRAIT(src, TRAIT_INSTANT_PICKPOCKET, INNATE_TRAIT)
+	else
+		REMOVE_TRAIT(src, TRAIT_INSTANT_PICKPOCKET, INNATE_TRAIT)
+
 /*
  * Backpack Types
  */

code/game/objects/structures/watercloset.dm

@@ -61,7 +61,7 @@
 			if(open)
 				GM.visible_message(span_danger("[user] starts to give [GM] a swirlie!"), span_userdanger("[user] starts to give you a swirlie..."))
 				swirlie = GM
-				if(do_after(user, src, 3 SECONDS, timed_action_flags = IGNORE_HELD_ITEM))
+				if(do_after(user, src, 3 SECONDS, timed_action_flags = DO_IGNORE_HELD_ITEM))
 					GM.visible_message(span_danger("[user] gives [GM] a swirlie!"), span_userdanger("[user] gives you a swirlie!"), span_hear("You hear a toilet flushing."))
 					if(iscarbon(GM))
 						var/mob/living/carbon/C = GM

code/modules/antagonists/heretic/items/hunter_rifle.dm

@@ -77,7 +77,7 @@
 	animate(reticle, fire_time * 0.5, transform = turn(reticle.transform, 180))
 
 	currently_aiming = TRUE
-	. = do_after(user, fire_time, target, IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_fire_callback), target, user))
+	. = do_after(user, fire_time, target, DO_IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_fire_callback), target, user))
 	currently_aiming = FALSE
 
 	animate(reticle, 0.5 SECONDS, alpha = 0)

code/modules/antagonists/heretic/magic/mirror_walk.dm

@@ -63,7 +63,7 @@
 
 	jaunter.Beam(nearby_reflection, icon_state = "light_beam", time = phase_out_time)
 	nearby_reflection.visible_message(span_warning("[nearby_reflection] begins to shimmer and shake slightly!"))
-	if(!do_after(jaunter, phase_out_time, nearby_reflection, IGNORE_USER_LOC_CHANGE|IGNORE_INCAPACITATED))
+	if(!do_after(jaunter, phase_out_time, nearby_reflection, DO_IGNORE_USER_LOC_CHANGE|DO_IGNORE_INCAPACITATED))
 		return
 
 	playsound(jaunter, 'sound/magic/ethereal_enter.ogg', 50, TRUE, -1)

code/modules/antagonists/revenant/revenant_abilities.dm

@@ -43,7 +43,7 @@
 	draining = TRUE
 	essence_drained += rand(15, 20)
 	to_chat(src, span_revennotice("You search for the soul of [target]."))
-	if(do_after(src, target, rand(10, 20), timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted in that second?
+	if(do_after(src, target, rand(10, 20), timed_action_flags = DO_IGNORE_HELD_ITEM)) //did they get deleted in that second?
 		if(target.ckey)
 			to_chat(src, span_revennotice("[target.p_their(TRUE)] soul burns with intelligence."))
 			essence_drained += rand(20, 30)
@@ -55,7 +55,7 @@
 			essence_drained = 5
 		else
 			to_chat(src, span_revennotice("[target.p_their(TRUE)] soul is weak and faltering."))
-		if(do_after(src, target, rand(15, 20), timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted NOW?
+		if(do_after(src, target, rand(15, 20), timed_action_flags = DO_IGNORE_HELD_ITEM)) //did they get deleted NOW?
 			switch(essence_drained)
 				if(1 to 30)
 					to_chat(src, span_revennotice("[target] will not yield much essence. Still, every bit counts."))
@@ -65,7 +65,7 @@
 					to_chat(src, span_revenboldnotice("Such a feast! [target] will yield much essence to you."))
 				if(90 to INFINITY)
 					to_chat(src, span_revenbignotice("Ah, the perfect soul. [target] will yield massive amounts of essence to you."))
-			if(do_after(src, target, rand(15, 25), timed_action_flags = IGNORE_HELD_ITEM)) //how about now
+			if(do_after(src, target, rand(15, 25), timed_action_flags = DO_IGNORE_HELD_ITEM)) //how about now
 				if(!target.stat)
 					to_chat(src, span_revenwarning("[target.p_theyre(TRUE)] now powerful enough to fight off your draining."))
 					to_chat(target, span_boldannounce("You feel something tugging across your body before subsiding."))
@@ -85,7 +85,7 @@
 					draining = FALSE
 					return
 				var/datum/beam/B = Beam(target,icon_state="drain_life")
-				if(do_after(src, target, 46, timed_action_flags = IGNORE_HELD_ITEM)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining.
+				if(do_after(src, target, 46, timed_action_flags = DO_IGNORE_HELD_ITEM)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining.
 					change_essence_amount(essence_drained, FALSE, target)
 					if(essence_drained <= 90 && target.stat != DEAD && !HAS_TRAIT(target, TRAIT_WEAK_SOUL))
 						essence_regen_cap += 5

code/modules/codex/codex_atom.dm

@@ -12,7 +12,7 @@
 	if(!lore && !mechanics && !antag && !controls)
 		return FALSE
 
-	var/datum/codex_entry/entry = new(name, list(type), _lore_text = lore, _mechanics_text = mechanics, _antag_text = antag, _dynamic = TRUE)
+	var/datum/codex_entry/entry = new(name, list(type), _lore_text = lore, _mechanics_text = mechanics, _antag_text = antag, _controls_text = controls, _dynamic = TRUE)
 	return entry