Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465

[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
This commit is contained in:
deathride58
2017-12-14 03:54:31 +00:00
committed by GitHub
76 changed files with 422 additions and 413 deletions
+2 -2
View File
@@ -748,7 +748,7 @@
icon_state = initial(icon_state)
occupant = pilot_mob
pilot_mob.mecha = src
pilot_mob.loc = src
pilot_mob.forceMove(src)
GrantActions(pilot_mob)//needed for checks, and incase a badmin puts somebody in the mob
/obj/mecha/proc/aimob_exit_mech(mob/living/simple_animal/hostile/syndicate/mecha_pilot/pilot_mob)
@@ -959,7 +959,7 @@
if(istype(mob_container, /obj/item/device/mmi))
var/obj/item/device/mmi/mmi = mob_container
if(mmi.brainmob)
L.loc = mmi
L.forceMove(mmi)
L.reset_perspective()
mmi.mecha = null
mmi.update_icon()
+1 -1
View File
@@ -524,7 +524,7 @@
else
user.visible_message("[user] removes the advanced scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
I.loc = get_turf(holder)
I.forceMove(get_turf(holder))
holder.icon_state = "gygax10"
if(11)
if(diff==FORWARD)
+4 -4
View File
@@ -34,7 +34,7 @@
for(var/i=1, i <= hides, i++)
new /obj/item/stack/sheet/animalhide/goliath_hide(loc) //If a goliath-plated ripley gets killed, all the plates drop
for(var/atom/movable/A in cargo)
A.forceMove(loc)
A.forceMove(drop_location())
step_rand(A)
cargo.Cut()
return ..()
@@ -130,7 +130,7 @@
var/obj/O = locate(href_list["drop_from_cargo"])
if(O && O in src.cargo)
src.occupant_message("<span class='notice'>You unload [O].</span>")
O.forceMove(loc)
O.forceMove(drop_location())
src.cargo -= O
src.log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]")
return
@@ -141,7 +141,7 @@
var/obj/O = X
if(prob(30/severity))
cargo -= O
O.forceMove(loc)
O.forceMove(drop_location())
. = ..()
/obj/mecha/working/ripley/get_stats_part()
@@ -173,7 +173,7 @@
if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src )
return
to_chat(user, "<span class='notice'>You successfully pushed [O] out of [src]!</span>")
O.loc = loc
O.forceMove(drop_location())
cargo -= O
else
if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.