cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00: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-03 15:48:58 -07: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

6
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -322,13 +322,13 @@
if(G.state<2)
user << "<span class='warning'>You need a better grip to do that!</span>"
return
G.affecting.loc = src.loc
G.affecting.forceMove(src.loc)
G.affecting.Weaken(5)
visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>", range = 3)
qdel(W)
return
else if (istype(W, /obj/item) && get_dist(src,user)<2)
user.drop_item(src.loc)
user.drop_from_inventory(W,get_turf(src))
visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>", range = 3)
return
@@ -338,7 +338,7 @@
if(istype(I, /obj/item/projectile))
return
if(prob(50))
I.loc = src.loc
I.forceMove(src.loc)
visible_message("<span class='notice'>Swish! \the [I] lands in \the [src].</span>", range = 3)
else
visible_message("<span class='warning'>\The [I] bounces off of \the [src]'s rim!</span>", range = 3)