Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465

[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
parent fb492b5a14 a6220057be
commit 7ca4a29cac
76 changed files with 422 additions and 413 deletions
@@ -67,7 +67,7 @@
 	new /obj/effect/particle_effect/smoke/bad(loc)

 	for(var/atom/movable/O in src)
-		O.loc = src.loc
+		O.forceMove(drop_location())

 	qdel(src)

@@ -24,7 +24,7 @@

 /obj/effect/countdown/proc/attach(atom/A)
 	attached_to = A
-	loc = get_turf(A)
+	forceMove(get_turf(A))

 /obj/effect/countdown/proc/start()
 	if(!started)
@@ -8,7 +8,7 @@
 /obj/effect/temp_visual/point/Initialize(mapload, set_invis = 0)
 	. = ..()
 	var/atom/old_loc = loc
-	loc = get_turf(src)
+	forceMove(get_turf(src))
 	pixel_x = old_loc.pixel_x
 	pixel_y = old_loc.pixel_y
 	invisibility = set_invis
@@ -63,7 +63,7 @@
 	for(var/I in 1 to old_checkers_len)
 		if(I <= old_checkers_used)
 			var/obj/effect/abstract/proximity_checker/pc = checkers_local[I]
-			pc.loc = turfs[I]
+			pc.forceMove(turfs[I])
 		else
 			qdel(checkers_local[I])	//delete the leftovers

@@ -121,7 +121,7 @@

 /obj/structure/spider/spiderling/Collide(atom/user)
 	if(istype(user, /obj/structure/table))
-		src.loc = user.loc
+		forceMove(user.loc)
 	else
 		..()

@@ -145,7 +145,7 @@
 								"<span class='italics'>You hear something scampering through the ventilation ducts.</span>")

 			spawn(rand(20,60))
-				loc = exit_vent
+				forceMove(exit_vent)
 				var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
 				spawn(travel_time)

@@ -159,7 +159,7 @@
 					sleep(travel_time)

 					if(!exit_vent || exit_vent.welded)
-						loc = entry_vent
+						forceMove(entry_vent)
 						entry_vent = null
 						return
 					loc = exit_vent.loc
@@ -119,7 +119,7 @@
 /obj/item/airlock_painter/attack_self(mob/user)
 	if(ink)
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-		ink.loc = user.loc
+		ink.forceMove(user.drop_location())
 		user.put_in_hands(ink)
 		to_chat(user, "<span class='notice'>You remove [ink] from [src].</span>")
 		ink = null
@@ -35,7 +35,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
 		return

 	M.component_parts = list(src) // List of components always contains a board
-	loc = null
+	moveToNullspace()

 	for(var/comp_path in req_components)
 		var/comp_amt = req_components[comp_path]
@@ -302,7 +302,7 @@
 	..()
 	if(check_defib_exists(mainunit, src) && req_defib)
 		defib = mainunit
-		loc = defib
+		forceMove(defib)
 		busy = FALSE
 		update_icon()

@@ -292,7 +292,7 @@
 					def_zone = pick("l_leg", "r_leg")
 					if(!C.legcuffed && C.get_num_legs() >= 2) //beartrap can't cuff your leg if there's already a beartrap or legcuffs, or you don't have two legs.
 						C.legcuffed = src
-						src.loc = C
+						forceMove(C)
 						C.update_inv_legcuffed()
 						SSblackbox.record_feedback("tally", "handcuffs", 1, type)
 			else if(isanimal(L))
@@ -352,7 +352,7 @@
 	if(!C.legcuffed && C.get_num_legs() >= 2)
 		visible_message("<span class='danger'>\The [src] ensnares [C]!</span>")
 		C.legcuffed = src
-		src.loc = C
+		forceMove(C)
 		C.update_inv_legcuffed()
 		SSblackbox.record_feedback("tally", "handcuffs", 1, type)
 		to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
