diff --git a/archive/maps/submaps/depreciated_vr/talon1.dmm b/archive/maps/submaps/depreciated_vr/talon1.dmm index 54ccfd97c2..65561a77ee 100644 --- a/archive/maps/submaps/depreciated_vr/talon1.dmm +++ b/archive/maps/submaps/depreciated_vr/talon1.dmm @@ -12,7 +12,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /turf/simulated/floor/hull/airless, @@ -2322,7 +2322,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/space) "qo" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -2551,7 +2551,7 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/space) "uo" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -3025,7 +3025,7 @@ /turf/space, /area/space) "AN" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -4654,7 +4654,7 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/space) "UU" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ diff --git a/archive/maps/submaps/depreciated_vr/talon2.dmm b/archive/maps/submaps/depreciated_vr/talon2.dmm index d0c496e627..b32eb4e09d 100644 --- a/archive/maps/submaps/depreciated_vr/talon2.dmm +++ b/archive/maps/submaps/depreciated_vr/talon2.dmm @@ -1986,7 +1986,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -2549,7 +2549,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/space) "CB" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -3389,7 +3389,7 @@ /turf/simulated/floor/hull/airless, /area/space) "RA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/techfloor{ @@ -3429,7 +3429,7 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/space) "Sb" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index edaf6e2625..0bffcb851e 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/power/pointdefense) +GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) /obj/machinery/pointdefense_control name = "fire assist mainframe" @@ -12,6 +12,9 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) description_info = "To connect the mainframe to turrets, use a multitool to set the ident tag to that of the turrets." icon = 'icons/obj/pointdefense.dmi' icon_state = "control" + power_channel = EQUIP + use_power = USE_POWER_ACTIVE + active_power_usage = 5 KILOWATTS density = TRUE anchored = TRUE circuit = /obj/item/circuitboard/pointdefense_control @@ -50,7 +53,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return TRUE if(action == "toggle_active") - var/obj/machinery/power/pointdefense/PD = locate(params["target"]) + var/obj/machinery/pointdefense/PD = locate(params["target"]) if(!istype(PD)) return FALSE @@ -73,7 +76,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) if(id_tag) var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) for(var/i = 1 to LAZYLEN(GLOB.pointdefense_turrets)) - var/obj/machinery/power/pointdefense/PD = GLOB.pointdefense_turrets[i] + var/obj/machinery/pointdefense/PD = GLOB.pointdefense_turrets[i] if(!(PD.id_tag == id_tag && (get_z(PD) in connected_z_levels))) continue var/list/turret = list() @@ -114,7 +117,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) // The acutal point defense battery // -/obj/machinery/power/pointdefense +/obj/machinery/pointdefense name = "\improper point defense battery" icon = 'icons/obj/pointdefense.dmi' icon_state = "pointdefense2" @@ -123,80 +126,40 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) density = TRUE anchored = TRUE circuit = /obj/item/circuitboard/pointdefense - idle_power_usage = 0.1 KILOWATTS - active_power_usage = 1 KILOWATTS appearance_flags = PIXEL_SCALE var/active = TRUE var/charge_cooldown = 1 SECOND //time between it can fire at different targets var/last_shot = 0 var/kill_range = 18 - var/rotation_speed = 0.25 SECONDS //How quickly we turn to face threats + var/rotation_speed = 4.5 SECONDS //How quickly we turn to face threats var/datum/weakref/engaging = null // The meteor we're shooting at var/id_tag = null + var/fire_sounds = list('sound/weapons/frigate_turret/frigate_turret_fire1.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire2.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire3.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire4.ogg') // CHOMPEdit: Pew -/obj/machinery/power/pointdefense/Initialize(mapload) +/obj/machinery/pointdefense/Initialize(mapload) . = ..() 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/power/pointdefense/examine(mob/user) - . = ..() - if(powernet) - . += "It is connected to a power cable below." - -/obj/machinery/power/pointdefense/get_description_interaction() +/obj/machinery/pointdefense/get_description_interaction() . = ..() if(!id_tag) . += "[desc_panel_image("multitool")]to set ident tag and connect to a mainframe." -/obj/machinery/power/pointdefense/update_icon() +/obj/machinery/pointdefense/update_icon() if(!active || !id_tag || inoperable()) icon_state = "[initial(icon_state)]_off" else icon_state = initial(icon_state) -/obj/machinery/power/pointdefense/default_unfasten_wrench(var/mob/user, var/obj/item/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 +/obj/machinery/pointdefense/power_change() 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 = CURRENT_CHANNEL) - if(powernet) - return draw_power(amount) - // We are not connected to a powernet, so we want APC power. Reproduce that code here since this is weird. - if(chan == CURRENT_CHANNEL) - chan = power_channel - var/area/A = get_area(src) // make sure it's in an area - if(!A || !A.powered(chan)) // and that the area is powered - return 0 // if not, then not powered - return A.use_power_oneoff(amount, chan) - // Find controller with the same tag on connected z levels (if any) -/obj/machinery/power/pointdefense/proc/get_controller() +/obj/machinery/pointdefense/proc/get_controller() if(!id_tag) return null var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) @@ -204,11 +167,11 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels)) return PDC -/obj/machinery/power/pointdefense/attackby(var/obj/item/W, var/mob/user) +/obj/machinery/pointdefense/attackby(var/obj/item/W, var/mob/user) if(W?.has_tool_quality(TOOL_MULTITOOL)) var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) - if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state)) + if(new_ident && new_ident != id_tag && user.Adjacent(src)) to_chat(user, span_notice("You register [src] with the [new_ident] network.")) id_tag = new_ident return @@ -218,18 +181,16 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/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/power/pointdefense/proc/space_los(meteor) +/obj/machinery/pointdefense/proc/space_los(meteor) for(var/turf/T in getline(src,meteor)) if(T.density) return FALSE return TRUE -/obj/machinery/power/pointdefense/proc/Shoot(var/datum/weakref/target) +/obj/machinery/pointdefense/proc/Shoot(var/datum/weakref/target) var/obj/effect/meteor/M = target.resolve() if(!istype(M)) engaging = null @@ -243,7 +204,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) set_dir(ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH) -/obj/machinery/power/pointdefense/proc/finish_shot(var/datum/weakref/target) +/obj/machinery/pointdefense/proc/finish_shot(var/datum/weakref/target) var/obj/machinery/pointdefense_control/PC = get_controller() engaging = null @@ -253,34 +214,28 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) var/obj/effect/meteor/M = target.resolve() if(!istype(M)) return - if(use_power_oneoff(active_power_usage) < active_power_usage) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, src) - s.start() - visible_message("[src] sputters as browns out while attempting to fire.") - flick(src, "[initial(icon_state)]_off") - return //We throw a laser but it doesnt have to hit for meteor to explode - var/obj/item/projectile/beam/pointdefense/beam = new(get_turf(src)) - playsound(src, 'sound/weapons/mandalorian.ogg', 75, 1) - beam.launch_projectile(target = M.loc, user = src) + var/obj/item/projectile/beam/coildefense/coil = new(get_turf(src)) + playsound(src, fire_sounds, 75, 1, 40, pressure_affected = FALSE, ignore_walls = TRUE) + use_power_oneoff(idle_power_usage * 10) + coil.launch_projectile(target = M.loc, user = src) + spawn(10) + playsound(src, fire_sounds, 75, 1, 40, pressure_affected = FALSE, ignore_walls = TRUE) -/obj/machinery/power/pointdefense/process() +/obj/machinery/pointdefense/process() ..() - if(!anchored || stat & (NOPOWER|BROKEN)) + if(stat & (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/power/pointdefense/proc/find_and_shoot() +/obj/machinery/pointdefense/proc/find_and_shoot() // There ARE meteors to shoot if(LAZYLEN(GLOB.meteor_list) == 0) return @@ -289,7 +244,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return var/obj/machinery/pointdefense_control/PC = get_controller() - if(!istype(PC)) + if(!istype(PC) || !PC.powered(EQUIP)) return // Compile list of known targets @@ -316,7 +271,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) Shoot(target) return -/obj/machinery/power/pointdefense/proc/targeting_check(var/obj/effect/meteor/M) +/obj/machinery/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)) @@ -329,7 +284,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return TRUE -/obj/machinery/power/pointdefense/RefreshParts() +/obj/machinery/pointdefense/RefreshParts() . = ..() // Calculates an average rating of components that affect shooting rate var/shootrate_divisor = total_component_rating_of_type(/obj/item/stock_parts/capacitor) @@ -343,23 +298,21 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) kill_range = 10 + 4 * killrange_multiplier var/rotation_divisor = total_component_rating_of_type(/obj/item/stock_parts/manipulator) - rotation_speed = 0.5 SECONDS / (rotation_divisor ? rotation_divisor : 1) + rotation_speed = 4.5 SECONDS / (rotation_divisor ? rotation_divisor : 1) -/obj/machinery/power/pointdefense/proc/Activate() +/obj/machinery/pointdefense/proc/Activate() if(active) return FALSE playsound(src, 'sound/weapons/flash.ogg', 100, 0) - update_use_power(USE_POWER_IDLE) active = TRUE update_icon() return TRUE -/obj/machinery/power/pointdefense/proc/Deactivate() +/obj/machinery/pointdefense/proc/Deactivate() if(!active) return FALSE playsound(src, 'sound/machines/apc_nopower.ogg', 50, 0) - update_use_power(USE_POWER_OFF) active = FALSE update_icon() return TRUE diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index 7697ca72e7..e6be15a515 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -102,3 +102,9 @@ light_range = 3 light_power = 1 light_color = "#ffffff" + +/obj/effect/projectile/impact/coildefense + icon_state = "impact_coildef" + light_range = 2 + light_power = 3 + light_color = "#FFFFFF" diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index 16807572d5..3916b3e06b 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -114,3 +114,9 @@ light_range = 3 light_power = 1 light_color = "#ffffff" + +/obj/effect/projectile/muzzle/coildefense + icon_state = "muzzle_coildef" + light_range = 3 + light_power = 1 + light_color = "#FFFFFF" diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index f644106c3c..fcb272b82e 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -141,3 +141,9 @@ light_range = 3 light_power = 1 light_color = "#ffffff" + +/obj/effect/projectile/tracer/coildefense + icon_state = "tracer_coildef" + light_range = 1 + light_power = 2 + light_color = "#FFFFFF" diff --git a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm index a46ad717f6..38a1b3a224 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/power/pointdefense + build_path = /obj/machinery/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/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 307c3b9f35..f39acc2e7b 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -483,6 +483,20 @@ tracer_type = /obj/effect/projectile/tracer/pointdefense impact_type = /obj/effect/projectile/impact/pointdefense +/obj/item/projectile/beam/coildefense + name = "defense coil salvo" + icon_state = "coil" + damage = 15 + damage_type = ELECTROCUTE //You should be safe inside a voidsuit + sharp = FALSE //"Wide" spectrum beam + light_color = "#FFFFFF" + + excavation_amount = 200 // Good at shooting rocks + + muzzle_type = /obj/effect/projectile/muzzle/coildefense + tracer_type = /obj/effect/projectile/tracer/coildefense + impact_type = /obj/effect/projectile/impact/coildefense + // // Energy Net // diff --git a/icons/obj/projectiles_impact.dmi b/icons/obj/projectiles_impact.dmi index faa70e7406..d4f4d6fb80 100644 Binary files a/icons/obj/projectiles_impact.dmi and b/icons/obj/projectiles_impact.dmi differ diff --git a/icons/obj/projectiles_muzzle.dmi b/icons/obj/projectiles_muzzle.dmi index 0a1591c484..5c3c26533e 100644 Binary files a/icons/obj/projectiles_muzzle.dmi and b/icons/obj/projectiles_muzzle.dmi differ diff --git a/icons/obj/projectiles_tracer.dmi b/icons/obj/projectiles_tracer.dmi index b46e19c664..dc62d13917 100644 Binary files a/icons/obj/projectiles_tracer.dmi and b/icons/obj/projectiles_tracer.dmi differ diff --git a/maps/expedition_vr/space/fueldepot.dmm b/maps/expedition_vr/space/fueldepot.dmm index f01fa28df0..6932253ace 100644 --- a/maps/expedition_vr/space/fueldepot.dmm +++ b/maps/expedition_vr/space/fueldepot.dmm @@ -275,7 +275,7 @@ /turf/space, /area/space) "aM" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "depot_pd" }, /obj/structure/cable{ @@ -1264,7 +1264,7 @@ /turf/simulated/shuttle/plating/airless, /area/tether_away/fueldepot) "ow" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "depot_pd" }, /obj/structure/cable{ @@ -1584,7 +1584,7 @@ /turf/simulated/shuttle/plating/airless, /area/tether_away/fueldepot) "VA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "depot_pd" }, /obj/structure/cable{ diff --git a/maps/groundbase/westwilds/westwilds template.dmm b/maps/groundbase/westwilds/westwilds template.dmm index 2813d8700b..0173f1fc33 100644 --- a/maps/groundbase/westwilds/westwilds template.dmm +++ b/maps/groundbase/westwilds/westwilds template.dmm @@ -474,7 +474,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) "eo" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -2107,7 +2107,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "sw" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -2254,7 +2254,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) "tT" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index 187eb7aa93..7e8b5507a4 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -1736,7 +1736,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) "oz" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -2796,7 +2796,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_q1) "xo" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -4171,7 +4171,7 @@ /turf/simulated/floor, /area/groundbase/science/outpost/substation) "Ix" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 62094d097f..1d4e051684 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -200,7 +200,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) "br" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -5895,7 +5895,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) "VR" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, @@ -5912,7 +5912,7 @@ /turf/simulated/floor, /area/groundbase/engineering/solarshed) "VX" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "axolotl_pd" }, /turf/simulated/floor/plating, diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index 7a98e35b55..34df73d6ef 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -109,7 +109,7 @@ /area/aro2/room1) "aI" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -210,7 +210,7 @@ /area/aro2/room1) "bd" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -649,7 +649,7 @@ /area/aro2/boatdeck) "el" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan, @@ -2770,7 +2770,7 @@ /area/aro2/starboardbay) "Ed" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3088,7 +3088,7 @@ /area/shuttle/aroboat2) "HF" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3232,7 +3232,7 @@ /area/aro2/portbay) "Jg" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3603,7 +3603,7 @@ /area/aro2/boatdeck) "MR" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -3712,7 +3712,7 @@ /area/aro2/cockpit) "OK" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan, @@ -3817,7 +3817,7 @@ /area/aro2/portbay) "PF" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ @@ -4364,7 +4364,7 @@ /area/aro2/boatdeck) "Wg" = ( /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aroship" }, /obj/structure/cable/cyan{ diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 25e51773bf..c43dffdaf9 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -331,7 +331,7 @@ /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "bU" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -537,7 +537,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 10 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -565,7 +565,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/kitchen) "do" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -1058,7 +1058,7 @@ /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) "gD" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -1880,7 +1880,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "ln" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -2629,7 +2629,7 @@ /turf/space, /area/space) "qg" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -3696,7 +3696,7 @@ /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "xm" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -4936,7 +4936,7 @@ /turf/simulated/wall/rpshull, /area/aro3/bar) "EW" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan, @@ -5136,7 +5136,7 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Gz" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -5579,7 +5579,7 @@ /turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "KI" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan, @@ -5778,7 +5778,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "LR" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ @@ -6787,7 +6787,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 6 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "aro3_pd" }, /obj/structure/cable/cyan{ diff --git a/maps/offmap_vr/om_ships/bearcat.dmm b/maps/offmap_vr/om_ships/bearcat.dmm index 27bc745aca..ab413dcc9b 100644 --- a/maps/offmap_vr/om_ships/bearcat.dmm +++ b/maps/offmap_vr/om_ships/bearcat.dmm @@ -3288,7 +3288,7 @@ /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "sg" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "bearcat_pd" }, /turf/simulated/floor/airless, @@ -3348,7 +3348,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "Di" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "bearcat_pd" }, /turf/simulated/floor/airless, diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 973a9e9fc9..4426774cb1 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -49,7 +49,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /turf/simulated/floor/airless, @@ -318,7 +318,7 @@ /turf/simulated/floor/airless, /area/itglight/captain) "bq" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -1908,7 +1908,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "mo" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -5463,7 +5463,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/shuttlebay) "Kv" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -7144,7 +7144,7 @@ /turf/space, /area/itglight/starboardengi) "We" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ @@ -7430,7 +7430,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "XO" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "dauntless_pd" }, /obj/structure/cable/pink{ diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm index e5d8d00183..8163f1d578 100644 --- a/maps/offmap_vr/om_ships/lunaship.dmm +++ b/maps/offmap_vr/om_ships/lunaship.dmm @@ -1053,7 +1053,7 @@ /area/lunaship/office) "px" = ( /obj/structure/lattice, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "luna_ship_pd" }, /obj/structure/cable/cyan{ @@ -1935,7 +1935,7 @@ /area/lunaship/cockpit) "Ad" = ( /obj/structure/lattice, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "luna_ship_pd" }, /obj/structure/cable/cyan, diff --git a/maps/offmap_vr/om_ships/mercship.dmm b/maps/offmap_vr/om_ships/mercship.dmm index af43ec6963..0515c23667 100644 --- a/maps/offmap_vr/om_ships/mercship.dmm +++ b/maps/offmap_vr/om_ships/mercship.dmm @@ -2215,7 +2215,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "dY" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, @@ -2837,7 +2837,7 @@ /turf/simulated/floor/plating, /area/ship/mercenary/engine) "fj" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, @@ -3450,28 +3450,28 @@ /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "gk" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/bridge) "gl" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/engineeringcntrl) "gm" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "merc_pd" }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/plating/external, /area/ship/mercenary/armoury) "gn" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/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 2f28132b3f..14361489b4 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/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, @@ -1226,7 +1226,7 @@ /turf/template_noop, /area/shuttle/salamander) "tA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, @@ -1454,7 +1454,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "FV" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/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 e96e940f90..6742b3bf8d 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/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_wreck_pd" }, /turf/simulated/floor/airless, @@ -1230,7 +1230,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "tA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_wreck_pd" }, /turf/simulated/floor/airless, @@ -1700,7 +1700,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "Pr" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_wreck_pd" }, /turf/simulated/floor/airless, diff --git a/maps/offmap_vr/om_ships/sdf_corvette.dmm b/maps/offmap_vr/om_ships/sdf_corvette.dmm index 200efb59dc..6c331c3de4 100644 --- a/maps/offmap_vr/om_ships/sdf_corvette.dmm +++ b/maps/offmap_vr/om_ships/sdf_corvette.dmm @@ -477,7 +477,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_pd"; name = "\improper twin-linked laser turret" }, @@ -679,7 +679,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/sdf_corvette) "QG" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_pd"; name = "\improper twin-linked laser turret" }, @@ -751,7 +751,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_pd"; name = "\improper twin-linked laser turret" }, diff --git a/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm b/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm index 6d6d688d53..f2b3bc0a67 100644 --- a/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm +++ b/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm @@ -600,7 +600,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_wreck_pd"; name = "\improper twin-linked laser turret" }, @@ -872,7 +872,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_wreck_pd"; name = "\improper twin-linked laser turret" }, @@ -963,7 +963,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sdfc_wreck_pd"; name = "\improper twin-linked laser turret" }, diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index fcbd887973..f9d2a97208 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -2198,7 +2198,7 @@ /turf/simulated/floor/plating, /area/talon_v2/maintenance/fore_port) "gK" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green, @@ -2430,7 +2430,7 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "hz" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/industrial/warning/dust{ @@ -2855,7 +2855,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/fore_port) "iM" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/industrial/warning/dust{ @@ -3512,7 +3512,7 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "ly" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green, @@ -4494,7 +4494,7 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/cap_room) "pc" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -5675,7 +5675,7 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "tc" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/industrial/warning/dust{ @@ -6170,7 +6170,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) "uO" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -6448,7 +6448,7 @@ /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) "vL" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -6637,7 +6637,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) "ww" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -6701,7 +6701,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_starboard) "wG" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/effect/floor_decal/industrial/warning/dust{ @@ -6771,7 +6771,7 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "wT" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -10888,7 +10888,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /turf/simulated/floor/reinforced/airless, @@ -12371,7 +12371,7 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "PT" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -13212,7 +13212,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) "SS" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -13572,7 +13572,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "Ue" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -13989,7 +13989,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) "Vy" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -14228,7 +14228,7 @@ /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) "Wl" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ @@ -15341,7 +15341,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_port) "ZK" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "talon_pd" }, /obj/structure/cable/green{ diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index beb31c0677..e2a8ff3d24 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -764,7 +764,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardfore) "by" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -1736,7 +1736,7 @@ color = "#42038a"; icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -3068,7 +3068,7 @@ }, /area/stellardelight/deck1/aft) "fP" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -3176,7 +3176,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) "ga" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -3190,7 +3190,7 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "gc" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -3876,7 +3876,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/resleeving) "hw" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -4194,7 +4194,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "ib" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -6385,7 +6385,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardaft) "mC" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -7776,7 +7776,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "pz" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -8599,7 +8599,7 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/miningequipment) "ro" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -9197,7 +9197,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -10120,7 +10120,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uH" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -12651,7 +12651,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "Ah" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -13620,7 +13620,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "Ci" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -15235,7 +15235,7 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "FP" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -15759,7 +15759,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/mining) "Hc" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -16696,7 +16696,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "IV" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -17061,7 +17061,7 @@ color = "#42038a"; icon_state = "0-8" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -18429,7 +18429,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/toilet) "MP" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -18811,7 +18811,7 @@ /turf/simulated/floor/tiled/monotile, /area/janitor) "ND" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -21242,7 +21242,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardaft) "SN" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -22956,7 +22956,7 @@ color = "#42038a"; icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -23638,7 +23638,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) "Xw" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 18af47edb9..d6731f494e 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -745,7 +745,7 @@ /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck2/aftstarboard) "bw" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -803,7 +803,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck2/starboardescape) "bD" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -4238,7 +4238,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "iU" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -7580,7 +7580,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -9419,7 +9419,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "ur" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -10162,7 +10162,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/structure/cable/orange{ @@ -11945,7 +11945,7 @@ /turf/simulated/floor, /area/stellardelight/deck2/combustionworkshop) "Ar" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -12074,7 +12074,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) "AF" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -13033,7 +13033,7 @@ /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "CQ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -13107,7 +13107,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "CZ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -16154,7 +16154,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -18168,7 +18168,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -19559,7 +19559,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/recreation_area) "QW" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -20057,7 +20057,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) "Sj" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -20065,7 +20065,7 @@ /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "Sk" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -20907,7 +20907,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/structure/cable/orange{ @@ -21329,7 +21329,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /turf/simulated/floor/airless, @@ -21840,7 +21840,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "Wn" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm index 43075b40e9..02ba0e5dfb 100644 --- a/maps/stellar_delight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -1902,7 +1902,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "gB" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -2537,7 +2537,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "iY" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -4537,7 +4537,7 @@ }, /area/tcommsat/chamber) "qb" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -6112,7 +6112,7 @@ /turf/simulated/floor/bluegrid, /area/ai_cyborg_station) "we" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -8808,7 +8808,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "FH" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -11286,7 +11286,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportrooma) "Op" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -12760,7 +12760,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "TE" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -13283,7 +13283,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarroomb) "Vz" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, @@ -13355,7 +13355,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "VM" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "sd_pd" }, /obj/effect/floor_decal/industrial/warning/full, diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 39ee91817a..f09ab38c17 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/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -42,7 +42,7 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "aj" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -215,7 +215,7 @@ /turf/simulated/wall/shull, /area/ship/ert/med_surg) "aV" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -413,7 +413,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways_aft) "ch" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -467,7 +467,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/brig) "cJ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -839,7 +839,7 @@ /turf/simulated/wall/rshull, /area/ship/ert/gunnery) "fn" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -1404,7 +1404,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways_aft) "hA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/machinery/light/no_nightshift{ @@ -3111,7 +3111,7 @@ /turf/simulated/wall/shull, /area/ship/ert/atmos) "pY" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -3336,7 +3336,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "ra" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -4346,7 +4346,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xx" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -6268,7 +6268,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/brig) "Ia" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow, @@ -6339,7 +6339,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) "Iu" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ @@ -7910,7 +7910,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "PO" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "vonbraun_pd" }, /obj/structure/cable/yellow{ diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index 7a8048d4fa..7f6329f8e9 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -575,7 +575,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "bG" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -840,7 +840,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "cI" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -1516,7 +1516,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "fM" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange, @@ -3294,7 +3294,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "nJ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -3887,7 +3887,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "qI" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -3943,7 +3943,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "qQ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -4010,7 +4010,7 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/mech_bay) "rp" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -4483,7 +4483,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "tR" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -5930,7 +5930,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "zw" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -7276,7 +7276,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "FZ" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange, @@ -8160,7 +8160,7 @@ /turf/simulated/wall/rshull, /area/ship/manta/teleporter) "KK" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -9805,7 +9805,7 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "Sr" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ @@ -11075,7 +11075,7 @@ /turf/simulated/floor/plating, /area/ship/manta/magazine) "Yc" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "mercenary_pd" }, /obj/structure/cable/orange{ diff --git a/maps/submaps/admin_use_vr/salamander_trader.dmm b/maps/submaps/admin_use_vr/salamander_trader.dmm index 77184af998..0c50705bdc 100644 --- a/maps/submaps/admin_use_vr/salamander_trader.dmm +++ b/maps/submaps/admin_use_vr/salamander_trader.dmm @@ -36,13 +36,13 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_trader) "aO" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, /area/shuttle/salamander_trader_q2) "bk" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, @@ -1248,7 +1248,7 @@ /turf/template_noop, /area/shuttle/salamander_trader) "tA" = ( -/obj/machinery/power/pointdefense{ +/obj/machinery/pointdefense{ id_tag = "salamander_pd" }, /turf/simulated/floor/plating, diff --git a/maps/submaps/pois_vr/debris_field/debris8.dmm b/maps/submaps/pois_vr/debris_field/debris8.dmm index 7e21a82345..f574d2e8b6 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/power/pointdefense{ +/obj/machinery/pointdefense{ dir = 4 }, /turf/simulated/floor/hull/airless, diff --git a/sound/weapons/frigate_turret/frigate_turret_fire1.ogg b/sound/weapons/frigate_turret/frigate_turret_fire1.ogg new file mode 100644 index 0000000000..a6321ec4ae Binary files /dev/null and b/sound/weapons/frigate_turret/frigate_turret_fire1.ogg differ diff --git a/sound/weapons/frigate_turret/frigate_turret_fire2.ogg b/sound/weapons/frigate_turret/frigate_turret_fire2.ogg new file mode 100644 index 0000000000..1915c88a11 Binary files /dev/null and b/sound/weapons/frigate_turret/frigate_turret_fire2.ogg differ diff --git a/sound/weapons/frigate_turret/frigate_turret_fire3.ogg b/sound/weapons/frigate_turret/frigate_turret_fire3.ogg new file mode 100644 index 0000000000..ba6f1c9304 Binary files /dev/null and b/sound/weapons/frigate_turret/frigate_turret_fire3.ogg differ diff --git a/sound/weapons/frigate_turret/frigate_turret_fire4.ogg b/sound/weapons/frigate_turret/frigate_turret_fire4.ogg new file mode 100644 index 0000000000..61f7dfc5cb Binary files /dev/null and b/sound/weapons/frigate_turret/frigate_turret_fire4.ogg differ