diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index c8aed12907..b94cb78da5 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -44,7 +44,7 @@ shoes = null return 0 H.drop_from_inventory(shoes) //Remove the old shoes so you can put on the magboots. - shoes.loc = src + shoes.forceMove(src) if(!..()) if(shoes) //Put the old shoes back on if the check fails. @@ -63,7 +63,7 @@ var/mob/living/carbon/human/H = wearer if(shoes) if(!H.equip_to_slot_if_possible(shoes, slot_shoes)) - shoes.loc = get_turf(src) + shoes.forceMove(get_turf(src)) src.shoes = null wearer = null diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 60a4c5ce24..6e0e48a480 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -304,7 +304,7 @@ if(istype(piece.loc, /mob/living)) M = piece.loc M.drop_from_inventory(piece) - piece.loc = src + piece.forceMove(src) if(!istype(wearer) || loc != wearer || wearer.back != src || canremove || !cell || cell.charge <= 0) if(!cell || cell.charge <= 0) @@ -558,7 +558,7 @@ if(M && M.back == src) M.back = null M.drop_from_inventory(src) - src.loc = get_turf(src) + src.forceMove(get_turf(src)) return if(istype(M) && M.back == src) @@ -615,22 +615,21 @@ H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly." use_obj.canremove = 1 holder.drop_from_inventory(use_obj) - use_obj.loc = get_turf(src) + use_obj.forceMove(get_turf(src)) use_obj.dropped() use_obj.canremove = 0 - use_obj.loc = src + use_obj.forceMove(src) else if (deploy_mode != ONLY_RETRACT) - if(check_slot) - if(check_slot != use_obj) - H << "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way." + if(check_slot && check_slot == use_obj) return + use_obj.forceMove(H) + if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) + use_obj.forceMove(src) + if(check_slot) + H << "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way." else - use_obj.loc = H - if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0)) - use_obj.loc = src - else - H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly." + H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly." if(piece == "helmet" && helmet) helmet.update_light(H) diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index d406c6867a..2c6d761a7a 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -112,7 +112,7 @@ if(istype(H)) if(helmet && H.head == helmet) H.drop_from_inventory(helmet) - helmet.loc = src + helmet.forceMove(src) if(boots) boots.canremove = 1 @@ -120,11 +120,11 @@ if(istype(H)) if(boots && H.shoes == boots) H.drop_from_inventory(boots) - boots.loc = src + boots.forceMove(src) if(tank) tank.canremove = 1 - tank.loc = src + tank.forceMove(src) /obj/item/clothing/suit/space/void/verb/toggle_helmet() @@ -148,7 +148,7 @@ H << "You retract your suit helmet." helmet.canremove = 1 H.drop_from_inventory(helmet) - helmet.loc = src + helmet.forceMove(src) else if(H.head) H << "You cannot deploy your helmet while wearing \the [H.head]." @@ -197,15 +197,15 @@ if(choice == tank) //No, a switch doesn't work here. Sorry. ~Techhead user << "You pop \the [tank] out of \the [src]'s storage compartment." - tank.loc = get_turf(src) + tank.forceMove(get_turf(src)) src.tank = null else if(choice == helmet) user << "You detatch \the [helmet] from \the [src]'s helmet mount." - helmet.loc = get_turf(src) + helmet.forceMove(get_turf(src)) src.helmet = null else if(choice == boots) user << "You detatch \the [boots] from \the [src]'s boot mounts." - boots.loc = get_turf(src) + boots.forceMove(get_turf(src)) src.boots = null else user << "\The [src] does not have anything installed." @@ -216,7 +216,7 @@ else user << "You attach \the [W] to \the [src]'s helmet mount." user.drop_item() - W.loc = src + W.forceMove(src) src.helmet = W return else if(istype(W,/obj/item/clothing/shoes/magboots)) @@ -225,7 +225,7 @@ else user << "You attach \the [W] to \the [src]'s boot mounts." user.drop_item() - W.loc = src + W.forceMove(src) boots = W return else if(istype(W,/obj/item/weapon/tank)) @@ -236,7 +236,7 @@ else user << "You insert \the [W] into \the [src]'s storage compartment." user.drop_item() - W.loc = src + W.forceMove(src) tank = W return