@@ -1,97 +1,97 @@
-/obj/item/implant
-	name = "implant"
-	icon = 'icons/obj/implants.dmi'
-	icon_state = "generic" //Shows up as the action button icon
-	actions_types = list(/datum/action/item_action/hands_free/activate)
-	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
-	var/mob/living/imp_in = null
-	item_color = "b"
-	var/allow_multiple = FALSE
-	var/uses = -1
-	flags_1 = DROPDEL_1
-
-
-/obj/item/implant/proc/trigger(emote, mob/living/carbon/source)
-	return
-
-/obj/item/implant/proc/activate()
-	return
-
-/obj/item/implant/ui_action_click()
-	activate("action_button")
-
-/obj/item/implant/proc/can_be_implanted_in(mob/living/target) // for human-only and other special requirements
-	return TRUE
-
-/mob/living/proc/can_be_implanted()
-	return TRUE
-
-/mob/living/silicon/can_be_implanted()
-	return FALSE
-
-/mob/living/simple_animal/can_be_implanted()
-	return healable //Applies to robots and most non-organics, exceptions can override.
-
-
-
-//What does the implant do upon injection?
-//return 1 if the implant injects
-//return 0 if there is no room for implant / it fails
-/obj/item/implant/proc/implant(mob/living/target, mob/user, silent = 0)
-	LAZYINITLIST(target.implants)
-	if(!target.can_be_implanted() || !can_be_implanted_in(target))
-		return 0
-	for(var/X in target.implants)
-		if(istype(X, type))
-			var/obj/item/implant/imp_e = X
-			if(!allow_multiple)
-				if(imp_e.uses < initial(imp_e.uses)*2)
-					if(uses == -1)
-						imp_e.uses = -1
-					else
-						imp_e.uses = min(imp_e.uses + uses, initial(imp_e.uses)*2)
-					qdel(src)
-					return 1
-				else
-					return 0
-
-	src.loc = target
-	imp_in = target
-	target.implants += src
-	if(activated)
-		for(var/X in actions)
-			var/datum/action/A = X
-			A.Grant(target)
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		H.sec_hud_set_implants()
-
-	if(user)
-		add_logs(user, target, "implanted", object="[name]")
-
-	return 1
-
-/obj/item/implant/proc/removed(mob/living/source, silent = 0, special = 0)
-	src.loc = null
-	imp_in = null
-	source.implants -= src
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.Grant(source)
-	if(ishuman(source))
-		var/mob/living/carbon/human/H = source
-		H.sec_hud_set_implants()
-
-	return 1
-
-/obj/item/implant/Destroy()
-	if(imp_in)
-		removed(imp_in)
-	return ..()
-
-/obj/item/implant/proc/get_data()
-	return "No information available"
-
-/obj/item/implant/dropped(mob/user)
-	. = 1
-	..()
+/obj/item/implant
+	name = "implant"
+	icon = 'icons/obj/implants.dmi'
+	icon_state = "generic" //Shows up as the action button icon
+	actions_types = list(/datum/action/item_action/hands_free/activate)
+	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
+	var/mob/living/imp_in = null
+	item_color = "b"
+	var/allow_multiple = FALSE
+	var/uses = -1
+	flags_1 = DROPDEL_1
+
+
+/obj/item/implant/proc/trigger(emote, mob/living/carbon/source)
+	return
+
+/obj/item/implant/proc/activate()
+	return
+
+/obj/item/implant/ui_action_click()
+	activate("action_button")
+
+/obj/item/implant/proc/can_be_implanted_in(mob/living/target) // for human-only and other special requirements
+	return TRUE
+
+/mob/living/proc/can_be_implanted()
+	return TRUE
+
+/mob/living/silicon/can_be_implanted()
+	return FALSE
+
+/mob/living/simple_animal/can_be_implanted()
+	return healable //Applies to robots and most non-organics, exceptions can override.
+
+
+
+//What does the implant do upon injection?
+//return 1 if the implant injects
+//return 0 if there is no room for implant / it fails
+/obj/item/implant/proc/implant(mob/living/target, mob/user, silent = 0)
+	LAZYINITLIST(target.implants)
+	if(!target.can_be_implanted() || !can_be_implanted_in(target))
+		return 0
+	for(var/X in target.implants)
+		if(istype(X, type))
+			var/obj/item/implant/imp_e = X
+			if(!allow_multiple)
+				if(imp_e.uses < initial(imp_e.uses)*2)
+					if(uses == -1)
+						imp_e.uses = -1
+					else
+						imp_e.uses = min(imp_e.uses + uses, initial(imp_e.uses)*2)
+					qdel(src)
+					return 1
+				else
+					return 0
+
+	forceMove(target)
+	imp_in = target
+	target.implants += src
+	if(activated)
+		for(var/X in actions)
+			var/datum/action/A = X
+			A.Grant(target)
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		H.sec_hud_set_implants()
+
+	if(user)
+		add_logs(user, target, "implanted", object="[name]")
+
+	return 1
+
+/obj/item/implant/proc/removed(mob/living/source, silent = 0, special = 0)
+	moveToNullspace()
+	imp_in = null
+	source.implants -= src
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.Grant(source)
+	if(ishuman(source))
+		var/mob/living/carbon/human/H = source
+		H.sec_hud_set_implants()
+
+	return 1
+
+/obj/item/implant/Destroy()
+	if(imp_in)
+		removed(imp_in)
+	return ..()
+
+/obj/item/implant/proc/get_data()
+	return "No information available"
+
+/obj/item/implant/dropped(mob/user)
+	. = 1
+	..()
@@ -220,7 +220,7 @@
 		return
 	if(!isturf(src.loc))
 		var/atom/target = src.loc
