cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +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/virus2/analyser.dm
+3 -4
View File
@@ -18,8 +18,7 @@
return
dish = O
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
@@ -48,7 +47,7 @@
dish.info = r
dish.name = "[initial(dish.name)] ([dish.virus2.name()])"
dish.analysed = 1
dish.loc = src.loc
dish.forceMove(src.loc)
dish = null
icon_state = "analyser"
@@ -63,7 +62,7 @@
else
pause = 1
spawn(25)
dish.loc = src.loc
dish.forceMove(src.loc)
dish = null
src.state("\The [src] buzzes, \"Insufficient growth density to complete analysis.\"")
code/modules/virus2/centrifuge.dm
+2 -3
View File
@@ -19,8 +19,7 @@
return
sample = O
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
SSnanoui.update_uis(src)
@@ -140,7 +139,7 @@
if("sample")
if(sample)
sample.loc = src.loc
sample.forceMove(src.loc)
sample = null
return 1
code/modules/virus2/curer.dm
+2 -3
View File
@@ -14,8 +14,7 @@
var/mob/living/carbon/C = user
if(!container)
container = I
C.drop_item()
I.loc = src
C.drop_from_inventory(I,src)
return
if(istype(I,/obj/item/weapon/virusdish))
if(virusing)
@@ -85,7 +84,7 @@
if (href_list["antibody"])
curing = 10
else if(href_list["eject"])
container.loc = src.loc
container.forceMove(src.loc)
container = null
src.add_fingerprint(usr)
code/modules/virus2/diseasesplicer.dm
+2 -3
View File
@@ -23,8 +23,7 @@
return
dish = I
c.drop_item()
I.loc = src
c.drop_from_inventory(I,src)
if(istype(I,/obj/item/weapon/diseasedisk))
user << "You upload the contents of the disk onto the buffer."
@@ -155,7 +154,7 @@
if(href_list["eject"])
if (dish)
dish.loc = src.loc
dish.forceMove(src.loc)
dish = null
return 1
code/modules/virus2/dishincubator.dm
+4 -6
View File
@@ -22,8 +22,7 @@
return
beaker = O
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
SSnanoui.update_uis(src)
@@ -38,8 +37,7 @@
return
dish = O
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
SSnanoui.update_uis(src)
@@ -161,7 +159,7 @@
if (href_list["ejectchem"])
if(beaker)
beaker.loc = src.loc
beaker.forceMove(src.loc)
beaker = null
return 1
@@ -173,7 +171,7 @@
if (href_list["ejectdish"])
if(dish)
dish.loc = src.loc
dish.forceMove(src.loc)
dish = null
return 1
code/modules/virus2/isolator.dm
+2 -3
View File
@@ -36,8 +36,7 @@
return
sample = S
user.drop_item()
S.loc = src
user.drop_from_inventory(S,src)
user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
SSnanoui.update_uis(src)
@@ -163,7 +162,7 @@
return 1
if (href_list["eject"])
sample.loc = src.loc
sample.forceMove(src.loc)
sample = null
update_icon()
return 1