Skip to content

Commit

Permalink
syndicate turret update (#2478)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds bespoke factioned turrets for the syndicate and adds them to
relevant syndicate ships
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
IFF(2025)
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Syndicate groups have reported new models of turrets being attached
to their ships.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Nov 14, 2023
1 parent f184346 commit c46865b
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 34 deletions.
43 changes: 37 additions & 6 deletions _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -892,12 +892,25 @@
/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"tV" = (
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 4;
pixel_x = 8
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"uq" = (
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 10
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"uR" = (
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 9
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"vk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -1125,6 +1138,12 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo)
"Ah" = (
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 6
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"AM" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
Expand Down Expand Up @@ -1176,7 +1195,9 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew/dorm)
"CR" = (
/obj/machinery/porta_turret/ship,
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 10
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"CU" = (
Expand Down Expand Up @@ -1293,7 +1314,11 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"GV" = (
/obj/machinery/porta_turret/ship/weak,
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 4;
pixel_x = 8;
pixel_y = 4
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"Hd" = (
Expand Down Expand Up @@ -1396,6 +1421,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"KA" = (
/obj/machinery/porta_turret/ship/syndicate/weak{
dir = 5
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"KP" = (
/obj/structure/closet/wall{
name = "emergency rum cabinet";
Expand Down Expand Up @@ -1966,7 +1997,7 @@
/area/ship/engineering)

(1,1,1) = {"
CR
uR
YQ
YQ
ru
Expand Down Expand Up @@ -2069,7 +2100,7 @@ nO
"}
(7,1,1) = {"
YQ
CR
KA
kM
kM
kM
Expand All @@ -2081,7 +2112,7 @@ cZ
jj
jj
jj
CR
Ah
YQ
"}
(8,1,1) = {"
Expand Down Expand Up @@ -2276,7 +2307,7 @@ YQ
YQ
YQ
YQ
GV
tV
bO
bO
dA
Expand Down
38 changes: 31 additions & 7 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,12 @@
/obj/machinery/porta_turret/ship/ballistic,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"BR" = (
/obj/machinery/porta_turret/ship/syndicate{
dir = 1
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"BZ" = (
/obj/structure/window/reinforced/tinted/frosted,
/obj/machinery/suit_storage_unit/inherit{
Expand Down Expand Up @@ -2336,6 +2342,10 @@
},
/turf/open/floor/carpet/red_gold,
/area/ship/bridge)
"NA" = (
/obj/machinery/porta_turret/ship/syndicate,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/bridge)
"NF" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
Expand Down Expand Up @@ -2500,7 +2510,9 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"Qz" = (
/obj/machinery/porta_turret/ship/ballistic,
/obj/machinery/porta_turret/ship/syndicate{
dir = 6
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"QW" = (
Expand Down Expand Up @@ -2876,6 +2888,12 @@
},
/turf/open/floor/carpet/red_gold,
/area/ship/bridge)
"Up" = (
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 4
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"UI" = (
/obj/structure/cable{
icon_state = "4-8"
Expand All @@ -2886,6 +2904,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew)
"UN" = (
/obj/machinery/porta_turret/ship/syndicate{
dir = 1
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"UX" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew)
Expand Down Expand Up @@ -3311,7 +3335,7 @@ sE
"}
(2,1,1) = {"
nn
BG
BR
ir
PL
SP
Expand All @@ -3328,7 +3352,7 @@ sE
nX
dU
pi
BG
NA
"}
(3,1,1) = {"
nn
Expand Down Expand Up @@ -3578,13 +3602,13 @@ UX
GV
GV
GV
BG
NA
nn
Zb
"}
(15,1,1) = {"
nn
Qz
UN
cs
cs
XU
Expand Down Expand Up @@ -3836,13 +3860,13 @@ mL
"}
(27,1,1) = {"
nn
Qz
Up
Ap
Jv
oQ
VC
Ap
Qz
Up
nn
nn
nn
Expand Down
36 changes: 27 additions & 9 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ea" = (
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 6
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"em" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/industrial/warning{
Expand Down Expand Up @@ -1771,6 +1777,12 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"rh" = (
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 10
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"rj" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/industrial/fire{
Expand Down Expand Up @@ -1858,7 +1870,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"rS" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 5
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -1965,7 +1977,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"td" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 9
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -2483,6 +2495,12 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"yw" = (
/obj/machinery/porta_turret/ship/syndicate{
dir = 8
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"yJ" = (
/obj/structure/frame/machine,
/obj/structure/grille/broken,
Expand Down Expand Up @@ -3321,7 +3339,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"FY" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate{
dir = 4
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -4231,7 +4249,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"OP" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate{
dir = 10
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -4440,7 +4458,7 @@
/turf/open/floor/pod/dark,
/area/ship/medical)
"Rp" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate{
dir = 6
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -5174,7 +5192,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/medical)
"XE" = (
/obj/machinery/porta_turret/ship/ballistic{
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 8
},
/turf/closed/wall/mineral/plastitanium,
Expand Down Expand Up @@ -5431,7 +5449,7 @@ gN
gN
gN
gN
OP
rh
CM
CM
CM
Expand Down Expand Up @@ -5484,7 +5502,7 @@ Aj
Aj
ti
ti
XE
yw
lu
lu
Ep
Expand Down Expand Up @@ -6135,7 +6153,7 @@ OQ
OQ
OQ
OQ
Rp
ea
CM
CM
CM
Expand Down
20 changes: 8 additions & 12 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2033,9 +2033,8 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"ms" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 9;
faction = list("PlayerSyndicate")
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 9
},
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
Expand Down Expand Up @@ -3434,9 +3433,8 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"vd" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 5;
faction = list("PlayerSyndicate")
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 5
},
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
Expand Down Expand Up @@ -6469,9 +6467,8 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Mr" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 6;
faction = list("PlayerSyndicate")
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 6
},
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
Expand Down Expand Up @@ -8074,9 +8071,8 @@
},
/area/ship/crew/cryo)
"We" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 10;
faction = list("PlayerSyndicate")
/obj/machinery/porta_turret/ship/syndicate/heavy{
dir = 10
},
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
Expand Down
Loading

0 comments on commit c46865b

Please sign in to comment.