The great turrets&eguns update (CeladonSS13#1313)

* великое турелирование * сепаров спросить забыли --------- Signed-off-by: arealbeba <[email protected]>
MrCat15352 · Dec 30, 2024 · 0724010 · 0724010
1 parent 5c32e51
commit 0724010
Show file tree

Hide file tree

Showing 36 changed files with 768 additions and 441 deletions.
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -441,6 +441,10 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
+"qp" = (
+/obj/machinery/porta_turret/ship/elysium,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "rv" = (
 /obj/effect/turf_decal/industrial/stand_clear{
 	dir = 8
@@ -754,7 +758,6 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -788,6 +791,12 @@
 /obj/item/clothing/mask/bandana/black,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
+"zI" = (
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 1
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "Ah" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/crew/cryo)
@@ -1104,7 +1113,9 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 10
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (
@@ -1800,7 +1811,7 @@ gD
 JU
 "}
 (13,1,1) = {"
-CO
+zI
 yM
 oZ
 Gh
@@ -1810,7 +1821,7 @@ gL
 Sv
 Uj
 uZ
-MP
+qp
 "}
 (14,1,1) = {"
 CO
@@ -1857,7 +1868,7 @@ Cf
 QG
 dB
 CO
-MP
+CO
 CO
 bX
 vg

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm
@@ -858,7 +858,9 @@
 /turf/open/floor/plasteel/darkgreenfull,
 /area/ship/security)
 "eJ" = (
-/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
+/obj/machinery/porta_turret/ship/elysium/light{
+	dir = 8
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "eL" = (
@@ -1017,6 +1019,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
+"fU" = (
+/obj/machinery/porta_turret/ship/elysium/heavy{
+	dir = 5
+	},
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "fV" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2145,6 +2153,12 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
+"mC" = (
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 5
+	},
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "mG" = (
 /obj/effect/turf_decal/spline/fancy/opaque/syndiered,
 /turf/open/floor/plasteel/dark,
@@ -2903,6 +2917,12 @@
 "qS" = (
 /turf/closed/wall/mineral/titanium/survival,
 /area/ship/engineering/engine)
+"qW" = (
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 1
+	},
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "qY" = (
 /obj/machinery/light_switch{
 	dir = 1;
@@ -5109,6 +5129,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/crew/dorm)
+"DJ" = (
+/obj/machinery/porta_turret/ship/elysium/heavy{
+	dir = 6
+	},
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "DK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -6121,6 +6147,10 @@
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
+"Ji" = (
+/obj/machinery/porta_turret/ship/elysium,
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "Jk" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6191,6 +6221,10 @@
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
+"JC" = (
+/obj/machinery/porta_turret/ship/elysium/light,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "JE" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -6574,8 +6608,8 @@
 /turf/open/floor/plating/grass/jungle/lit,
 /area/ship/engineering/engine)
 "Mr" = (
-/obj/machinery/porta_turret/ship/faction/elysium/ballistic{
-	dir = 10
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 1
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal{
 	rad_insulation = 0
@@ -8131,6 +8165,14 @@
 /obj/structure/table/wood,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)
+"Vv" = (
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 6
+	},
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+	rad_insulation = 0
+	},
+/area/ship/bridge)
 "Vy" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8286,8 +8328,8 @@
 /turf/closed/wall/r_wall/rust/wasteplanet,
 /area/ship/crew/cryo)
 "We" = (
-/obj/machinery/porta_turret/ship/faction/elysium/ballistic{
-	dir = 10
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 8
 	},
 /turf/closed/wall/r_wall/rust/wasteplanet,
 /area/ship/bridge)
@@ -8832,6 +8874,12 @@
 /obj/structure/crate_shelf,
 /turf/open/floor/plating/wasteplanet/rust,
 /area/ship/hallway/port)
+"Zh" = (
+/obj/machinery/porta_turret/ship/elysium{
+	dir = 10
+	},
+/turf/closed/wall/r_wall/rust/wasteplanet,
+/area/ship/bridge)
 "Zk" = (
 /obj/effect/turf_decal/elysium_logo/three_one{
 	color = "#758967"
@@ -9202,7 +9250,7 @@ wH
 kE
 kE
 sY
-We
+Zh
 "}
 (8,1,1) = {"
 qM
@@ -9275,7 +9323,7 @@ Pn
 Lp
 "}
 (10,1,1) = {"
-We
+qW
 Pz
 Aq
 Aq
@@ -9552,7 +9600,7 @@ kT
 iI
 iI
 iI
-We
+Zh
 "}
 (18,1,1) = {"
 xj
@@ -9827,7 +9875,7 @@ lw
 pw
 ow
 gk
-eJ
+JC
 Nh
 mG
 fJ
@@ -10046,7 +10094,7 @@ mW
 "}
 (32,1,1) = {"
 mp
-We
+qW
 AW
 dY
 dY
@@ -10147,7 +10195,7 @@ OY
 cd
 iI
 iI
-dP
+Ji
 "}
 (35,1,1) = {"
 mp
@@ -10259,7 +10307,7 @@ mp
 mp
 mp
 mp
-We
+mC
 Bw
 Bw
 Bw
@@ -10283,7 +10331,7 @@ lx
 xB
 xB
 xB
-Mr
+Vv
 mp
 mp
 mp
@@ -10617,15 +10665,15 @@ zJ
 oM
 dP
 mp
-We
+dP
 VB
 VB
 VB
 VB
 VB
 VB
 VB
-We
+dP
 mp
 dP
 KD
@@ -10646,11 +10694,11 @@ mp
 mp
 mp
 mp
-We
 dP
-nn
 dP
+nn
 dP
+DJ
 mp
 mp
 mp
@@ -10662,11 +10710,11 @@ mp
 mp
 mp
 mp
-dP
+fU
 dP
 Ib
 dP
-We
+dP
 mp
 mp
 mp

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1431,7 +1431,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "qJ" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -2133,7 +2133,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "xh" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -3002,7 +3002,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Hu" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -3280,7 +3280,7 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
 "Ll" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -3528,7 +3528,7 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Oa" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -3813,7 +3813,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "QZ" = (
-/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -5345,7 +5345,7 @@ Ll
 SC
 SC
 SC
-Oa
+It
 XJ
 XJ
 XJ