Merge branch 'master' into sentry-integration

code/modules/almayer/machinery.dm

@@ -353,3 +353,14 @@
 	icon_state = "ob_console"
 	dir = WEST
 	flags_atom = ON_BORDER|CONDUCT|FPRINT
+
+/obj/structure/machinery/prop/almayer/CICmap/arc
+	name = "map terminal"
+	desc = "A terminal that displays a map of the current operation location."
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "arcmap"
+	density = FALSE
+
+/obj/structure/machinery/computer/overwatch/almayer/arc
+	icon = 'icons/obj/vehicles/interiors/arc.dmi'
+	icon_state = "arcconsole"

code/modules/client/preferences_gear.dm

@@ -573,10 +573,67 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "Die, 20 sides"
 	path = /obj/item/toy/dice/d20
 
-/datum/gear/toy/walkman
+/datum/gear/cassettes
+	category = "Cassettes"
+
+/datum/gear/cassettes/walkman
 	display_name = "Walkman"
 	path = /obj/item/device/walkman
 
+/datum/gear/cassettes/pop1
+	display_name = "Blue Cassette"
+	path = /obj/item/device/cassette_tape/pop1
+	cost = 1
+
+/datum/gear/cassettes/pop2
+	display_name = "Rainbow Cassette"
+	path = /obj/item/device/cassette_tape/pop2
+	cost = 1
+
+/datum/gear/cassettes/pop3
+	display_name = "Orange Cassette"
+	path = /obj/item/device/cassette_tape/pop3
+	cost = 1
+
+/datum/gear/cassettes/pop4
+	display_name = "Blue Cassette"
+	path = /obj/item/device/cassette_tape/pop4
+	cost = 1
+
+/datum/gear/cassettes/heavymetal
+	display_name = "Red-Black Cassette"
+	path = /obj/item/device/cassette_tape/heavymetal
+	cost = 1
+
+/datum/gear/cassettes/hairmetal
+	display_name = "Red Striped Cassette"
+	path = /obj/item/device/cassette_tape/hairmetal
+	cost = 1
+
+/datum/gear/cassettes/indie
+	display_name = "Rising Sun Cassette"
+	path = /obj/item/device/cassette_tape/indie
+	cost = 1
+
+/datum/gear/cassettes/hiphop
+	display_name = "Blue Stripe Cassette"
+	path = /obj/item/device/cassette_tape/hiphop
+	cost = 1
+
+/datum/gear/cassettes/nam
+	display_name = "Green Cassette"
+	path = /obj/item/device/cassette_tape/nam
+	cost = 1
+
+/datum/gear/cassettes/ocean
+	display_name = "Ocean Cassette"
+	path = /obj/item/device/cassette_tape/ocean
+	cost = 1
+
+/datum/gear/cassettes/pouch
+	display_name = "Cassette Pouch"
+	path = 	/obj/item/storage/pouch/cassette
+
 /datum/gear/toy/crayon
 	display_name = "Crayon"
 	path = /obj/item/toy/crayon/rainbow

code/modules/mob/living/carbon/human/exercise.dm

@@ -101,7 +101,7 @@ Verbs related to getting fucking jacked, bro
 /mob/living/carbon/human/proc/calculate_stamina_loss_per_pushup(on_knees = FALSE)
 	//humans have 100 stamina
 	//default loss per pushup = 5 stamina
-	var/stamina_loss = 5
+	var/stamina_loss = 2
 	if(!skills || issynth(src))
 		return 0
 	switch(skills.get_skill_level(SKILL_ENDURANCE))

maps/interiors/arc.dmm

@@ -22,7 +22,14 @@
 /obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{
 	dir = 4
 	},
-/turf/open/floor,
+/obj/structure/gun_rack/apc/frontal{
+	desc = "A small compartment that stores ammunition for the ARC's 'Bleihagel RE-RE850 Frontal Rotary Cannon'.";
+	pixel_y = 6;
+	pixel_x = 2;
+	layer = 2.9;
+	density = 0
+	},
+/turf/open/floor/almayer,
 /area/vehicle/apc/arc)
 "G" = (
 /obj/structure/bed/chair/vehicle{
@@ -41,17 +48,30 @@
 	layer = 3.1;
 	pixel_y = 5
 	},
-/turf/open/floor,
+/obj/structure/machinery/prop/almayer/CICmap/arc{
+	pixel_x = 16
+	},
+/obj/structure/machinery/computer/overwatch/almayer/arc{
+	pixel_y = 5;
+	pixel_x = 20
+	},
+/turf/open/floor/almayer,
 /area/vehicle/apc/arc)
 "I" = (
 /obj/structure/bed/chair/vehicle{
 	pixel_x = -8
 	},
 /obj/effect/landmark/interior/spawn/interior_viewport{
-	pixel_x = 8;
-	pixel_y = 4;
+	pixel_x = -16;
+	pixel_y = 11;
 	layer = 2.9
 	},
+/obj/effect/landmark/interior/spawn/weapons_loader{
+	icon = 'icons/obj/vehicles/interiors/arc.dmi';
+	icon_state = "arcloader";
+	pixel_y = 13;
+	pixel_x = 7
+	},
 /turf/open/floor,
 /area/vehicle/apc/arc)
 "N" = (
@@ -72,8 +92,7 @@
 	pixel_x = 8
 	},
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{
-	pixel_y = 14;
-	pixel_x = -8
+	pixel_y = 16
 	},
 /turf/open/floor,
 /area/vehicle/apc/arc)