-		loc = target.loc
+		forceMove(target.loc)
 		consume_everything(target)
 	else
 		var/turf/T = get_turf(src)
@@ -216,7 +216,7 @@
 		if(!src.tank)
 			return
 		to_chat(user, "<span class='notice'>You detach \the [thetank] from \the [src].</span>")
-		src.tank.loc = get_turf(user)
+		src.tank.forceMove(user.drop_location())
 		user.put_in_hands(tank)
 		src.tank = null
 	if(!removing)
@@ -265,7 +265,7 @@
 /obj/item/pneumatic_cannon/pie/Initialize()
 	. = ..()
 	allowed_typecache = pie_typecache
-	
+
 /obj/item/pneumatic_cannon/pie/selfcharge
 	automatic = TRUE
 	selfcharge = TRUE
@@ -23,7 +23,7 @@
 /obj/item/target/Move()
 	..()
 	if(pinnedLoc)
-		pinnedLoc.loc = loc
+		pinnedLoc.forceMove(loc)

 /obj/item/target/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weldingtool))
@@ -199,7 +199,7 @@
 		else
 			if(S.pulledby)
 				S.pulledby.stop_pulling()
-			S.loc = src
+			S.forceMove(src)

 	orient2hud(usr)
 	if(usr.s_active)
@@ -49,7 +49,7 @@
 			on = FALSE
 			to_chat(user, "<span class='warning'>You need a free hand to hold the mister!</span>")
 			return
-		noz.loc = user
+		noz.forceMove(user)
 	else
 		//Remove from their hands and put back "into" the tank
 		remove_noz()
@@ -124,7 +124,7 @@
 	if(check_tank_exists(parent_tank, src))
 		tank = parent_tank
 		reagents = tank.reagents	//This mister is really just a proxy for the tank's reagents
-		loc = tank
+		forceMove(tank)
 	return

 /obj/item/reagent_containers/spray/mister/dropped(mob/user)
@@ -146,7 +146,7 @@
 /obj/item/reagent_containers/spray/mister/Move()
 	..()
 	if(loc != tank.loc)
-		loc = tank.loc
+		forceMove(tank.loc)

 /obj/item/reagent_containers/spray/mister/afterattack(obj/target, mob/user, proximity)
 	if(target.loc == loc) //Safety check so you don't fill your mister with mutagen or something and then blast yourself in the face with it
@@ -150,7 +150,7 @@
 /obj/item/roller/robo/deploy_roller(mob/user, atom/location)
 	if(loaded)
 		var/obj/structure/bed/roller/R = loaded
-		R.loc = location
+		R.forceMove(location)
 		user.visible_message("[user] deploys [loaded].", "<span class='notice'>You deploy [loaded].</span>")
 		loaded = null
 	else
