Replaces a bunch of loc assignments with forcemoves and moves to nullspace
This commit is contained in:
committed by
CitadelStationBot
parent
b03e606d35
commit
7f90427a40
@@ -42,7 +42,7 @@
|
||||
"<span class='danger'>You fire the grenade launcher!</span>")
|
||||
var/obj/item/grenade/F = grenades[1] //Now with less copypasta!
|
||||
grenades -= F
|
||||
F.loc = user.loc
|
||||
F.forceMove(user.loc)
|
||||
F.throw_at(target, 30, 2, user)
|
||||
message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
|
||||
log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
if(istype(target, /obj/item/gun))
|
||||
var/obj/item/gun/G = target
|
||||
if(G.pin && (force_replace || G.pin.pin_removeable))
|
||||
G.pin.loc = get_turf(G)
|
||||
G.pin.forceMove(get_turf(G))
|
||||
G.pin.gun_remove(user)
|
||||
to_chat(user, "<span class ='notice'>You remove [G]'s old pin.</span>")
|
||||
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
to_chat(new_mob, poly_msg)
|
||||
|
||||
M.transfer_observers_to(new_mob)
|
||||
|
||||
|
||||
qdel(M)
|
||||
return new_mob
|
||||
|
||||
@@ -319,7 +319,7 @@
|
||||
L.mind.transfer_to(S)
|
||||
if(owner)
|
||||
to_chat(S, "<span class='userdanger'>You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [owner], your creator.</span>")
|
||||
P.loc = S
|
||||
P.forceMove(S)
|
||||
return
|
||||
else
|
||||
var/obj/O = src
|
||||
|
||||
Reference in New Issue
Block a user