TGS Test Merge (#6383)

code/datums/ammo/bullet/arc.dm

@@ -8,7 +8,7 @@
 	scatter = 0
 	damage = 30
 	damage_var_high = PROJECTILE_VARIANCE_TIER_8
-	penetration = ARMOR_PENETRATION_TIER_2
+	penetration = ARMOR_PENETRATION_TIER_3
 	accurate_range = 10
 	max_range = 12
 	shell_speed = AMMO_SPEED_TIER_6

code/game/machinery/computer/groundside_operations.dm

@@ -390,4 +390,8 @@
 	has_squad_overwatch = FALSE
 	minimap_type = MINIMAP_FLAG_PMC
 
+/obj/structure/machinery/computer/groundside_operations/arc
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "groundsideop_computer"
+
 #undef COMMAND_SQUAD

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -7,6 +7,8 @@
 	desc = "A rectangular metallic frame sitting on four legs with a back panel. Designed to fit the sitting position, more or less comfortably."
 	icon_state = "chair"
 	buckle_lying = 0
+	var/north_layer = FLY_LAYER
+	var/non_north_layer = OBJ_LAYER
 	var/propelled = FALSE //Check for fire-extinguisher-driven chairs
 	var/can_rotate = TRUE
 	var/picked_up_item = /obj/item/weapon/twohanded/folded_metal_chair
@@ -25,10 +27,10 @@
 	flags_can_pass_all_temp = PASS_OVER
 
 /obj/structure/bed/chair/handle_rotation() //Making this into a separate proc so office chairs can call it on Move()
-	if(src.dir == NORTH)
-		src.layer = FLY_LAYER
+	if(dir == NORTH)
+		layer = north_layer
 	else
-		src.layer = OBJ_LAYER
+		layer = non_north_layer
 	if(buckled_mob)
 		buckled_mob.setDir(dir)
 
@@ -257,6 +259,10 @@
 	debris = list()
 	picked_up_item = null
 
+/obj/structure/bed/chair/comfy/arc
+	non_north_layer = BELOW_OBJ_LAYER
+	layer = BELOW_OBJ_LAYER
+
 /obj/structure/bed/chair/comfy/orange
 	icon_state = "comfychair_orange"
 

code/modules/almayer/machinery.dm

@@ -106,7 +106,9 @@
 /obj/structure/machinery/prop/almayer/CICmap/computer
 	name = "map terminal"
 	desc = "A terminal that displays a map of the current operation location."
-	icon_state = "security"
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "cicmap_computer"
+	density = FALSE
 
 /obj/structure/machinery/prop/almayer/CICmap/upp
 	minimap_type = MINIMAP_FLAG_UPP

code/modules/cm_marines/overwatch.dm

@@ -872,7 +872,8 @@
 	name = "Broken Overwatch Console"
 
 /obj/structure/machinery/computer/overwatch/almayer/small
-	icon_state = "engineering_terminal"
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "overwatch_computer"
 
 /obj/structure/machinery/computer/overwatch/clf
 	faction = FACTION_CLF

code/modules/objectives/objective_memory_storage.dm

@@ -221,7 +221,8 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new())
 /obj/structure/machinery/computer/intel/disk_reader // ARC computer to save on tile space
 	name = "\improper SIGINT terminal"
 	desc = "An USCM computer capable of uploading data to the intelligence database. It has a disk reader slot built into the bottom, as well."
-	icon_state = "terminal"
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "sigint_computer"
 
 /obj/structure/machinery/computer/intel/disk_reader/Initialize()
 	. = ..()

code/modules/shuttle/shuttle_rotate.dm

@@ -25,6 +25,14 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
 			pixel_x = oldPY
 			pixel_y = (oldPX*(-1))
 
+
+/* ***********************************Object rotate procs*********************************** */
+
+/obj/vehicle/multitile/shuttleRotate(rotation, params)
+	params &= ~ROTATE_OFFSET
+	return ..()
+
+
 /* ***********************************Turf rotate procs*********************************** */
 
 /turf/closed/mineral/shuttleRotate(rotation, params)

code/modules/vehicles/arc/arc.dm

@@ -17,11 +17,10 @@
 
 	interior_map = /datum/map_template/interior/arc
 
-	passengers_slots = 3
-	xenos_slots = 5
+	passengers_slots = 2 // 5 total. Reserved slots are added to passenger slots.
+	xenos_slots = 4
 
 	entrances = list(
-		"left" = list(2, 0),
 		"right" = list(-2, 0),
 	)
 

code/modules/vehicles/arc/interior.dm

@@ -0,0 +1,13 @@
+/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/arc
+	name = "ARC chassis"
+
+	icon = 'icons/obj/vehicles/interiors/arc_chassis.dmi'
+	icon_state = "arc_chassis"
+	layer = ABOVE_TURF_LAYER
+	mouse_opacity = FALSE
+

code/modules/vehicles/interior/interior_landmarks.dm

@@ -286,6 +286,7 @@
 	V.vehicle = I.exterior
 	V.pixel_x = pixel_x
 	V.pixel_y = pixel_y
+	V.layer = layer
 	V.alpha = alpha
 
 	qdel(src)

colonialmarines.dme

@@ -2411,6 +2411,7 @@
 #include "code\modules\vehicles\apc\apc_medical.dm"
 #include "code\modules\vehicles\apc\interior.dm"
 #include "code\modules\vehicles\arc\arc.dm"
+#include "code\modules\vehicles\arc\interior.dm"
 #include "code\modules\vehicles\arc\verbs.dm"
 #include "code\modules\vehicles\hardpoints\hardpoint.dm"
 #include "code\modules\vehicles\hardpoints\armor\armor.dm"