diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index d07372dd4f..69669bb24b 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -148,7 +148,10 @@ max_range = 8 /datum/ammo/rocket/ap/tank_towlauncher/aa + name = "anti-air missile" + damage = 200 max_range = 16 + shell_speed = AMMO_SPEED_TIER_5 /datum/ammo/rocket/ltb name = "cannon round" diff --git a/code/modules/vehicles/apc/apc_aa.dm b/code/modules/vehicles/apc/apc_aa.dm index 3a5cda2971..818b7bd289 100644 --- a/code/modules/vehicles/apc/apc_aa.dm +++ b/code/modules/vehicles/apc/apc_aa.dm @@ -49,7 +49,6 @@ "4" = list(-5, 10), "8" = list(37, 24) ) - return ..() /* ** PRESETS SPAWNERS diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm index e0f72193a4..8a7a884ccd 100644 --- a/code/modules/vehicles/interior/interior_landmarks.dm +++ b/code/modules/vehicles/interior/interior_landmarks.dm @@ -339,3 +339,25 @@ V.icon = icon qdel(src) + +//AA APC fancy viewport spawner +/obj/effect/landmark/interior/spawn/interior_viewport/terminal + name = "ADS-C viewport console spawner" + icon = 'icons/obj/vehicles/interiors/general.dmi' + icon_state = "viewport_terminal" + layer = INTERIOR_DOOR_LAYER + color = "#009cb8" + +/obj/effect/landmark/interior/spawn/interior_viewport/terminal/on_load(datum/interior/I) + var/obj/structure/interior_viewport/terminal/V = new(loc) + + V.dir = dir + V.vehicle = I.exterior + V.pixel_x = pixel_x + V.pixel_y = pixel_y + V.layer = layer + V.alpha = alpha + V.layer = layer + V.update_icon() + + qdel(src) diff --git a/icons/obj/vehicles/movieapc.dmi b/icons/obj/vehicles/movieapc.dmi index 89d10bfe96..0df5d292bf 100644 Binary files a/icons/obj/vehicles/movieapc.dmi and b/icons/obj/vehicles/movieapc.dmi differ diff --git a/icons/turf/areas_interiors.dmi b/icons/turf/areas_interiors.dmi index 832988ff79..3dec287051 100644 Binary files a/icons/turf/areas_interiors.dmi and b/icons/turf/areas_interiors.dmi differ diff --git a/maps/interiors/apc_aa.dmm b/maps/interiors/apc_aa.dmm index b318832b2a..aeb3455523 100644 --- a/maps/interiors/apc_aa.dmm +++ b/maps/interiors/apc_aa.dmm @@ -22,7 +22,8 @@ "c" = ( /obj/structure/prop/vehicle/sensor_equipment{ name = "Sensor Apparatus Nexus"; - desc = "This machinery collects and analyzes data from the M579 ADS-C's sensors cluster and then feeds the results to the onboard gunner station. Better not touch it." + desc = "This machinery collects and analyzes data from the M579 ADS-C's sensors cluster and then feeds the results to the onboard gunner station. Better not touch it."; + density = 1 }, /obj/structure/vehicle_locker/movie{ pixel_y = 19; @@ -89,7 +90,7 @@ /obj/structure/surface/table/reinforced/toc/west{ pixel_y = -7 }, -/obj/structure/interior_viewport/terminal{ +/obj/effect/landmark/interior/spawn/interior_viewport/terminal{ pixel_y = 12 }, /turf/open/shuttle/vehicle/floor_1_4,