diff --git a/code/modules/vehicles/apc/interior.dm b/code/modules/vehicles/apc/interior.dm index d3947db2b8..010ea9ac2c 100644 --- a/code/modules/vehicles/apc/interior.dm +++ b/code/modules/vehicles/apc/interior.dm @@ -28,6 +28,11 @@ /obj/structure/interior_exit/vehicle/apc/rear/right icon_state = "door_rear_right" +/obj/structure/interior_exit/vehicle/arc + name = "ARC side door" + icon = 'icons/obj/vehicles/interiors/arc.dmi' + icon_state = "exit_door" + /obj/structure/prop/vehicle name = "Generic vehicle prop" desc = "Adds more flavour to vehicle interior." @@ -40,6 +45,13 @@ breakable = FALSE indestructible = TRUE +/obj/structure/prop/vehicle/arc + name = "ARC chassis" + + icon = 'icons/obj/vehicles/interiors/arc_chassis.dmi' + icon_state = "arc_chassis" + + /obj/structure/prop/vehicle/firing_port_weapon name = "M56 FPW handle" desc = "A control handle for a modified M56B Smartgun installed on the sides of M577 Armored Personnel Carrier as a Firing Port Weapon. \ diff --git a/code/modules/vehicles/hardpoints/primary/arc_frontal.dm b/code/modules/vehicles/hardpoints/primary/arc_frontal.dm index d28f807b3c..9a5a8568f5 100644 --- a/code/modules/vehicles/hardpoints/primary/arc_frontal.dm +++ b/code/modules/vehicles/hardpoints/primary/arc_frontal.dm @@ -37,9 +37,3 @@ GUN_FIREMODE_AUTOMATIC, ) fire_delay = 0.05 SECONDS - -/obj/item/hardpoint/secondary/frontalcannon/set_bullet_traits() - ..() - LAZYADD(traits_to_give, list( - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) - )) diff --git a/icons/obj/vehicles/interiors/arc.dmi b/icons/obj/vehicles/interiors/arc.dmi new file mode 100644 index 0000000000..9f921a02f8 Binary files /dev/null and b/icons/obj/vehicles/interiors/arc.dmi differ diff --git a/icons/obj/vehicles/interiors/arc_chassis.dmi b/icons/obj/vehicles/interiors/arc_chassis.dmi new file mode 100644 index 0000000000..8be5d23047 Binary files /dev/null and b/icons/obj/vehicles/interiors/arc_chassis.dmi differ diff --git a/maps/interiors/arc.dmm b/maps/interiors/arc.dmm index 306f8c22ee..50c5f96b62 100644 --- a/maps/interiors/arc.dmm +++ b/maps/interiors/arc.dmm @@ -1,395 +1,110 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space/basic, -/area/space) -"b" = ( -/obj/structure/bed/chair/vehicle{ - pixel_y = 13; - pixel_x = 3 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" - }, -/area/vehicle/apc/arc) -"c" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_wheel_L" - }, -/turf/open/space/basic, -/area/space) -"d" = ( -/obj/structure/interior_wall/apc{ - icon_state = "front_wheel_L_1" +/turf/closed/void{ + opacity = 0 }, -/turf/open/space/basic, /area/space) -"h" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_1" - }, -/turf/open/space/basic, -/area/space) -"k" = ( -/obj/structure/interior_wall/apc{ - icon_state = "wall"; - opacity = 0; - pixel_y = -6 - }, -/obj/structure/interior_wall/apc{ - icon_state = "corner_smaller_R"; - opacity = 0; - pixel_y = 6; - pixel_x = 32; - layer = 2.03 - }, -/obj/structure/interior_wall/apc{ - icon_state = "wheel_back_top_2"; - pixel_x = -4; - pixel_y = 5; - layer = 2 - }, -/turf/open/space/basic, -/area/space) -"n" = ( -/obj/structure/interior_wall/apc{ - icon_state = "exit_door"; - alpha = 50; - pixel_y = 32; - layer = 5.3 +"q" = ( +/obj/structure/prop/vehicle/arc{ + layer = 2.01; + mouse_opacity = 0 }, -/obj/structure/interior_wall/apc{ - icon_state = "wall"; - opacity = 0; - alpha = 50; - pixel_y = 32; - layer = 5.2 +/turf/closed/void{ + opacity = 0 }, -/turf/open/space/basic, /area/space) -"o" = ( -/obj/structure/vehicle_locker/movie{ - pixel_y = 16; +"r" = ( +/obj/effect/landmark/interior/spawn/telephone{ + pixel_x = -13; + pixel_y = 15; layer = 2.9 }, -/obj/structure/gun_rack/apc/frontal{ - pixel_y = 6; - pixel_x = -8; - density = 0 - }, -/obj/structure/gun_rack/apc/frontal{ - pixel_y = 6; - pixel_x = 8; - density = 0 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" +/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{ + dir = 4 }, +/turf/open/floor, /area/vehicle/apc/arc) -"r" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_wheel_R"; - layer = 5.2 - }, -/turf/open/space/basic, -/area/space) -"t" = ( -/obj/structure/interior_wall/apc{ - icon_state = "front_wheel_R"; - layer = 6 - }, -/turf/open/space/basic, -/area/space) -"v" = ( +"G" = ( /obj/structure/bed/chair/vehicle{ - dir = 4; - pixel_y = 13 + pixel_x = -8; + dir = 1 }, /obj/structure/bed/chair/vehicle{ - dir = 4; - pixel_y = 1 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" - }, -/area/vehicle/apc/arc) -"w" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_6"; - pixel_y = 6 - }, -/obj/structure/interior_wall/apc{ - icon_state = "rear_5"; - layer = 2.01; - pixel_y = -26 - }, -/turf/open/space/basic, -/area/space) -"z" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_5"; - layer = 2.01; - pixel_y = -6 - }, -/turf/open/space/basic, -/area/space) -"A" = ( -/obj/structure/machinery/blackbox_recorder{ - layer = 5; - pixel_y = -9 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" - }, -/area/vehicle/apc/arc) -"B" = ( -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" + pixel_x = 8; + dir = 1 }, +/turf/open/floor, /area/vehicle/apc/arc) -"C" = ( -/obj/structure/interior_wall/apc{ - icon_state = "rear_2" - }, -/turf/open/space/basic, -/area/space) -"E" = ( -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 4; - pixel_x = 19; - pixel_y = -3; - layer = 5.1 - }, +"H" = ( /obj/structure/bed/chair/vehicle{ dir = 4; - pixel_x = 2 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" + layer = 3.1; + pixel_y = 5 }, +/turf/open/floor, /area/vehicle/apc/arc) -"F" = ( -/obj/structure/interior_wall/apc{ - icon_state = "front_1" +"I" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 }, -/obj/structure/interior_wall/apc{ - icon_state = "front_1"; - layer = 3.7 +/obj/effect/landmark/interior/spawn/interior_viewport{ + pixel_x = 8; + pixel_y = 4; + layer = 2.9 }, -/turf/open/space/basic, -/area/space) -"G" = ( +/turf/open/floor, +/area/vehicle/apc/arc) +"N" = ( /obj/effect/landmark/interior/spawn/entrance{ alpha = 50; - exit_type = /obj/structure/interior_exit/vehicle/apc; + exit_type = /obj/structure/interior_exit/vehicle/arc; name = "ARC exit door"; - tag = "right" - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" + tag = "right"; + pixel_y = -10 }, +/turf/open/floor, /area/vehicle/apc/arc) -"J" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{ - pixel_y = 16; - pixel_x = -8 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" - }, -/area/vehicle/apc/arc) -"K" = ( -/obj/structure/interior_wall/apc{ - icon_state = "wheel_front_top_2"; - pixel_x = -7; - pixel_y = 4; - layer = 2.01 - }, -/obj/structure/interior_wall/apc{ - icon_state = "wheel_front_top_2"; - pixel_x = 11; - pixel_y = 4; - layer = 2.01 - }, -/obj/structure/interior_wall/apc{ - icon_state = "wall"; - opacity = 0; - pixel_y = -15 - }, -/turf/open/space/basic, -/area/space) -"M" = ( -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = 13; - layer = 3.8 - }, -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = 24; - layer = 3.8 - }, -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = 2; - layer = 3.7 - }, -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = -4; - layer = 3.6 - }, -/turf/open/space/basic, -/area/space) -"S" = ( -/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor/movie{ - dir = 4; - buckling_y = 16; - pixel_y = 3; - pixel_x = -11 - }, -/obj/structure/machinery/computer/overwatch/almayer{ - dir = 4; - pixel_x = 8; - pixel_y = 2; - layer = 2.1 - }, -/obj/effect/landmark/interior/spawn/weapons_loader{ - pixel_y = -18; - layer = 4 - }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" - }, -/area/vehicle/apc/arc) -"T" = ( -/obj/structure/interior_wall/apc{ - icon_state = "wheel_front_top_2"; - pixel_x = -4; - pixel_y = 4; - layer = 2.01 - }, -/obj/structure/interior_wall/apc{ - icon_state = "corner_inverse_R"; - opacity = 0; - pixel_y = -15; - layer = 2.03 - }, -/turf/open/space/basic, -/area/space) -"W" = ( +"X" = ( /obj/structure/bed/chair/vehicle{ - dir = 4; - pixel_y = 13; - layer = 3.1 + pixel_x = -8 }, /obj/structure/bed/chair/vehicle{ - dir = 4; - pixel_y = 1; - layer = 3.1 + pixel_x = 8 }, -/turf/open/shuttle/vehicle{ - icon_state = "floor_2" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{ + pixel_y = 14; + pixel_x = -8 }, +/turf/open/floor, /area/vehicle/apc/arc) -"X" = ( -/obj/structure/interior_wall/apc{ - icon_state = "front_6"; - pixel_y = 8; - layer = 3.9 - }, -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = -32; - layer = 3.8 - }, -/obj/structure/interior_wall/apc{ - icon_state = "front_2"; - pixel_y = -3; - layer = 3.8 - }, -/turf/open/space/basic, -/area/space) -"Y" = ( -/obj/structure/interior_wall/apc{ - icon_state = "wheel_back_top_1"; - pixel_x = -4; - pixel_y = 5; - layer = 2 - }, -/obj/structure/interior_wall/apc{ - icon_state = "wall_2"; - opacity = 0; - pixel_y = -6 - }, -/turf/open/space/basic, -/area/space) -"Z" = ( -/obj/structure/interior_wall/apc{ - icon_state = "wheel_front_top_1"; - pixel_y = 4; - layer = 2.01 - }, -/obj/structure/interior_wall/apc{ - icon_state = "wall"; - opacity = 0; - pixel_y = -15 - }, -/turf/open/space/basic, -/area/space) (1,1,1) = {" a -w -z -C -h a +a +q "} (2,1,1) = {" a -Y -v -W -c +X +G a "} (3,1,1) = {" a -k -b -B -r +I +N a "} (4,1,1) = {" a -T -o -B -G -n -"} -(5,1,1) = {" -a -K -J -E -d +r +H a "} -(6,1,1) = {" -a -Z -S -A -t +(5,1,1) = {" a -"} -(7,1,1) = {" a -X a -M -F a "}