From 6cfd346bddc54ec02544cfdb9a3b5e3cae58a497 Mon Sep 17 00:00:00 2001 From: WJohn Date: Fri, 22 Dec 2017 11:34:24 -0500 Subject: [PATCH 1/2] Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) --- _maps/map_files/BoxStation/BoxStation.dmm | 10 +- .../map_files/Deltastation/DeltaStation2.dmm | 10 +- _maps/map_files/MetaStation/MetaStation.dmm | 10 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 10 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 10 +- _maps/map_files/generic/CentCom.dmm | 1004 +++++++++-------- code/modules/shuttle/syndicate.dm | 4 +- 7 files changed, 591 insertions(+), 467 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 335393adac..12b9c297fc 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8973,14 +8973,14 @@ /area/maintenance/port/fore) "avT" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2852c76257..05a68f83ac 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3322,14 +3322,14 @@ /area/construction/mining/aux_base) "agO" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8ed9acf09f..e31bb2fc08 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -80597,14 +80597,14 @@ /area/shuttle/abandoned) "EDa" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_nw"; name = "northwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space/basic, /area/space/nearstation) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index ffda1f471d..4fc42569fa 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34669,14 +34669,14 @@ /area/space/nearstation) "sws" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_sw"; name = "southwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 7eb9a7ac7a..54e01bc923 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3137,14 +3137,14 @@ /area/maintenance/department/crew_quarters/dorms) "ajA" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 27198fe072..804e2c7a9a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7568,11 +7568,16 @@ }, /area/shuttle/syndicate/hallway) "uc" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 4 +/obj/structure/chair{ + dir = 4; + name = "tactical chair" }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/syndicate/hallway) +/obj/effect/turf_decal/bot_white, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "ud" = ( /obj/machinery/door/poddoor/shutters{ id = "nukeop_ready"; @@ -14641,6 +14646,125 @@ }, /turf/open/floor/plasteel, /area/tdome/arena) +"Mt" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"Mu" = ( +/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, +/area/shuttle/syndicate/airlock) +"Mv" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"Mw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"Mx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"My" = ( +/obj/docking_port/stationary{ + area_type = /area/syndicate_mothership; + baseturf_type = /turf/open/floor/plating/asteroid/snow; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + id = "syndicate_away"; + name = "syndicate recon outpost"; + turf_type = /turf/open/floor/plating/asteroid/snow; + width = 23 + }, +/obj/machinery/door/poddoor{ + id = "smindicate"; + name = "outer blast door" + }, +/obj/machinery/button/door{ + id = "smindicate"; + name = "external door control"; + pixel_x = 0; + pixel_y = 26; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + hidden = 1; + id = "syndicate"; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "syndicate infiltrator"; + port_direction = 4; + roundstart_move = null; + width = 23 + }, +/obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"Mz" = ( +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"MA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"MB" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"MC" = ( +/obj/structure/rack, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"MD" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'FOURTH WALL'."; + name = "\improper FOURTH WALL"; + pixel_x = -32 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/syndicate_mothership) (1,1,1) = {" aa @@ -26361,38 +26485,38 @@ hl hl hl hh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh aa aa aa @@ -26617,41 +26741,41 @@ hl hl hl hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +kt +MD +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +hl hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh +aa +aa aa aa aa @@ -26887,27 +27011,25 @@ hl hl hl hl +kt +kt +kt +kt +kt +kt +kt +yc +yd +yd +yd +yd +yd +yd +yd +yd +yd +kt hl -hl -hl -hl -hl -hl -hl -we -hl -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt hh aa aa @@ -26977,6 +27099,8 @@ aa aa aa aa +aa +aa "} (49,1,1) = {" aa @@ -27144,27 +27268,25 @@ hl hl hl hl -hl -hl -hl -kt kt +tY +tZ +tZ +tZ +tZ +tZ +yd +yL +zs +yL +AC +Bj +BT +Cj +CS +Di kt hl -hl -hl -hl -yc -yd -yd -yd -yd -yd -yd -yd -yd -yd -kt hh aa aa @@ -27234,6 +27356,8 @@ aa aa aa aa +aa +aa "} (50,1,1) = {" aa @@ -27401,27 +27525,25 @@ hl hl hl hl -hl -hl -hl -hl -tY -tZ -tZ -tZ -tZ -tZ -yd -yL -zs -yL -AC -Bj -BT -Cj -CS -Di kt +tZ +uG +vo +vo +vo +xA +yd +yM +zt +zR +zR +Bk +zR +Ck +CS +Dj +kt +hl hh aa aa @@ -27491,6 +27613,8 @@ aa aa aa aa +aa +aa "} (51,1,1) = {" aa @@ -27652,33 +27776,31 @@ hl hl hl hl -hl -hl -hl -hl -hl -hl -hl -hl -hl +kt +kt +kt +kt +kt +kt kt tZ -uG -vo -vo -vo -xA -yd -yM +uH +uH +uH +uH +uH +ye +yN zt -zR -zR -Bk -zR -Ck +zS +AD +Bl +BU +Cl CS -Dj +Dk kt +hl hh aa aa @@ -27748,6 +27870,8 @@ aa aa aa aa +aa +aa "} (52,1,1) = {" aa @@ -27909,33 +28033,31 @@ hl hl my hl -hl -kt -kt +oS +oT +oT +oT +oT hl hl -hl -hl -hl -hl -kt tZ uH uH uH uH uH -ye -yN +yd +yO zt -zS -AD -Bl -BU -Cl -CS -Dk +zT +AE +Bm +yf +yd +yd +Dl kt +hl hh aa aa @@ -28005,6 +28127,8 @@ aa aa aa aa +aa +aa "} (53,1,1) = {" aa @@ -28166,33 +28290,31 @@ hl hl hl hl -hl -kt -hl -oS oT +px +pR +qI oT -oT -oT -hl +rY hl tZ -uH -uH -uH -uH -uH +uI +vp +wf +wR +xB yd -yO +yP zt zT AE -Bm -yf +Bn yd -yd -Dl +hl +hl kt +kt +hl hh aa aa @@ -28262,6 +28384,8 @@ aa aa aa aa +aa +aa "} (54,1,1) = {" aa @@ -28423,33 +28547,31 @@ hl hl hl hl -hl -kt -hl -oT -px -pR +oU +py +pS qI oT -rY -hl +rZ +rZ tZ -uI -vp -wf -wR -xB +tZ +tZ +tZ +wS +xC +yf +yQ +yQ +zU +yQ yd -yP -zt -zT -AE -Bn yd +rZ +rZ +kt hl hl -kt -kt hh aa aa @@ -28519,6 +28641,8 @@ aa aa aa aa +aa +aa "} (55,1,1) = {" aa @@ -28680,31 +28804,29 @@ hl hl hl nx -hl -kt -hl oU -py -pS +pz +pT qI -oT -rZ -rZ -tZ -tZ -tZ -tZ -wS -xC -yf -yQ -yQ -zU -yQ -yd -yd -rZ -rZ +rb +sa +sY +ua +sY +sY +wg +sb +sb +sb +sb +zu +zV +AF +Bo +BV +Cm +CT +kt hl hl hh @@ -28776,6 +28898,8 @@ aa aa aa aa +aa +aa "} (56,1,1) = {" aa @@ -28937,31 +29061,29 @@ hl hl hl hl -hl -kt -hl oU -pz -pT +pA +pU qI -rb -sa -sY -ua -sY -sY -wg +rc sb +sZ +sZ +sZ sb +wh sb -sb -zu +sZ +sZ +sZ +sZ zV AF Bo -BV +BW Cm -CT +CU +kt hl hl hh @@ -29033,6 +29155,8 @@ aa aa aa aa +aa +aa "} (57,1,1) = {" aa @@ -29194,31 +29318,29 @@ hl my hl hl -hl -kt -hl oU -pA -pU +pB +pT qI -rc +oT +sc +ta +ub +ta +ta +wg sb -sZ -sZ -sZ sb -wh sb -sZ -sZ -sZ -sZ +sb +zv zV AF Bo -BW +BV Cm -CU +CV +kt hl hl hh @@ -29290,6 +29412,8 @@ aa aa aa aa +aa +aa "} (58,1,1) = {" aa @@ -29451,31 +29575,29 @@ hl hl hl hl -hl -kt -hl oU -pB -pT +pC +pV qI oT -sc -ta -ub -ta -ta -wg -sb -sb -sb -sb -zv -zV -AF -Bo -BV -Cm -CV +rZ +rZ +rZ +rZ +vq +vq +wT +xD +yg +yR +yR +zW +yR +yh +yh +rZ +rZ +kt hl hl hh @@ -29547,6 +29669,8 @@ aa aa aa aa +aa +aa "} (59,1,1) = {" aa @@ -29708,32 +29832,30 @@ hl hl hl hl -hl -kt -hl -oU -pC -pV +oT +pD +pW qI oT -rZ -rZ -uc -rZ -vq -vq -wT -xD -yg -yR -yR -zW -yR -yh -yh -rZ -rZ +sd hl +vq +Mt +Mv +uc +Mz +MB +yh +yS +zw +zX +AG +Bp +yh +hl +hl +kt +kt hl hh aa @@ -29804,6 +29926,8 @@ aa aa aa aa +aa +aa "} (60,1,1) = {" aa @@ -29965,33 +30089,31 @@ hl hl hl hl -hl -kt -hl +oV oT -pD -pW -qI oT -sd -tb -ng -nz +oT +oT +hl +hl vq -wi wU -xE +wU +wU +wU +wU yh -yS +yT zw zX AG -Bp +Bq +yg yh -hl -hl -kt +yh +Dm kt +hl hh aa aa @@ -30061,6 +30183,8 @@ aa aa aa aa +aa +aa "} (61,1,1) = {" aa @@ -30222,33 +30346,31 @@ hl mz hl my -hl kt -hl -oV -oT -oT -oT -oT -hl -tc -ll -uJ -vr -wj +kt +kt +kt +kt +kt +kt +vq wU -xE -yh -yT +wU +wU +wU +wU +yi +yU zw -zX -AG -Bq -yg -yh -yh -Dm +zY +AH +Br +zZ +Cn +CW +Dn kt +hl hh aa aa @@ -30318,6 +30440,8 @@ aa aa aa aa +aa +aa "} (62,1,1) = {" aa @@ -30480,32 +30604,30 @@ mA hl hl hl +hl +hl +nx +hl +hl kt -kt -kt -kt -kt -kt -kt -kt -tc -ll -uK -vs -wk -wU -xF -yi -yU +vq +Mu +Mw +Mx +MA +MC +yh +yV zw -zY -AH -Br zZ -Cn +zZ +Bs +zZ +Co CW -Dn +Do kt +hl hh aa aa @@ -30575,6 +30697,8 @@ aa aa aa aa +aa +aa "} (63,1,1) = {" aa @@ -30737,32 +30861,30 @@ hl hl hl hl -my hl hl hl hl -nx hl kt -tc -ll -tc -vt +yj vq vq +My +vs vq yh -yV +yW zw -zZ -zZ -Bs -zZ -Co +Aa +AI +Bt +BX +Cn CW -Do +Dp kt +hl hh aa aa @@ -30832,6 +30954,8 @@ aa aa aa aa +aa +aa "} (64,1,1) = {" aa @@ -30999,27 +31123,25 @@ hl hl hl hl -hl -hl kt -tc -ll -tc -hl -hl -hl -vq +kt +kt +uK +uJ +uK +kt +yj +yh +yh +yh +yh +yh +yh +yh +yh yh -yW -zw -Aa -AI -Bt -BX -Cn -CW -Dp kt +hl hh aa aa @@ -31089,6 +31211,8 @@ aa aa aa aa +aa +aa "} (65,1,1) = {" aa @@ -31250,7 +31374,7 @@ kt hl hl hl -mz +hl hl hl hl @@ -31262,21 +31386,19 @@ kt tc ll tc -hl -hl -hl -hl -yj -yh -yh -yh -yh -yh -yh -yh -yh -yh kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +hl hh aa aa @@ -31346,6 +31468,8 @@ aa aa aa aa +aa +aa "} (66,1,1) = {" aa @@ -31514,26 +31638,24 @@ hl kt kt kt -rd kt -td -ll -td +kt +tc +uJ +tc kt rd kt kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt +hl +hl +hl +hl +hl +hl +hl +hl +hl hh aa aa @@ -31603,6 +31725,8 @@ aa aa aa aa +aa +aa "} (67,1,1) = {" aa @@ -31789,8 +31913,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -31860,6 +31982,8 @@ aa aa aa aa +aa +aa "} (68,1,1) = {" aa @@ -32046,8 +32170,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -32117,6 +32239,8 @@ aa aa aa aa +aa +aa "} (69,1,1) = {" aa @@ -32303,8 +32427,6 @@ hl hl BY hl -hl -hl hh aa aa @@ -32374,6 +32496,8 @@ aa aa aa aa +aa +aa "} (70,1,1) = {" aa @@ -32560,8 +32684,6 @@ hl BY Cp BY -hl -hl hh aa aa @@ -32631,6 +32753,8 @@ aa aa aa aa +aa +aa "} (71,1,1) = {" aa @@ -32817,8 +32941,6 @@ hl hl BY hl -hl -hl hh aa aa @@ -32888,6 +33010,8 @@ aa aa aa aa +aa +aa "} (72,1,1) = {" aa @@ -33074,8 +33198,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -33145,6 +33267,8 @@ aa aa aa aa +aa +aa "} (73,1,1) = {" aa @@ -33332,8 +33456,8 @@ hh hh hh hh -hh -hh +aa +aa aa aa aa diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 283ac0f35c..ee5a435a86 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -56,8 +56,8 @@ shuttlePortName = "custom location" jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1) view_range = 13 - x_offset = -4 - y_offset = -2 + x_offset = -7 + y_offset = -1 see_hidden = TRUE #undef SYNDICATE_CHALLENGE_TIMER \ No newline at end of file