cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

.loc = to forceMove() (#4937)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+1 -1
View File
@@ -201,7 +201,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
if(D.build_path)
var/obj/new_item = D.Fabricate(src, src)
new_item.loc = loc
new_item.forceMove(loc)
if(mat_efficiency != 1) // No matter out of nowhere
if(new_item.matter && new_item.matter.len > 0)
for(var/i in new_item.matter)
code/modules/research/destructive_analyzer.dm
+1 -2
View File
@@ -71,8 +71,7 @@ Note: Must be placed within 3 tiles of the R&D Console
return
busy = 1
loaded_item = O
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user << "<span class='notice'>You add \the [O] to \the [src].</span>"
flick("d_analyzer_la", src)
spawn(10)
code/modules/research/message_server.dm
+1 -1
View File
@@ -147,7 +147,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
if (active && !(stat & (BROKEN|NOPOWER)) && (spamfilter_limit < MESSAGE_SERVER_DEFAULT_SPAM_LIMIT*2) && \
istype(O,/obj/item/weapon/circuitboard/message_monitor))
spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2)
user.drop_item()
user.drop_from_inventory(O,get_turf(src))
qdel(O)
user << "You install additional memory and processors into message server. Its filtering capabilities been enhanced."
else
code/modules/research/protolathe.dm
+1 -1
View File
@@ -199,7 +199,7 @@
if(D.build_path)
var/obj/new_item = D.Fabricate(src, src)
new_item.loc = loc
new_item.forceMove(loc)
if(mat_efficiency != 1) // No matter out of nowhere
if(new_item.matter && new_item.matter.len > 0)
for(var/i in new_item.matter)
code/modules/research/rdconsole.dm
+4 -5
View File
@@ -119,8 +119,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else
user << "<span class='notice'>Machine cannot accept disks in that format.</span>"
return
user.drop_item()
D.loc = src
user.drop_from_inventory(D,src)
user << "<span class='notice'>You add \the [D] to the machine.</span>"
else
//The construction/deconstruction of the console code.
@@ -162,7 +161,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
t_disk.stored = null
else if(href_list["eject_tech"]) //Eject the technology disk.
t_disk.loc = loc
t_disk.forceMove(loc)
t_disk = null
screen = 1.0
@@ -185,7 +184,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
d_disk.blueprint = null
else if(href_list["eject_design"]) //Eject the design disk.
d_disk.loc = loc
d_disk.forceMove(loc)
d_disk = null
screen = 1.0
@@ -202,7 +201,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
usr << "<span class='notice'>The destructive analyzer is busy at the moment.</span>"
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
linked_destroy.loaded_item.forceMove(linked_destroy.loc)
linked_destroy.loaded_item = null
linked_destroy.icon_state = "d_analyzer"
screen = 2.1
code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
+1 -1
View File
@@ -31,6 +31,6 @@
spawn(drill_time)
if(get_turf(src) == drilling_turf && active)
M.GetDrilled()
src.loc = M
src.forceMove(M)
drilling_turf = null
anchored = 0
code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+1 -2
View File
@@ -128,8 +128,7 @@
user << browse(dat, "window=alien_replicator")
/obj/machinery/replicator/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
user.drop_item()
W.loc = src
user.drop_from_inventory(W,src)
stored_materials.Add(W)
src.visible_message("<span class='notice'>[user] inserts [W] into [src].</span>")
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm
+16 -16
View File
@@ -47,34 +47,34 @@
E.invisibility = 0
var/obj/effect/energy_field/E = created_field[1]
E.loc = locate(T.x + 2,T.y + 2,T.z)
E.forceMove(locate(T.x + 2,T.y + 2,T.z))
E = created_field[2]
E.loc = locate(T.x + 2,T.y + 1,T.z)
E.forceMove(locate(T.x + 2,T.y + 1,T.z))
E = created_field[3]
E.loc = locate(T.x + 2,T.y,T.z)
E.forceMove(locate(T.x + 2,T.y,T.z))
E = created_field[4]
E.loc = locate(T.x + 2,T.y - 1,T.z)
E.forceMove(locate(T.x + 2,T.y - 1,T.z))
E = created_field[5]
E.loc = locate(T.x + 2,T.y - 2,T.z)
E.forceMove(locate(T.x + 2,T.y - 2,T.z))
E = created_field[6]
E.loc = locate(T.x + 1,T.y + 2,T.z)
E.forceMove(locate(T.x + 1,T.y + 2,T.z))
E = created_field[7]
E.loc = locate(T.x + 1,T.y - 2,T.z)
E.forceMove(locate(T.x + 1,T.y - 2,T.z))
E = created_field[8]
E.loc = locate(T.x,T.y + 2,T.z)
E.forceMove(locate(T.x,T.y + 2,T.z))
E = created_field[9]
E.loc = locate(T.x,T.y - 2,T.z)
E.forceMove(locate(T.x,T.y - 2,T.z))
E = created_field[10]
E.loc = locate(T.x - 1,T.y + 2,T.z)
E.forceMove(locate(T.x - 1,T.y + 2,T.z))
E = created_field[11]
E.loc = locate(T.x - 1,T.y - 2,T.z)
E.forceMove(locate(T.x - 1,T.y - 2,T.z))
E = created_field[12]
E.loc = locate(T.x - 2,T.y + 2,T.z)
E.forceMove(locate(T.x - 2,T.y + 2,T.z))
E = created_field[13]
E.loc = locate(T.x - 2,T.y + 1,T.z)
E.forceMove(locate(T.x - 2,T.y + 1,T.z))
E = created_field[14]
E.loc = locate(T.x - 2,T.y,T.z)
E.forceMove(locate(T.x - 2,T.y,T.z))
E = created_field[15]
E.loc = locate(T.x - 2,T.y - 1,T.z)
E.forceMove(locate(T.x - 2,T.y - 1,T.z))
E = created_field[16]
E.loc = locate(T.x - 2,T.y - 2,T.z)
E.forceMove(locate(T.x - 2,T.y - 2,T.z))
code/modules/research/xenoarchaeology/finds/finds.dm
+3 -3
View File
@@ -51,7 +51,7 @@
if(w.isOn())
if(w.get_fuel() >= 4 && !src.method)
if(inside)
inside.loc = get_turf(src)
inside.forceMove(get_turf(src))
for(var/mob/M in viewers(world.view, user))
M.show_message("<span class='info'>[src] burns away revealing [inside].</span>",1)
else
@@ -392,14 +392,14 @@
if(new_gun.loaded.len > num_bullets)
if(I in new_gun.loaded)
new_gun.loaded.Remove(I)
I.loc = null
I.forceMove(null)
else
break
else
for(var/obj/item/I in new_gun)
if(I in new_gun.loaded)
new_gun.loaded.Remove(I)
I.loc = null
I.forceMove(null)
item_type = "gun"
if(28)
code/modules/research/xenoarchaeology/finds/finds_special.dm
+1 -1
View File
@@ -201,7 +201,7 @@
/obj/effect/shadow_wight/process()
if(src.loc)
src.loc = get_turf(pick(orange(1,src)))
src.forceMove(get_turf(pick(orange(1,src))))
var/mob/living/carbon/M = locate() in src.loc
if(M)
playsound(src.loc, pick('sound/hallucinations/behind_you1.ogg',\
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+2 -3
View File
@@ -25,8 +25,7 @@
if(istype(I,/obj/item/weapon/anobattery))
if(!inserted_battery)
user << "<span class='notice'>You insert [I] into [src].</span>"
user.drop_item()
I.loc = src
user.drop_from_inventory(I,src)
src.inserted_battery = I
updateDialog()
else
@@ -225,7 +224,7 @@
icon_state = "incubator"
if (href_list["ejectbattery"])
src.inserted_battery.loc = src.loc
src.inserted_battery.forceMove(src.loc)
src.inserted_battery = null
if (href_list["drainbattery"])
code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+4 -5
View File
@@ -95,8 +95,7 @@
if(scanned_item)
user << "<span class=warning>\The [src] already has \a [scanned_item] inside!</span>"
return
user.drop_item()
I.loc = src
user.drop_from_inventory(I,src)
scanned_item = I
user << "<span class=notice>You put \the [I] into \the [src].</span>"
@@ -320,9 +319,9 @@
P.info = "<b>[src] analysis report #[report_num]</b><br>"
P.info += "<b>Scanned item:</b> [scanned_item.name]<br><br>" + data
last_scan_data = P.info
P.loc = src.loc
P.forceMove(src.loc)
scanned_item.loc = src.loc
scanned_item.forceMove(src.loc)
scanned_item = null
/obj/machinery/radiocarbon_spectrometer/Topic(href, href_list)
@@ -358,7 +357,7 @@
if(href_list["ejectItem"])
if(scanned_item)
scanned_item.loc = src.loc
scanned_item.forceMove(src.loc)
scanned_item = null
add_fingerprint(usr)
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+2 -3
View File
@@ -41,8 +41,7 @@
if(istype(I, /obj/item/weapon/anobattery))
if(!inserted_battery)
user << "<span class='notice'>You insert the battery.</span>"
user.drop_item()
I.loc = src
user.drop_from_inventory(I,src)
inserted_battery = I
UpdateSprite()
else
@@ -172,7 +171,7 @@
activated = 0
if(href_list["ejectbattery"])
shutdown_emission()
inserted_battery.loc = get_turf(src)
inserted_battery.forceMove(get_turf(src))
inserted_battery = null
UpdateSprite()
if(href_list["close"])
code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+8 -10
View File
@@ -44,7 +44,7 @@
if(!suspension_field.contents.len)
suspension_field.icon_state = "energynet"
suspension_field.add_overlay("shield2")
I.loc = suspension_field
I.forceMove(suspension_field)
for(var/mob/living/simple_animal/M in T)
M.weakened = max(M.weakened, 3)
@@ -128,8 +128,7 @@
else if(href_list["insertcard"])
var/obj/item/I = usr.get_active_hand()
if (istype(I, /obj/item/weapon/card))
usr.drop_item()
I.loc = src
usr.drop_from_inventory(I,src)
auth_card = I
if(attempt_unlock(I, usr))
usr << "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</i>\'</span>"
@@ -138,12 +137,12 @@
else if(href_list["ejectcard"])
if(auth_card)
if(ishuman(usr))
auth_card.loc = usr.loc
auth_card.forceMove(usr.loc)
if(!usr.get_active_hand())
usr.put_in_hands(auth_card)
auth_card = null
else
auth_card.loc = loc
auth_card.forceMove(loc)
auth_card = null
else if(href_list["lock"])
locked = 1
@@ -157,7 +156,7 @@
if(!open)
interact(user)
else if(cell)
cell.loc = loc
cell.forceMove(loc)
cell.add_fingerprint(user)
cell.update_icon()
@@ -207,8 +206,7 @@
if(cell)
user << "<span class='warning'>There is a power cell already installed.</span>"
else
user.drop_item()
W.loc = src
user.drop_from_inventory(W,src)
cell = W
user << "<span class='info'>You insert the power cell.</span>"
icon_state = "suspension1"
@@ -286,7 +284,7 @@
icon_state = "suspension3"
for(var/obj/item/I in T)
I.loc = suspension_field
I.forceMove(suspension_field)
collected++
if(collected)
@@ -346,5 +344,5 @@
/obj/effect/suspension_field/Destroy()
for(var/obj/I in src)
I.loc = src.loc
I.forceMove(src.loc)
return ..()
code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+2 -2
View File
@@ -67,7 +67,7 @@
//put in a rock sliver
var/obj/item/weapon/rocksliver/R = new()
R.geological_data = geo_data
R.loc = filled_bag
R.forceMove(filled_bag)
//update the sample bag
filled_bag.icon_state = "evidence"
@@ -88,7 +88,7 @@
var/mob/M = src.loc
success = M.put_in_inactive_hand(filled_bag)
if(!success)
filled_bag.loc = get_turf(src)
filled_bag.forceMove(get_turf(src))
filled_bag = null
icon_state = "sampler0"
else