Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045

TG Sync #4985279348672983476
This commit is contained in:
deathride58
2018-02-14 04:11:44 +00:00
committed by GitHub
230 changed files with 2829 additions and 3185 deletions

View File

@@ -70,6 +70,7 @@
name = "Pirate Cutter";
port_direction = 8;
preferred_direction = 4;
timid = 0;
width = 22
},
/turf/open/floor/plating,
@@ -3264,6 +3265,7 @@
name = "Syndicate Drop Ship";
port_direction = 8;
preferred_direction = 4;
timid = 0;
width = 15
},
/turf/open/floor/plating,
@@ -3431,6 +3433,7 @@
name = "Syndicate Fighter";
port_direction = 2;
preferred_direction = 4;
timid = 0;
width = 9
},
/turf/open/floor/plating,
@@ -3577,6 +3580,7 @@
name = "Syndicate Fighter";
port_direction = 2;
preferred_direction = 1;
timid = 0;
width = 9
},
/turf/open/floor/plating,
@@ -3605,6 +3609,7 @@
name = "Small Freighter";
port_direction = 8;
preferred_direction = 4;
timid = 0;
width = 27
},
/turf/open/floor/plating,
@@ -8929,4 +8934,4 @@ aa
aa
aa
aa
"}
"}

View File

@@ -179,7 +179,6 @@
pixel_x = 5;
pixel_y = 5
},
/mob/living/simple_animal/hostile/syndicate/ranged,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -651,7 +650,6 @@
pixel_x = 5;
pixel_y = 5
},
/mob/living/simple_animal/hostile/syndicate/ranged,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/listeningstation)
"bc" = (