shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)

Browse Source 
* 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:
CitadelStationBot
2018-05-27 21:27:56 -05:00
committed by kevinz000
parent b24ff24696
commit d62cb31e9b
11 changed files with 4123 additions and 2071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+1404 -2048
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/ruin_caravan_victim.dmm
+1284
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/ruin_pirate_cutter.dmm
+1213
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/ruin_syndicate_dropship.dmm
+16 -8
View File
@@ -1,8 +1,10 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"al" = (
/obj/machinery/airalarm/syndicate{
/obj/machinery/airalarm{
dir = 4;
pixel_x = -24
pixel_x = -24;
req_access = null;
req_access_txt = "150"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
@@ -95,10 +97,12 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/obj/machinery/power/apc/syndicate{
/obj/machinery/power/apc{
dir = 8;
name = "Syndicate Drop Ship APC";
pixel_x = -24
pixel_x = -24;
req_access = null;
req_access_txt = "150"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -279,8 +283,10 @@
/area/shuttle/caravan/syndicate3)
"EO" = (
/obj/structure/chair,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
/obj/machinery/airalarm{
pixel_y = 24;
req_access = null;
req_access_txt = "150"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -296,9 +302,11 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate3)
"Gx" = (
/obj/machinery/airalarm/syndicate{
/obj/machinery/airalarm{
dir = 4;
pixel_x = -24
pixel_x = -24;
req_access = null;
req_access_txt = "150"
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/syndicate3)
_maps/shuttles/ruin_syndicate_fighter.dmm
+174
View File
@@ -0,0 +1,174 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aA" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/turretid{
ailock = 1;
control_area = null;
desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing.";
icon_state = "control_kill";
lethal = 1;
name = "Shuttle turret control";
pixel_x = 32;
pixel_y = -28;
req_access = null;
req_access_txt = "150"
},
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/mob/living/simple_animal/hostile/syndicate{
environment_smash = 0;
name = "Syndicate Salvage Pilot"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"fh" = (
/obj/machinery/camera/xray{
c_tag = "External View";
dir = 4;
network = list("caravansyndicate1");
pixel_x = 32
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/caravan/syndicate1)
"fp" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/caravan/syndicate1)
"qx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/shuttle/caravan/syndicate1{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"uW" = (
/obj/machinery/button/door{
id = "caravansyndicate1_bolt";
name = "External Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "150";
specialfunctions = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"vD" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 4;
icon_state = "standard_lethal";
mode = 1
},
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"vK" = (
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 8;
name = "Syndicate Fighter APC";
pixel_x = -24;
req_access = null;
req_access_txt = "150"
},
/obj/machinery/computer/security{
dir = 1;
network = list("caravansyndicate1")
},
/obj/structure/cable/yellow,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"wV" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/hatch{
id_tag = "caravansyndicate1_bolt";
name = "External Airlock";
normalspeed = 0;
req_access_txt = "150"
},
/obj/effect/decal/cleanable/dirt,
/obj/docking_port/mobile{
callTime = 50;
dir = 4;
dwidth = 4;
height = 5;
id = "caravansyndicate1";
ignitionTime = 25;
name = "Syndicate Fighter";
port_direction = 2;
preferred_direction = 4;
timid = 1;
width = 9
},
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate1)
"Jv" = (
/turf/template_noop,
/area/template_noop)
"YP" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
"YX" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/caravan/syndicate1)
(1,1,1) = {"
Jv
Jv
YP
fp
wV
fp
YP
Jv
Jv
"}
(2,1,1) = {"
Jv
YP
fp
uW
aA
vK
fp
YP
Jv
"}
(3,1,1) = {"
YX
fp
fp
fp
qx
fp
fp
fp
YX
"}
(4,1,1) = {"
fp
YX
Jv
vD
fh
vD
Jv
YX
fp
"}
(5,1,1) = {"
vD
Jv
Jv
Jv
Jv
Jv
Jv
Jv
vD
"}
code/__DEFINES/components.dm
+1 -1
View File
@@ -156,4 +156,4 @@
//Ouch my toes!
#define CALTROP_BYPASS_SHOES 1
#define CALTROP_IGNORE_WALKERS 2
#define CALTROP_IGNORE_WALKERS 2
code/datums/shuttles.dm
+20
View File
@@ -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"
code/game/atoms_movable.dm
+5 -4
View File
@@ -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
code/game/mecha/mecha.dm
+2 -2
View File
@@ -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
code/game/objects/items/storage/wallets.dm
+3 -7
View File
@@ -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)
code/modules/lighting/lighting_turf.dm
+1 -1
View File
@@ -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)