lizard lizard loses l-it at deck guns

lizard enters code to fix some issues with moving and stacking deck gun machines. lizard rewrites the entire structure instead because of questionable decisions.
BeeStation · Dec 11, 2024 · 05dcf94 · 05dcf94
1 parent 0636b8f
commit 05dcf94
Show file tree

Hide file tree

Showing 15 changed files with 242 additions and 54 deletions.
diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm
diff --git a/_maps/map_files/Eclipse/Eclipse1.dmm b/_maps/map_files/Eclipse/Eclipse1.dmm
diff --git a/_maps/map_files/Galactica/Galactica2.dmm b/_maps/map_files/Galactica/Galactica2.dmm
diff --git a/_maps/map_files/Gladius/Gladius2.dmm b/_maps/map_files/Gladius/Gladius2.dmm
diff --git a/_maps/map_files/Instanced/map_files/Babylon2.dmm b/_maps/map_files/Instanced/map_files/Babylon2.dmm
diff --git a/_maps/map_files/Instanced/map_files/Hammurabi2.dmm b/_maps/map_files/Instanced/map_files/Hammurabi2.dmm
diff --git a/_maps/map_files/Snake/snake_lower.dmm b/_maps/map_files/Snake/snake_lower.dmm
diff --git a/_maps/map_files/Testship/testship.dmm b/_maps/map_files/Testship/testship.dmm
diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm
diff --git a/_maps/map_files/Vago/vagodeck2.dmm b/_maps/map_files/Vago/vagodeck2.dmm
diff --git a/_maps/templates/boarding/syndicate/destroyer.dmm b/_maps/templates/boarding/syndicate/destroyer.dmm
diff --git a/nsv13/code/game/objects/effects/spawners/custom_loot_spawners.dm b/nsv13/code/game/objects/effects/spawners/custom_loot_spawners.dm
@@ -84,7 +84,7 @@
 	loot = list(
 		/obj/item/powder_bag = 10,
 		/obj/machinery/computer/deckgun = 1,
-		/obj/machinery/deck_turret = 1,
+		/obj/machinery/deck_turret/core = 1,
 		/obj/machinery/deck_turret/payload_gate = 1,
 		/obj/machinery/deck_turret/autoelevator = 1,
 		/obj/machinery/deck_turret/powder_gate = 1

diff --git a/nsv13/code/game/objects/items/nsv_circuitboards.dm b/nsv13/code/game/objects/items/nsv_circuitboards.dm
@@ -201,12 +201,12 @@
 	build_path = /obj/machinery/computer/deckgun
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
 
-/obj/item/circuitboard/machine/deck_gun
+/obj/item/circuitboard/machine/deck_gun/core
 	name = "deck gun core (Machine Board)"
 	req_components = list(
 		/obj/item/stack/sheet/mineral/titanium = 10,
 		/obj/item/stack/cable_coil = 5)
-	build_path = /obj/machinery/deck_turret
+	build_path = /obj/machinery/deck_turret/core
 	needs_anchored = FALSE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF