Fix: Turret (#864)

* Fix: Turret * Fix elysium * Khasir * Kondor.dmm * README,md
CeladonSS13 · Jul 26, 2024 · a5438c3 · a5438c3
1 parent b2f64c5
commit a5438c3
Show file tree

Hide file tree

Showing 31 changed files with 338 additions and 209 deletions.
diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm
@@ -14294,6 +14294,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor,
 /turf/open/floor/plasteel/patterned/cargo_one{
 	light_color = "#1B1D2E";
 	light_range = 2

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
@@ -2615,15 +2615,16 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/electrical)
 "zP" = (
-/mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
-	},
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 8
 	},
 /obj/structure/chair/sofa/brown/corpo/left{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/retaliate/goose{
+	name = "Khasir";
+	faction = list("playerElysium")
+	},
 /turf/open/floor/carpet/green,
 /area/ship/security)
 "zV" = (

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
@@ -737,7 +737,8 @@
 	color = "#808080"
 	},
 /mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
+	name = "Khasir";
+	faction = list("playerElysium")
 	},
 /turf/open/floor/plasteel/elevatorshaft{
 	color = "#808080"

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -758,9 +758,7 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("playerElysium","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -1110,9 +1108,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret{
-	faction = list("playerElysium","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/elysium/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
@@ -282,6 +282,10 @@
 /obj/structure/sign/poster/elysium/random{
 	pixel_x = -32
 	},
+/mob/living/simple_animal/hostile/retaliate/goose{
+	name = "Khasir";
+	faction = list("playerElysium")
+	},
 /turf/open/floor/carpet/green,
 /area/ship/hallway/central)
 "iM" = (
@@ -735,6 +739,10 @@
 	color = "#758967"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/item/elysm_manual{
+	pixel_y = 5;
+	pixel_x = -10
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
 "qP" = (

diff --git a/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
@@ -2359,7 +2359,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Wg" = (
-/obj/item/circuitboard/computer/cargo/express,
+/obj/structure/rack,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "Wh" = (
@@ -3112,11 +3113,11 @@ Sc
 fa
 ll
 Il
-Wg
+KR
 eZ
 wD
 IP
-OR
+Wg
 gq
 Ix
 DU

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1431,9 +1431,8 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "qJ" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 9;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -2134,9 +2133,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "xh" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3001,9 +2999,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Hu" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3280,9 +3277,8 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
 "Ll" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3529,9 +3525,8 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Oa" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3815,9 +3810,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "QZ" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 10;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
@@ -303,9 +303,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "cM" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 5;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -462,9 +461,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "ej" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/faction/inteq/ballistic{
 	dir = 6;
-	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -451,8 +451,7 @@
 "bU" = (
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/robot_debris,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -1100,9 +1099,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "gy" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
 "gF" = (
@@ -1132,9 +1129,7 @@
 /area/ship/maintenance/central)
 "gG" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "gJ" = (
@@ -1553,8 +1548,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "ji" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -2327,8 +2321,7 @@
 /area/ship/security/prison)
 "oN" = (
 /obj/effect/decal/cleanable/squid_ink,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -3330,9 +3323,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "vU" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "vX" = (
@@ -6617,9 +6608,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/ship/medical)
 "PB" = (
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "PC" = (
@@ -7012,8 +7001,7 @@
 /area/ship/cargo/office)
 "SU" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/porta_turret{
-	faction = list("turret","playerInteq");
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
 	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -700,9 +700,7 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret{
-	faction = list("playerInteq","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -990,9 +988,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "LV" = (
-/obj/machinery/porta_turret{
-	density = 0;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover{
+	density = 0
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -1073,9 +1070,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret{
-	faction = list("playerInteq","turret")
-	},
+/obj/machinery/porta_turret/ship/faction/inteq/laser/cover,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -5301,9 +5301,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ek" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -5337,9 +5336,8 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "Ez" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 9;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -6099,9 +6097,8 @@
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
 "JL" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 6;
-	faction = list("playerInteq","turret")
+/obj/machinery/porta_turret/ship/faction/inteq{
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -8986,7 +8983,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "ZH" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/faction/inteq{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium,