Merge pull request #487 from NataKilar/network-turret-saving

Network turret saving
PersistentSS13 · Jan 11, 2024 · 3589368 · 3589368
2 parents a48b6bd + 3f53e2a
commit 3589368
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/code/game/machinery/turrets/_turrets.dm b/code/game/machinery/turrets/_turrets.dm
@@ -449,12 +449,16 @@
 			return TOPIC_REFRESH
 
 	if(href_list["set_default"])
-		var/amount = input(user, "Input an angle between [leftmost_traverse] and [rightmost_traverse] degrees. Click cancel to disable default.", "Set Default Bearing", default_bearing) as null|num
+		var/leftmost_default = leftmost_traverse
+		var/rightmost_default = rightmost_traverse
+		if(traverse >= 360)
+			leftmost_default = 0
+			rightmost_default = 360
+		var/amount = input(user, "Input an angle between [leftmost_default] and [rightmost_default] degrees. Click cancel to disable default.", "Set Default Bearing", default_bearing) as null|num
 		if(isnum(amount))
-			default_bearing = clamp(amount, leftmost_traverse, rightmost_traverse)
+			default_bearing = clamp(amount, leftmost_default, rightmost_default)
 		else
 			default_bearing = null
-
 		return TOPIC_REFRESH
 
 	if(href_list["manual_fire"])

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
@@ -65,6 +65,8 @@
 #include "game\machinery\doors\_door.dm"
 #include "game\machinery\doors\double.dm"
 #include "game\machinery\kitchen\gibber.dm"
+#include "game\machinery\turrets\_turrets.dm"
+#include "game\machinery\turrets\network_turret.dm"
 #include "game\objects\item_materials.dm"
 #include "game\objects\obj.dm"
 #include "game\objects\effects\effect_system.dm"

diff --git a/mods/persistence/game/machinery/turrets/_turrets.dm b/mods/persistence/game/machinery/turrets/_turrets.dm
@@ -0,0 +1,11 @@
+SAVED_VAR(/obj/machinery/turret, enabled)
+SAVED_VAR(/obj/machinery/turret, installed_gun)
+SAVED_VAR(/obj/machinery/turret, traverse)
+SAVED_VAR(/obj/machinery/turret, turning_rate)
+SAVED_VAR(/obj/machinery/turret, vision_range)
+SAVED_VAR(/obj/machinery/turret, default_bearing)
+
+/obj/machinery/turret/Initialize()
+	if(persistent_id && istype(installed_gun))
+		setup_gun()
+	. = ..()
diff --git a/mods/persistence/game/machinery/turrets/network_turret.dm b/mods/persistence/game/machinery/turrets/network_turret.dm
@@ -0,0 +1,6 @@
+SAVED_VAR(/obj/machinery/turret/network, check_access)
+SAVED_VAR(/obj/machinery/turret/network, check_weapons)
+SAVED_VAR(/obj/machinery/turret/network, check_records)
+SAVED_VAR(/obj/machinery/turret/network, check_arrest)
+SAVED_VAR(/obj/machinery/turret/network, check_lifeforms)
+SAVED_VAR(/obj/machinery/turret/network, logs)