[MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)
* Delete some duplicate macro definitions * sql changelog changes ping the host * Templates the caravan ambush ruin shuttles * Update CODEOWNERS * Update components.dm * Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile * Initial Placeholder * Update caravanambush.dmm
This commit is contained in:
committed by
kevinz000
parent
b24ff24696
commit
d62cb31e9b
@@ -156,4 +156,4 @@
|
||||
|
||||
//Ouch my toes!
|
||||
#define CALTROP_BYPASS_SHOES 1
|
||||
#define CALTROP_IGNORE_WALKERS 2
|
||||
#define CALTROP_IGNORE_WALKERS 2
|
||||
@@ -90,6 +90,10 @@
|
||||
port_id = "pirate"
|
||||
can_be_bought = FALSE
|
||||
|
||||
/datum/map_template/shuttle/ruin //For random shuttles in ruins
|
||||
port_id = "ruin"
|
||||
can_be_bought = FALSE
|
||||
|
||||
// Shuttles start here:
|
||||
|
||||
/datum/map_template/shuttle/emergency/airless
|
||||
@@ -407,3 +411,19 @@
|
||||
/datum/map_template/shuttle/pirate/default
|
||||
suffix = "default"
|
||||
name = "pirate ship (Default)"
|
||||
|
||||
/datum/map_template/shuttle/ruin/caravan_victim
|
||||
suffix = "caravan_victim"
|
||||
name = "Small Freighter"
|
||||
|
||||
/datum/map_template/shuttle/ruin/pirate_cutter
|
||||
suffix = "pirate_cutter"
|
||||
name = "Pirate Cutter"
|
||||
|
||||
/datum/map_template/shuttle/ruin/syndicate_dropship
|
||||
suffix = "syndicate_dropship"
|
||||
name = "Syndicate Dropship"
|
||||
|
||||
/datum/map_template/shuttle/ruin/syndicate_fighter
|
||||
suffix = "syndicate_fighter"
|
||||
name = "Syndicate Fighter"
|
||||
@@ -314,14 +314,14 @@
|
||||
var/area/old_area = get_area(oldloc)
|
||||
var/area/destarea = get_area(destination)
|
||||
|
||||
if(oldloc && !same_loc)
|
||||
oldloc.Exited(src, destination)
|
||||
if(old_area)
|
||||
old_area.Exited(src, destination)
|
||||
|
||||
loc = destination
|
||||
|
||||
if(!same_loc)
|
||||
if(oldloc)
|
||||
oldloc.Exited(src, destination)
|
||||
if(old_area)
|
||||
old_area.Exited(src, destination)
|
||||
var/turf/oldturf = get_turf(oldloc)
|
||||
var/turf/destturf = get_turf(destination)
|
||||
var/old_z = (oldturf ? oldturf.z : null)
|
||||
@@ -336,6 +336,7 @@
|
||||
if(AM == src)
|
||||
continue
|
||||
AM.Crossed(src, oldloc)
|
||||
|
||||
Moved(oldloc, NONE, TRUE)
|
||||
. = TRUE
|
||||
|
||||
|
||||
@@ -927,9 +927,9 @@
|
||||
|
||||
/obj/mecha/Exited(atom/movable/M, atom/newloc)
|
||||
if(occupant && occupant == M) // The occupant exited the mech without calling go_out()
|
||||
go_out(1, newloc)
|
||||
go_out(TRUE, newloc)
|
||||
|
||||
/obj/mecha/proc/go_out(var/forced, var/atom/newloc = loc)
|
||||
/obj/mecha/proc/go_out(forced, atom/newloc = loc)
|
||||
if(!occupant)
|
||||
return
|
||||
var/atom/movable/mob_container
|
||||
|
||||
@@ -38,17 +38,13 @@
|
||||
|
||||
/obj/item/storage/wallet/Exited(atom/movable/AM)
|
||||
. = ..()
|
||||
// The loc has not actually changed yet when this proc is called, so call
|
||||
// refreshID and have it ignore the outgoing atom.
|
||||
refreshID(AM)
|
||||
refreshID()
|
||||
|
||||
/obj/item/storage/wallet/proc/refreshID(atom/movable/removed)
|
||||
/obj/item/storage/wallet/proc/refreshID()
|
||||
LAZYCLEARLIST(combined_access)
|
||||
if(!(front_id in src) || front_id == removed)
|
||||
if(!(front_id in src))
|
||||
front_id = null
|
||||
for(var/obj/item/card/id/I in contents)
|
||||
if(I == removed)
|
||||
continue
|
||||
if(!front_id)
|
||||
front_id = I
|
||||
LAZYINITLIST(combined_access)
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
has_opaque_atom = TRUE
|
||||
break
|
||||
|
||||
/turf/Exited(var/atom/movable/Obj, var/atom/newloc)
|
||||
/turf/Exited(atom/movable/Obj, atom/newloc)
|
||||
. = ..()
|
||||
|
||||
if (Obj && Obj.opacity)
|
||||
|
||||
Reference in New Issue
Block a user