From 161354cb2a22b29a6be4c85e8f0986599e0c4673 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 11 Apr 2021 14:58:12 -0400 Subject: [PATCH] Fixes Point Defense Batteries --- code/game/machinery/pointdefense.dm | 80 ++++++++++++++----- .../weapons/circuitboards/machinery/ships.dm | 2 +- maps/offmap_vr/om_ships/aro2.dmm | 20 ++--- maps/offmap_vr/om_ships/bearcat.dmm | 4 +- maps/offmap_vr/om_ships/cruiser.dmm | 2 +- maps/offmap_vr/om_ships/itglight.dmm | 12 +-- maps/offmap_vr/om_ships/mercship.dmm | 12 +-- maps/offmap_vr/om_ships/salamander.dmm | 4 +- maps/offmap_vr/om_ships/salamander_wreck.dmm | 4 +- maps/offmap_vr/om_ships/shelter_6.dmm | 2 +- maps/offmap_vr/talon/talon1.dmm | 10 +-- maps/offmap_vr/talon/talon2.dmm | 8 +- maps/submaps/admin_use_vr/ert.dmm | 24 +++--- maps/submaps/admin_use_vr/kk_mercship.dmm | 24 +++--- maps/submaps/pois_vr/debris_field/debris8.dmm | 2 +- 15 files changed, 125 insertions(+), 85 deletions(-) diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 705e2892e92..fd512868582 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -4,7 +4,7 @@ // GLOBAL_LIST_BOILERPLATE(pointdefense_controllers, /obj/machinery/pointdefense_control) -GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) +GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) /obj/machinery/pointdefense_control name = "fire assist mainframe" @@ -54,7 +54,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) return TRUE if(action == "toggle_active") - var/obj/machinery/pointdefense/PD = locate(params["target"]) + var/obj/machinery/power/pointdefense/PD = locate(params["target"]) if(!istype(PD)) return FALSE @@ -77,7 +77,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) if(id_tag) var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) for(var/i = 1 to LAZYLEN(pointdefense_turrets)) - var/obj/machinery/pointdefense/PD = pointdefense_turrets[i] + var/obj/machinery/power/pointdefense/PD = pointdefense_turrets[i] if(!(PD.id_tag == id_tag && get_z(PD) in connected_z_levels)) continue var/list/turret = list() @@ -118,7 +118,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) // The acutal point defense battery // -/obj/machinery/pointdefense +/obj/machinery/power/pointdefense name = "\improper point defense battery" icon = 'icons/obj/pointdefense.dmi' icon_state = "pointdefense2" @@ -137,33 +137,69 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) var/weakref/engaging = null // The meteor we're shooting at var/id_tag = null -/obj/machinery/pointdefense/Initialize() +/obj/machinery/power/pointdefense/Initialize() . = ..() // TODO - Remove this bit once machines are converted to Initialize if(ispath(circuit)) circuit = new circuit(src) default_apply_parts() + if(anchored) + connect_to_network() update_icon() + var/image/I = image(icon, icon_state = "[icon_state]_under") + I.appearance_flags |= RESET_TRANSFORM + underlays += I -/obj/machinery/pointdefense/get_description_interaction() +/obj/machinery/power/pointdefense/examine(mob/user) + . = ..() + if(powernet) + . += "It is connected to a power cable below." + +/obj/machinery/power/pointdefense/get_description_interaction() . = ..() if(!id_tag) . += "[desc_panel_image("multitool")]to set ident tag and connect to a mainframe." -/obj/machinery/pointdefense/update_icon() +/obj/machinery/power/pointdefense/update_icon() if(!active || !id_tag || inoperable()) icon_state = "[initial(icon_state)]_off" else icon_state = initial(icon_state) -/obj/machinery/pointdefense/power_change() +/obj/machinery/power/pointdefense/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time) + if((. = ..())) + src.transform = null // Reset rotation if we're anchored/unanchored + +////////// This machine is willing to take power from cables OR APCs. Handle NOPOWER stat specially here! //////// + +/obj/machinery/power/pointdefense/connect_to_network() + if((. = ..())) + stat &= ~NOPOWER // We now ignore APC power + update_icon() + +/obj/machinery/power/pointdefense/disconnect_from_network() + if((. = ..())) + power_change() // We're back on APC power. + +/obj/machinery/power/pointdefense/power_change() + if(powernet) + return // We don't care, we are cable powered anyway var/old_stat = stat ..() if(old_stat != stat) update_icon() +// Decide where to get the power to fire from +/obj/machinery/power/pointdefense/use_power_oneoff(var/amount, var/chan = -1) + if(powernet) + return draw_power(amount) + else if(powered(chan)) + use_power(amount, chan) + return amount + return 0 + // Find controller with the same tag on connected z levels (if any) -/obj/machinery/pointdefense/proc/get_controller() +/obj/machinery/power/pointdefense/proc/get_controller() if(!id_tag) return null var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) @@ -172,7 +208,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels)) return PDC -/obj/machinery/pointdefense/attackby(var/obj/item/W, var/mob/user) +/obj/machinery/power/pointdefense/attackby(var/obj/item/W, var/mob/user) if(W?.is_multitool()) var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state)) @@ -185,16 +221,18 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) return if(default_part_replacement(user, W)) return + if(default_unfasten_wrench(user, W, 40)) + return return ..() //Guns cannot shoot through hull or generally dense turfs. -/obj/machinery/pointdefense/proc/space_los(meteor) +/obj/machinery/power/pointdefense/proc/space_los(meteor) for(var/turf/T in getline(src,meteor)) if(T.density) return FALSE return TRUE -/obj/machinery/pointdefense/proc/Shoot(var/weakref/target) +/obj/machinery/power/pointdefense/proc/Shoot(var/weakref/target) var/obj/effect/meteor/M = target.resolve() if(!istype(M)) engaging = null @@ -208,7 +246,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) set_dir(ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH) -/obj/machinery/pointdefense/proc/finish_shot(var/weakref/target) +/obj/machinery/power/pointdefense/proc/finish_shot(var/weakref/target) var/obj/machinery/pointdefense_control/PC = get_controller() engaging = null @@ -224,20 +262,22 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) use_power_oneoff(idle_power_usage * 10) beam.launch_projectile(target = M.loc, user = src) -/obj/machinery/pointdefense/process() +/obj/machinery/power/pointdefense/process() ..() - if(stat & (NOPOWER|BROKEN)) + if(!anchored || stat & (NOPOWER|BROKEN)) return if(!active) return + /* var/desiredir = ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH if(dir != desiredir) set_dir(desiredir) + */ if(LAZYLEN(GLOB.meteor_list) > 0) find_and_shoot() -/obj/machinery/pointdefense/proc/find_and_shoot() +/obj/machinery/power/pointdefense/proc/find_and_shoot() // There ARE meteors to shoot if(LAZYLEN(GLOB.meteor_list) == 0) return @@ -273,7 +313,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) Shoot(target) return -/obj/machinery/pointdefense/proc/targeting_check(var/obj/effect/meteor/M) +/obj/machinery/power/pointdefense/proc/targeting_check(var/obj/effect/meteor/M) // Target in range var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) if(!(M.z in connected_z_levels)) @@ -286,7 +326,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) return TRUE -/obj/machinery/pointdefense/RefreshParts() +/obj/machinery/power/pointdefense/RefreshParts() . = ..() // Calculates an average rating of components that affect shooting rate var/shootrate_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor) @@ -302,7 +342,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) var/rotation_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/manipulator) rotation_speed = 0.5 SECONDS / (rotation_divisor ? rotation_divisor : 1) -/obj/machinery/pointdefense/proc/Activate() +/obj/machinery/power/pointdefense/proc/Activate() if(active) return FALSE @@ -312,7 +352,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) update_icon() return TRUE -/obj/machinery/pointdefense/proc/Deactivate() +/obj/machinery/power/pointdefense/proc/Deactivate() if(!active) return FALSE playsound(src, 'sound/machines/apc_nopower.ogg', 50, 0) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm index dd37bc2519e..7f423165a75 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm @@ -6,7 +6,7 @@ name = T_BOARD("point defense battery") board_type = new /datum/frame/frame_types/machine desc = "Control systems for a Kuiper pattern point defense battery. Aim away from vessel." - build_path = /obj/machinery/pointdefense + build_path = /obj/machinery/power/pointdefense origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list( /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1, diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index 81eccda8c1f..b6a955a65c9 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -130,7 +130,7 @@ /area/aro2/room1) "aI" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -235,7 +235,7 @@ /area/aro2/room1) "bd" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -703,7 +703,7 @@ /area/aro2/boatdeck) "el" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan, @@ -3040,7 +3040,7 @@ /area/aro2/starboardbay) "Ed" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3392,7 +3392,7 @@ /area/shuttle/aroboat2) "HF" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3546,7 +3546,7 @@ /area/aro2/portbay) "Jg" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3955,7 +3955,7 @@ /area/aro2/boatdeck) "MR" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -4072,7 +4072,7 @@ /area/aro2/cockpit) "OK" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan, @@ -4186,7 +4186,7 @@ /area/aro2/portbay) "PF" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -4795,7 +4795,7 @@ /area/aro2/boatdeck) "Wg" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ diff --git a/maps/offmap_vr/om_ships/bearcat.dmm b/maps/offmap_vr/om_ships/bearcat.dmm index 9aa7bdee334..744da6a92bf 100644 --- a/maps/offmap_vr/om_ships/bearcat.dmm +++ b/maps/offmap_vr/om_ships/bearcat.dmm @@ -3572,7 +3572,7 @@ /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "sg" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "bearcat_pd" }, /turf/simulated/floor/airless, @@ -3632,7 +3632,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "Di" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "bearcat_pd" }, /turf/simulated/floor/airless, diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm index e22624e8344..63d53696698 100644 --- a/maps/offmap_vr/om_ships/cruiser.dmm +++ b/maps/offmap_vr/om_ships/cruiser.dmm @@ -9355,7 +9355,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "uh" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "warship_pd" }, /turf/simulated/floor/reinforced/airless{ diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index b64bf5745d4..4444727be29 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -48,7 +48,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /turf/simulated/floor/airless, @@ -328,7 +328,7 @@ /turf/simulated/floor/airless, /area/itglight/captain) "bq" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -2093,7 +2093,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "mo" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -6009,7 +6009,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/shuttlebay) "Kv" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -7824,7 +7824,7 @@ /turf/space, /area/itglight/starboardengi) "We" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -8115,7 +8115,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "XO" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ diff --git a/maps/offmap_vr/om_ships/mercship.dmm b/maps/offmap_vr/om_ships/mercship.dmm index 320159cc1a7..81864bde356 100644 --- a/maps/offmap_vr/om_ships/mercship.dmm +++ b/maps/offmap_vr/om_ships/mercship.dmm @@ -2268,7 +2268,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "dY" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, @@ -2902,7 +2902,7 @@ /turf/simulated/floor/plating, /area/ship/mercenary/engine) "fj" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, @@ -3530,28 +3530,28 @@ /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "gk" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/bridge) "gl" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/engineeringcntrl) "gm" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/armoury) "gn" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, diff --git a/maps/offmap_vr/om_ships/salamander.dmm b/maps/offmap_vr/om_ships/salamander.dmm index 6fb59647e80..933058d6c67 100644 --- a/maps/offmap_vr/om_ships/salamander.dmm +++ b/maps/offmap_vr/om_ships/salamander.dmm @@ -36,7 +36,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "bk" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, @@ -1256,7 +1256,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_engineering) "tA" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, diff --git a/maps/offmap_vr/om_ships/salamander_wreck.dmm b/maps/offmap_vr/om_ships/salamander_wreck.dmm index a1960322ac1..d1b9c38c848 100644 --- a/maps/offmap_vr/om_ships/salamander_wreck.dmm +++ b/maps/offmap_vr/om_ships/salamander_wreck.dmm @@ -35,7 +35,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_wreck) "bk" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "salamander_wreck_pd" }, /turf/simulated/floor/airless, @@ -1275,7 +1275,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "tA" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "salamander_wreck_pd" }, /turf/simulated/floor/airless, diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index e424a56984b..132d4b6c49c 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -6,7 +6,7 @@ }, /area/shuttle/tabiranth) "ab" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "tabiranth_pd" }, /turf/simulated/floor/reinforced/airless{ diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 296eb83e53a..461e64e0332 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -18,7 +18,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /turf/simulated/floor/hull/airless, @@ -2750,7 +2750,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/talon/deckone/secure_storage) "qo" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -3079,7 +3079,7 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/starboard_solar) "uo" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -3630,7 +3630,7 @@ /turf/space, /area/space) "AN" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -5492,7 +5492,7 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/deckone/brig) "UU" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ diff --git a/maps/offmap_vr/talon/talon2.dmm b/maps/offmap_vr/talon/talon2.dmm index 70abdee5a5d..207a914142b 100644 --- a/maps/offmap_vr/talon/talon2.dmm +++ b/maps/offmap_vr/talon/talon2.dmm @@ -2454,7 +2454,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -3085,7 +3085,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) "CB" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -4025,7 +4025,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) "RA" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -4067,7 +4067,7 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/central_hallway) "Sb" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index d00e0cb85ca..85fa6982413 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -4,7 +4,7 @@ /turf/space, /area/space) "ab" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -33,7 +33,7 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/mech_bay) "ag" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -132,7 +132,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/ert_ship_boat) "aC" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -191,7 +191,7 @@ /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "aV" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -660,7 +660,7 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -1282,7 +1282,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /obj/machinery/light/no_nightshift{ @@ -1324,7 +1324,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /obj/machinery/light/no_nightshift{ @@ -3154,7 +3154,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "sB" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -6597,7 +6597,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/ert_ship_boat) "Nk" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /obj/machinery/light/no_nightshift{ @@ -6811,7 +6811,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "Om" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -8078,7 +8078,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "WF" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, @@ -8422,7 +8422,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "ZL" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" }, /turf/simulated/floor/reinforced/airless, diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index 70a2b26abb3..362023e72c4 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -563,7 +563,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "bG" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -635,7 +635,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bT" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -826,7 +826,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "cI" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -1766,7 +1766,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "hq" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -2296,7 +2296,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "jh" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -3229,7 +3229,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "nJ" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -3590,7 +3590,7 @@ /turf/space, /area/space) "pi" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -3868,7 +3868,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "qQ" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -3932,7 +3932,7 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/mech_bay) "rp" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -4031,7 +4031,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "rR" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -4304,7 +4304,7 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "ts" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, @@ -7166,7 +7166,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "FZ" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ id_tag = "mercenary_pd" }, /turf/simulated/floor/reinforced/airless, diff --git a/maps/submaps/pois_vr/debris_field/debris8.dmm b/maps/submaps/pois_vr/debris_field/debris8.dmm index f574d2e8b69..7e21a82345a 100644 --- a/maps/submaps/pois_vr/debris_field/debris8.dmm +++ b/maps/submaps/pois_vr/debris_field/debris8.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/hull/airless, /area/tether_away/debrisfield/shuttle_buffer) "d" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense{ dir = 4 }, /turf/simulated/floor/hull/airless,