.loc = to forceMove() (#4937)

As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
BurgerLUA
2018-08-04 01:48:58 +03:00
committed by Erki
parent 187613428e
commit 8519dcc393
376 changed files with 968 additions and 1261 deletions
@@ -64,7 +64,6 @@
++frames
user.visible_message("<span class='notice'>[user] loads \the [I] into \the [src].</span>", "<span class='notice'>You load \the [I] into \the [src].</span>")
update_icon()
user.drop_from_inventory(I)
qdel(I)
return
else if(istype(I, /obj/item/bee_pack))
@@ -270,7 +269,6 @@
if(do_after(user, 30))
user.visible_message("<span class='notice'>[user] constructs a beehive.</span>", "<span class='notice'>You construct a beehive.</span>")
new /obj/machinery/beehive(get_turf(user))
user.drop_from_inventory(src)
qdel(src)
return
-1
View File
@@ -250,7 +250,6 @@
if(prob(35))
if(user)
user << "<span class='danger'>\The [src] has fallen to bits.</span>"
user.drop_from_inventory(src)
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/grown/attack_self(mob/user as mob)
+1 -1
View File
@@ -327,7 +327,7 @@
spark(target, 3, alldirs)
var/turf/picked = get_turf(pick(turfs)) // Just in case...
new/obj/effect/decal/cleanable/molten_item(get_turf(target)) // Leave a pile of goo behind for dramatic effect...
target.loc = picked // And teleport them to the chosen location.
target.forceMove(picked) // And teleport them to the chosen location.
impact = 1
+5 -7
View File
@@ -75,7 +75,7 @@
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.loc = get_turf(src)
loaded_disk.forceMove(get_turf(src))
visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
@@ -88,8 +88,7 @@
if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
user << "That seed is not compatible with our genetics technology."
else
user.drop_from_inventory(W)
W.loc = src
user.drop_from_inventory(W,src)
seed = W
user << "You load [W] into [src]."
return
@@ -120,8 +119,7 @@
user << "That disk does not have any gene data loaded."
return
user.drop_from_inventory(W)
W.loc = src
user.drop_from_inventory(W,src)
loaded_disk = W
user << "You load [W] into [src]."
@@ -184,7 +182,7 @@
if(href_list["eject_packet"])
if(!seed) return
seed.loc = get_turf(src)
seed.forceMove(get_turf(src))
if(seed.seed.name == "new line" || isnull(SSplants.seeds[seed.seed.name]))
seed.seed.uid = SSplants.seeds.len + 1
@@ -198,7 +196,7 @@
if(href_list["eject_disk"])
if(!loaded_disk) return
loaded_disk.loc = get_turf(src)
loaded_disk.forceMove(get_turf(src))
visible_message("\icon[src] [src] beeps and spits out [loaded_disk].")
loaded_disk = null
+2 -2
View File
@@ -275,7 +275,7 @@
if (N.amount <= 0 || N.seeds.len <= 0)
piles -= N
qdel(N)
O.loc = src.loc
O.forceMove(src.loc)
else
piles -= N
qdel(N)
@@ -316,7 +316,7 @@
var/obj/item/weapon/storage/S = O.loc
S.remove_from_storage(O, src)
O.loc = src
O.forceMove(src)
var/newID = 0
for (var/datum/seed_pile/N in piles)
@@ -76,7 +76,7 @@
can_grab = 0
if(can_grab)
src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
victim.loc = src.loc
victim.forceMove(src.loc)
//entangling people
if(victim.loc == src.loc)
@@ -50,14 +50,15 @@
else
health = 10
nutrilevel += 10
user.drop_item()
user.drop_from_inventory(O,get_turf(src))
qdel(O)
user << "<span class='notice'>You carefully insert the queen into [src], she gets busy making a hive.</span>"
bees_in_hive = 0
else if(istype(O, /obj/item/beezeez))
beezeez += 100
nutrilevel += 10
user.drop_item()
user.drop_from_inventory(O,get_turf(src))
qdel(O)
if(health > 0)
user << "<span class='notice'>You insert [O] into [src]. A relaxed humming appears to pick up.</span>"
else