@@ -1,45 +1,45 @@
-/obj/structure/closet/crate/bin
-	desc = "A trash bin, place your trash here for the janitor to collect."
-	name = "trash bin"
-	icon_state = "largebins"
-	open_sound = 'sound/effects/bin_open.ogg'
-	close_sound = 'sound/effects/bin_close.ogg'
-	anchored = TRUE
-	horizontal = FALSE
-	delivery_icon = null
-
-/obj/structure/closet/crate/bin/New()
-	..()
-	update_icon()
-
-/obj/structure/closet/crate/bin/update_icon()
-	..()
-	cut_overlays()
-	if(contents.len == 0)
-		add_overlay("largebing")
-	else if(contents.len >= storage_capacity)
-		add_overlay("largebinr")
-	else
-		add_overlay("largebino")
-
-/obj/structure/closet/crate/bin/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/storage/bag/trash))
-		var/obj/item/storage/bag/trash/T = W
-		to_chat(user, "<span class='notice'>You fill the bag.</span>")
-		for(var/obj/item/O in src)
-			if(T.can_be_inserted(O, 1))
-				O.loc = T
-		T.update_icon()
-		do_animate()
-	else if(istype(W, /obj/item/wrench))
-		anchored = !anchored
-		playsound(src.loc, W.usesound, 75, 1)
-	else
-		return ..()
-
-/obj/structure/closet/crate/bin/proc/do_animate()
-	playsound(loc, open_sound, 15, 1, -3)
-	flick("animate_largebins", src)
-	spawn(13)
-		playsound(loc, close_sound, 15, 1, -3)
-		update_icon()
+/obj/structure/closet/crate/bin
+	desc = "A trash bin, place your trash here for the janitor to collect."
+	name = "trash bin"
+	icon_state = "largebins"
+	open_sound = 'sound/effects/bin_open.ogg'
+	close_sound = 'sound/effects/bin_close.ogg'
+	anchored = TRUE
+	horizontal = FALSE
+	delivery_icon = null
+
+/obj/structure/closet/crate/bin/New()
+	..()
+	update_icon()
+
+/obj/structure/closet/crate/bin/update_icon()
+	..()
+	cut_overlays()
+	if(contents.len == 0)
+		add_overlay("largebing")
+	else if(contents.len >= storage_capacity)
+		add_overlay("largebinr")
+	else
+		add_overlay("largebino")
+
+/obj/structure/closet/crate/bin/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/storage/bag/trash))
+		var/obj/item/storage/bag/trash/T = W
+		to_chat(user, "<span class='notice'>You fill the bag.</span>")
+		for(var/obj/item/O in src)
+			if(T.can_be_inserted(O, 1))
+				O.forceMove(T)
+		T.update_icon()
+		do_animate()
+	else if(istype(W, /obj/item/wrench))
+		anchored = !anchored
+		playsound(src.loc, W.usesound, 75, 1)
+	else
+		return ..()
+
+/obj/structure/closet/crate/bin/proc/do_animate()
+	playsound(loc, open_sound, 15, 1, -3)
+	flick("animate_largebins", src)
+	spawn(13)
+		playsound(loc, close_sound, 15, 1, -3)
+		update_icon()
@@ -301,7 +301,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
 			return
 	if(!ismob(user) || user.lying || user.incapacitated())
 		return
-	O.loc = src.loc
+	O.forceMove(src.loc)
 	if (user != O)
 		visible_message("<span class='warning'>[user] stuffs [O] into [src].</span>")
 	return
@@ -43,7 +43,7 @@ FLOOR SAFES
 			return
 		if(I.w_class + space <= maxspace)
 			space += I.w_class
-			I.loc = src
+			I.forceMove(src)


 /obj/structure/safe/proc/check_unlocked(mob/user, canhear)
@@ -97,10 +97,10 @@ FLOOR SAFES
 	if(!ishuman(usr))
 		return
 	var/mob/living/carbon/human/user = usr
-	
+
 	if(!user.canUseTopic(src))
 		return
-	
+
 	var/canhear = 0
 	if(user.is_holding_item_of_type(/obj/item/clothing/neck/stethoscope))
 		canhear = 1
@@ -136,7 +136,7 @@
 		last_delay = current_tube.enter_delay(src, next_dir)
 		sleep(last_delay)
 		setDir(next_dir)
-		loc = next_loc // When moving from one tube to another, skip collision and such.
+		forceMove(next_loc) // When moving from one tube to another, skip collision and such.
 		density = current_tube.density

 		if(current_tube && current_tube.should_stop_pod(src, next_dir))
@@ -59,7 +59,7 @@
 			if(ishuman(user))
 				user.put_in_hands(I)
 			else
-				I.loc = get_turf(src)
+				I.forceMove(drop_location())
 			to_chat(user, "<span class='notice'>You find [I] in the cistern.</span>")
 			w_items -= I.w_class
 	else