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 19:27:56 -07: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
"}