From bb6892a2e0f98d79b2548818e3210ee001931b1f Mon Sep 17 00:00:00 2001 From: "natakilar@gmail.com" Date: Tue, 9 Jan 2024 23:09:33 -0500 Subject: [PATCH 1/2] Turret saving --- mods/persistence/_persistence.dme | 2 ++ mods/persistence/game/machinery/turrets/_turrets.dm | 11 +++++++++++ .../game/machinery/turrets/network_turret.dm | 6 ++++++ 3 files changed, 19 insertions(+) create mode 100644 mods/persistence/game/machinery/turrets/_turrets.dm create mode 100644 mods/persistence/game/machinery/turrets/network_turret.dm diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index 44e10a531bf..a2092af4e1e 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -64,6 +64,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 new file mode 100644 index 00000000000..03e03322ef8 --- /dev/null +++ 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 new file mode 100644 index 00000000000..4d890274a47 --- /dev/null +++ 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) \ No newline at end of file From 3f53e2a224c1d0bbe3cce0ce53b8f9e3f53de314 Mon Sep 17 00:00:00 2001 From: "natakilar@gmail.com" Date: Tue, 9 Jan 2024 23:10:01 -0500 Subject: [PATCH 2/2] Fixes setting default angle on network turrets --- code/game/machinery/turrets/_turrets.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/turrets/_turrets.dm b/code/game/machinery/turrets/_turrets.dm index bc39db32222..a0e054388b4 100644 --- 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"])