diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 40f56f7000f..cdf123f2982 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -298,7 +298,7 @@ usr.update_icons() //update our overlays if(silent) prevent_warning = 1 - W.loc = src + W.forceMove(src) W.on_enter_storage(src) if(usr) if(usr.client && usr.s_active != src) @@ -344,9 +344,9 @@ else W.layer = initial(W.layer) W.plane = initial(W.plane) - W.loc = new_location + W.forceMove(new_location) else - W.loc = get_turf(src) + W.forceMove(get_turf(src)) if(usr) src.orient2hud(usr) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 10b5bd2d029..6635329c4cb 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -79,7 +79,7 @@ if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O)) if(beaker) var/obj/item/weapon/reagent_containers/glass/B = beaker - B.loc = loc + B.forceMove(loc) beaker = null update_icon() return @@ -98,7 +98,7 @@ else if(!user.drop_item()) return - O.loc = src + O.forceMove(src) beaker = O to_chat(user, "You add the container to the machine.") update_icon() @@ -136,7 +136,7 @@ to_chat(user, "The biogenerator is full! Activate it.") else user.unEquip(O) - O.loc = src + O.forceMove(src) to_chat(user, "You put [O.name] in [name]") return 1 //no afterattack else if (istype(O, /obj/item/weapon/disk/design_disk)) @@ -296,7 +296,7 @@ /obj/machinery/biogenerator/proc/detach() if(beaker) - beaker.loc = loc + beaker.forceMove(loc) beaker = null update_icon() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 5919113eb16..974e585bdb5 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -126,7 +126,7 @@ var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time if(myseed && (myseed.loc != src)) - myseed.loc = src + myseed.forceMove(src) if(self_sustaining) adjustNutri(1) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index a29366a958b..10860f45887 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -17,7 +17,7 @@ return while(t_amount < t_max) var/obj/item/seeds/t_prod = F.seed.Copy() - t_prod.loc = seedloc + t_prod.forceMove(seedloc) t_amount++ qdel(O) return 1 @@ -29,7 +29,7 @@ return while(t_amount < t_max) var/obj/item/seeds/t_prod = F.seed.Copy() - t_prod.loc = seedloc + t_prod.forceMove(seedloc) t_amount++ qdel(O) return 1 @@ -172,7 +172,7 @@ for (var/obj/T in contents)//Now we find the seed we need to vend var/obj/item/seeds/O = T if (O.plantname == href_list["name"] && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"]) - O.loc = loc + O.forceMove(loc) break updateUsrDialog() @@ -191,7 +191,7 @@ var/obj/item/weapon/storage/S = O.loc S.remove_from_storage(O,src) - O.loc = src + O.forceMove(src) . = 1 for (var/datum/seed_pile/N in piles) if (O.plantname == N.name && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency)