From 3eca492b799ec6a2dcc3e98395290108c9b27cd6 Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Thu, 14 May 2020 16:20:12 -0400 Subject: [PATCH 1/3] Adds mass driver to the syndicate infiltrator --- _maps/shuttles/infiltrator_basic.dmm | 146 +++++++++++++++++++++++---- 1 file changed, 127 insertions(+), 19 deletions(-) diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index d1ffaaad6c2c..f07b6684dade 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -376,15 +376,6 @@ }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) -"aQ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/syndicate/airlock) "aR" = ( /obj/machinery/suit_storage_unit/syndicate, /obj/effect/turf_decal/stripes/line{ @@ -1223,23 +1214,111 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/armory) +"dg" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/mass_driver{ + dir = 4; + id = "syndiedriver" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "dp" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 10 }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) +"nG" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/syndicate/airlock) +"nK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/syndicate/airlock) "pd" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 5 }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/bridge) +"tv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Mass Driver"; + req_access_txt = "150" + }, +/obj/machinery/computer/pod/old{ + density = 0; + icon = 'icons/obj/airlock_machines.dmi'; + icon_state = "airlock_control_standby"; + id = "chapelgun"; + name = "Mass Driver Controller"; + pixel_x = -25; + pixel_y = -1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"up" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "vv" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) +"BP" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "smindicate"; + name = "outer blast door" + }, +/turf/open/floor/plating, +/area/shuttle/syndicate/airlock) "CN" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1250,6 +1329,10 @@ /obj/item/pen/red, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) +"HJ" = ( +/obj/effect/turf_decal/bot_white, +/turf/closed/wall/r_wall/syndicate, +/area/shuttle/syndicate/airlock) "In" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 6 @@ -1270,6 +1353,31 @@ /obj/machinery/photocopier, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) +"Tc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/syndicate/airlock) (1,1,1) = {" aa @@ -1555,8 +1663,8 @@ ac In aa aB -aO -aO +HJ +HJ aX bc aO @@ -1580,8 +1688,8 @@ ac aa aa aB -aP -aP +dg +tv aP aP aP @@ -1605,11 +1713,11 @@ aa aa aa aB +nK +up aP aP -aP -aP -aP +Tc bn bz bG @@ -1630,8 +1738,8 @@ aa aa aa aB -aQ -aT +nK +nG aT aT bi @@ -1655,7 +1763,7 @@ aa aa aa aF -aB +BP aB aY bd From 982bcbc01c5c48c73aa1147c09a199ddd11110c7 Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Thu, 14 May 2020 16:34:39 -0400 Subject: [PATCH 2/3] fixed cannon --- _maps/shuttles/infiltrator_basic.dmm | 74 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index f07b6684dade..88190d7ea37c 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -1263,33 +1263,6 @@ }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/bridge) -"tv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Mass Driver"; - req_access_txt = "150" - }, -/obj/machinery/computer/pod/old{ - density = 0; - icon = 'icons/obj/airlock_machines.dmi'; - icon_state = "airlock_control_standby"; - id = "chapelgun"; - name = "Mass Driver Controller"; - pixel_x = -25; - pixel_y = -1 - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/syndicate/airlock) "up" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1311,14 +1284,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) -"BP" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor{ - id = "smindicate"; - name = "outer blast door" - }, -/turf/open/floor/plating, -/area/shuttle/syndicate/airlock) "CN" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1329,6 +1294,14 @@ /obj/item/pen/red, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) +"Eh" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id = "syndiedriver"; + name = "outer blast door" + }, +/turf/open/floor/plating, +/area/shuttle/syndicate/airlock) "HJ" = ( /obj/effect/turf_decal/bot_white, /turf/closed/wall/r_wall/syndicate, @@ -1345,6 +1318,33 @@ }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/medical) +"Nh" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Mass Driver"; + req_access_txt = "150" + }, +/obj/machinery/computer/pod/old{ + density = 0; + icon = 'icons/obj/airlock_machines.dmi'; + icon_state = "airlock_control_standby"; + id = "syndiedriver"; + name = "Mass Driver Controller"; + pixel_x = -36; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "No" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1689,7 +1689,7 @@ aa aa aB dg -tv +Nh aP aP aP @@ -1763,7 +1763,7 @@ aa aa aa aF -BP +Eh aB aY bd From 119f10a579a2d8bec51e59cb103a153dcf2baaef Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Fri, 15 May 2020 22:35:52 -0400 Subject: [PATCH 3/3] changes ;) --- _maps/shuttles/infiltrator_basic.dmm | 124 ++++++++++++++------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 88190d7ea37c..eab8ae30d507 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -1214,27 +1214,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/shuttle/syndicate/armory) -"dg" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/mass_driver{ - dir = 4; - id = "syndiedriver" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/syndicate/airlock) "dp" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 10 @@ -1250,19 +1229,41 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/airlock) -"nK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/syndicate/airlock) "pd" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 5 }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/bridge) +"rB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"tZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/closed/wall/r_wall/syndicate, +/area/shuttle/syndicate/airlock) "up" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1284,6 +1285,19 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) +"yG" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "CN" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1302,23 +1316,13 @@ }, /turf/open/floor/plating, /area/shuttle/syndicate/airlock) -"HJ" = ( -/obj/effect/turf_decal/bot_white, -/turf/closed/wall/r_wall/syndicate, -/area/shuttle/syndicate/airlock) "In" = ( /obj/machinery/porta_turret/syndicate/shuttle{ dir = 6 }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/hallway) -"MJ" = ( -/obj/machinery/porta_turret/syndicate/shuttle{ - dir = 6 - }, -/turf/closed/wall/r_wall/syndicate, -/area/shuttle/syndicate/medical) -"Nh" = ( +"Mw" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1340,11 +1344,17 @@ icon_state = "airlock_control_standby"; id = "syndiedriver"; name = "Mass Driver Controller"; - pixel_x = -36; - pixel_y = 4 + pixel_x = -41; + pixel_y = 8 }, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) +"MJ" = ( +/obj/machinery/porta_turret/syndicate/shuttle{ + dir = 6 + }, +/turf/closed/wall/r_wall/syndicate, +/area/shuttle/syndicate/medical) "No" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -1353,7 +1363,7 @@ /obj/machinery/photocopier, /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/bridge) -"Tc" = ( +"Uz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1364,19 +1374,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/mass_driver{ + dir = 4; + id = "syndiedriver" }, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/plasteel/dark, /area/shuttle/syndicate/airlock) (1,1,1) = {" @@ -1663,8 +1665,8 @@ ac In aa aB -HJ -HJ +aB +tZ aX bc aO @@ -1688,8 +1690,8 @@ ac aa aa aB -dg -Nh +Uz +Mw aP aP aP @@ -1713,11 +1715,11 @@ aa aa aa aB -nK +yG up aP aP -Tc +rB bn bz bG @@ -1738,7 +1740,7 @@ aa aa aa aB -nK +yG nG aT aT