garrow mod 3

code/__DEFINES/sounds.dm

@@ -92,6 +92,7 @@
 #define AMBIENCE_MALL 'sound/ambience/medbay1.ogg'
 #define AMBIENCE_CAVE 'sound/ambience/desert.ogg'
 #define AMBIENCE_YAUTJA 'sound/ambience/yautja_ship.ogg'
+#define AMBIENCE_AICORE 'sound/ambience/ai_interface.ogg'
 
 #define SOUND_MARINE_DRUMS 'sound/effects/drums.ogg'
 

code/__DEFINES/vendors.dm

@@ -21,9 +21,13 @@
 #define MARINE_CAN_BUY_DRESS "dress"
 #define CIVILIAN_CAN_BUY_BACKPACK "civilian_backpack"
 #define CIVILIAN_CAN_BUY_UTILITY "civilian_utility"
+#define MARINE_CAN_BUY_MAIN "main"
+#define MARINE_CAN_BUY_SIDE "side"
 
 #define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99)
 
+#define MARINE_CAN_BUY_FOOD list(MARINE_CAN_BUY_MAIN = 1, MARINE_CAN_BUY_SIDE = 2)
+
 #define MARINE_TOTAL_BUY_POINTS 45
 #define MARINE_TOTAL_SNOWFLAKE_POINTS 120
 

code/controllers/subsystem/minimap.dm

@@ -541,7 +541,7 @@ SUBSYSTEM_DEF(minimaps)
 
 /datum/tacmap/drawing/proc/can_draw(faction, mob/user)
 	var/datum/squad/main_squad_path = MAIN_SHIP_PLATOON
-	return ((faction == main_squad_path::faction && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT)) || (faction == XENO_HIVE_NORMAL && isqueen(user)))
+	return ((faction == main_squad_path::faction && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_NOVICE)) || (faction == XENO_HIVE_NORMAL && isqueen(user)))
 
 /datum/controller/subsystem/minimaps/proc/fetch_tacmap_datum(zlevel, flags)
 	var/hash = "[zlevel]-[flags]"
@@ -741,7 +741,7 @@ SUBSYSTEM_DEF(minimaps)
 	old_map = get_tacmap_data_png(faction)
 	current_svg = get_tacmap_data_svg(faction)
 
-	var/use_live_map = skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno
+	var/use_live_map = skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_NOVICE) || is_xeno
 
 	if(use_live_map && !map_holder)
 		var/level = SSmapping.levels_by_trait(targeted_ztrait)

code/game/area/golden_arrow.dm

@@ -5,7 +5,7 @@
 	powernet_name = "golden_arrow"
 	sound_environment = SOUND_ENVIRONMENT_ROOM
 	soundscape_interval = 30
-	ambience_exterior = AMBIENCE_ALMAYER
+	ambience_exterior = AMBIENCE_SHIP
 	ceiling_muffle = FALSE
 
 /area/golden_arrow/hangar
@@ -87,6 +87,7 @@
 	icon_state = "airoom"
 	soundscape_playlist = SCAPE_PL_AICORE
 	soundscape_interval = 7
+	ambience_exterior = AMBIENCE_AICORE
 
 /area/golden_arrow/motor_pool
 	name = "\improper Motor Pool"

code/game/machinery/ARES/ARES_interface.dm

@@ -601,3 +601,18 @@
 
 	if(playsound)
 		playsound(src, "keyboard_alt", 15, 1)
+
+/obj/structure/machinery/computer/ares_console/large
+	name = "AI interface computer"
+	desc = "A large, bulky computer intended to allow the user to interface with the ship's AI."
+	icon = 'icons/obj/structures/props/almayer_props64.dmi'
+	icon_state = "ai_interface"
+	layer = BELOW_MOB_LAYER
+	pixel_x = -16
+	pixel_y = -8
+
+/obj/structure/machinery/computer/ares_console/large/Initialize()
+	. = ..()
+	overlays.Cut()
+	var/image/source_image = image(src.icon, "ai_interface_top", layer = ABOVE_MOB_LAYER)
+	overlays += source_image

code/game/machinery/cryopod.dm

@@ -174,9 +174,9 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 //Cryopods themselves.
 /obj/structure/machinery/cryopod
 	name = "hypersleep chamber"
-	desc = "A large automated capsule with LED displays intended to put anyone inside into 'hypersleep', a form of non-cryogenic statis used on most ships, linked to a long-term hypersleep bay on a lower level."
+	desc = "A large automated capsule with LED displays intended to put anyone inside into 'hypersleep', a form of non-cryogenic statis used on most ships."
 	icon = 'icons/obj/structures/machinery/cryogenics.dmi'
-	icon_state = "body_scanner_open"
+	icon_state = "hypersleep_open"
 	density = TRUE
 	anchored = TRUE
 
@@ -187,6 +187,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	var/silent_exit = FALSE
 	var/obj/item/device/radio/intercom/announce //Intercom for cryo announcements
 
+
 /obj/structure/machinery/cryopod/right
 	dir = WEST
 
@@ -200,6 +201,11 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	QDEL_NULL(announce)
 	. = ..()
 
+/obj/structure/machinery/cryopod/update_icon()
+	if(occupant)
+		icon_state = "hypersleep_closed"
+	else
+		icon_state = "hypersleep_open"
 
 //Lifted from Unity stasis.dm and refactored. ~Zuhayr
 /obj/structure/machinery/cryopod/process()
@@ -361,7 +367,6 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 			GLOB.data_core.general -= G
 			qdel(G)
 
-	icon_state = "body_scanner_open"
 	set_light(0)
 
 	if(occupant.key)
@@ -378,6 +383,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 
 	QDEL_NULL(occupant)
 	stop_processing()
+	update_icon()
 
 /obj/structure/machinery/cryopod/attackby(obj/item/W, mob/living/user)
 	if(isxeno(user))
@@ -495,12 +501,12 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		add_fingerprint(usr)
 
 
-/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/mob, silent = FALSE)
+/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/living/mob, silent = FALSE)
 	if(occupant)
 		return
 	mob.forceMove(src)
 	occupant = mob
-	icon_state = "body_scanner_closed"
+	update_icon()
 	set_light(2)
 	time_entered = world.time
 	start_processing()
@@ -523,7 +529,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	occupant.forceMove(get_turf(src))
 	occupant = null
 	stop_processing()
-	icon_state = "body_scanner_open"
+	update_icon()
 	set_light(0)
 	playsound(src, 'sound/machines/pod_open.ogg', 30)
 	SEND_SIGNAL(src, COMSIG_CRYOPOD_GO_OUT)
@@ -546,6 +552,54 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 
 	move_inside(target)
 
+/obj/structure/machinery/cryopod/big
+	icon = 'icons/obj/structures/machinery/hypersleep.dmi'
+	icon_state = "hypersleep_base"
+	dir = EAST
+	var/image/occupant_image
+	var/occupant_angle = 270
+	var/occupant_dir = 4
+	var/occupant_x = 6
+	var/occupant_y = 0
+
+/obj/structure/machinery/cryopod/big/Initialize()
+	. = ..()
+	var/cover_image = image(icon, icon_state = "cover_fog", layer = 3.22)
+	overlays += cover_image
+
+/obj/structure/machinery/cryopod/big/update_icon()
+	return
+
+/obj/structure/machinery/cryopod/big/go_in_cryopod(mob/living/mob, silent = FALSE)
+	..()
+	overlays.Cut()
+	occupant_image = image(mob.appearance, loc, layer = 3.21)
+	occupant_image.pixel_x = occupant_x
+	occupant_image.pixel_y = occupant_y
+	occupant_image.dir = occupant_dir
+	if(mob.body_position == STANDING_UP)
+		occupant_image.transform = occupant.transform.Turn(occupant_angle)
+	overlays += occupant_image
+	var/cover_image = image(icon, icon_state = "cover", layer = 3.22)
+	overlays += cover_image
+
+/obj/structure/machinery/cryopod/big/go_out()
+	..()
+	overlays -= occupant_image
+	occupant_image = null
+
+/obj/structure/machinery/cryopod/big/despawn_occupant()
+	..()
+	overlays.Cut()
+	occupant_image = null
+	var/cover_image = image(icon, icon_state = "cover_fog", layer = 3.22)
+	overlays += cover_image
+
+/obj/structure/machinery/cryopod/big/flipped
+	dir = WEST
+	occupant_angle = 90
+	occupant_dir = 8
+	occupant_x = 10
 
 /obj/structure/machinery/cryopod/tutorial
 	silent_exit = TRUE
@@ -558,7 +612,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		return
 	mob.forceMove(src)
 	occupant = mob
-	icon_state = "body_scanner_closed"
+	icon_state = "hypersleep_closed"
 	set_light(2)
 	time_entered = world.time
 	if(del_them)
@@ -571,7 +625,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		var/mob/living/carbon/human/man = occupant
 		man.species.handle_cryo(man)
 
-	icon_state = "body_scanner_open"
+	icon_state = "hypersleep_open"
 	set_light(0)
 
 

code/game/machinery/machinery.dm

@@ -369,7 +369,7 @@ Class Procs:
 	unslashable = TRUE
 	unacidable = TRUE
 	wrenchable = FALSE
-	
+
 /obj/structure/machinery/fuelpump/ex_act(severity)
 	return
 

code/game/machinery/vending/vendor_types/food.dm

@@ -1,9 +1,10 @@
 //------------CANTEEN MRE VENDOR---------------
 /obj/structure/machinery/cm_vending/sorted/marine_food
-	name = "\improper ColMarTech Food Vendor"
-	desc = "USCM Food Vendor, containing standard military Prepared Meals."
-	icon_state = "marine_food"
-	hackable = TRUE
+	name = "\improper NestleCo AutoChef"
+	desc = "An autochef food dispenser, capable of distributing food containing all the essential vitamins and nutrients anyone could ever need. Inedible-looking sludge is passed through a variety of heaters, re-shapers, and solidifiers before being artificially flavored to create something that looks and tastes mostly edible."
+	icon = 'icons/obj/structures/machinery/vending_32x64.dmi'
+	icon_state = "food"
+	hackable = FALSE
 	unacidable = FALSE
 	unslashable = FALSE
 	wrenchable = TRUE
@@ -46,6 +47,34 @@
 		list("USCM Flask", 0, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR),
 		list("W-Y Flask", 0, /obj/item/reagent_container/food/drinks/flask/weylandyutani, VENDOR_ITEM_REGULAR)
 	)
+
+//------------PVE CANTEEN FOOD VENDOR---------------
+/obj/structure/machinery/cm_vending/sorted/pve_food
+	name = "\improper NestleCo AutoChef"
+	desc = "An autochef food dispenser, capable of distributing food containing all the essential vitamins and nutrients anyone could ever need. Inedible-looking sludge is passed through a variety of heaters, re-shapers, and solidifiers before being artificially flavored to create something that looks and tastes mostly edible."
+	icon = 'icons/obj/structures/machinery/vending_32x64.dmi'
+	icon_state = "food"
+	req_one_access = list()
+	listed_products = list()
+	hackable = FALSE
+	wrenchable = FALSE
+	vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND
+
+/obj/structure/machinery/cm_vending/sorted/pve_food/get_listed_products(mob/user)
+	return GLOB.cm_vending_sorted_pve_food
+
+GLOBAL_LIST_INIT(cm_vending_sorted_pve_food, list(
+		list("MAIN COURSE", 0, null, null, null),
+		list("NestleCo Vegi-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/main/soylent/green, MARINE_CAN_BUY_MAIN),
+		list("NestleCo Meat-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/main/soylent/red, MARINE_CAN_BUY_MAIN),
+		list("NestleCo Grain-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/main/soylent/yellow, MARINE_CAN_BUY_MAIN),
+
+		list("SIDE DISH", 0, null, null, null),
+		list("NestleCo Vegi-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/side/soylent/green, MARINE_CAN_BUY_SIDE),
+		list("NestleCo Meat-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/side/soylent/red, MARINE_CAN_BUY_SIDE),
+		list("NestleCo Grain-Flavored NutriGo(TM)", 0, /obj/item/reagent_container/food/snacks/canteen/side/soylent/yellow, MARINE_CAN_BUY_SIDE),
+		))
+
 //------------BOOZE-O-MAT VENDOR---------------
 
 /obj/structure/machinery/cm_vending/sorted/boozeomat

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -125,8 +125,10 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
 //------------CLOTHING VENDOR---------------
 
 GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
-		list("MEDICAL SET (MANDATORY)", 0, null, null, null),
-		list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine/medic, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+
 
 		list("ARMOR (CHOOSE 1)", 0, null, null, null),
 		list("Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -142,9 +142,7 @@
 		list("M276 G8-A General Utility Pouch", floor(scale * 15), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
 
 		list("POUCHES", -1, null, null, null),
-		list("First-Aid Pouch (Splints, Gauze, Ointment)", floor(scale * 15), /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR),
-		list("First-Aid Pouch (Pill Packets)", floor(scale * 15), /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR),
-		list("First-Aid Pouch (Injectors)", floor(scale * 15), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR),
+		list("First-Aid Pouch", floor(scale * 15), /obj/item/storage/pouch/firstaid, VENDOR_ITEM_REGULAR),
 		list("Flare Pouch (Full)", floor(scale * 15), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR),
 		list("Magazine Pouch", floor(scale * 15), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
 		list("Medium General Pouch", floor(scale * 15), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR),
@@ -154,7 +152,7 @@
 		list("RESTRICTED POUCHES", -1, null, null, null),
 		list("Construction Pouch", 1.25, /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR),
 		list("Explosive Pouch", 1.25, /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR),
-		list("First Responder Pouch (Empty)", 2.5, /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
+		list("First Responder Pouch", 2.5, /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
 		list("Large Pistol Magazine Pouch", floor(scale * 2), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR),
 		list("Tools Pouch", 1.25, /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR),
 		list("Sling Pouch", 1.25, /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
@@ -437,6 +435,16 @@
 		list("MRE", floor(scale * 5), /obj/item/storage/box/MRE, VENDOR_ITEM_REGULAR),
 		list("MRE Box", floor(scale * 1), /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR),
 
+		list("MEDICAL", -1, null, null),
+		list("Gauze", round(scale * 15), /obj/item/stack/medical/bruise_pack, VENDOR_ITEM_REGULAR),
+		list("Ointment", round(scale * 15), /obj/item/stack/medical/ointment, VENDOR_ITEM_REGULAR),
+		list("Splints", round(scale * 15), /obj/item/stack/medical/splint, VENDOR_ITEM_REGULAR),
+		list("Emergency Autoinjector", round(scale * 15), /obj/item/reagent_container/hypospray/autoinjector/emergency, VENDOR_ITEM_REGULAR),
+		list("Bicaridine Autoinjector", round(scale * 15), /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless, VENDOR_ITEM_REGULAR),
+		list("Kelotane Autoinjector", round(scale * 15), /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless, VENDOR_ITEM_REGULAR),
+		list("Tricordrazine Autoinjector", round(scale * 15), /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless, VENDOR_ITEM_REGULAR),
+		list("Tramadol Injector", round(scale * 15), /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless, VENDOR_ITEM_REGULAR),
+
 		list("TOOLS", -1, null, null),
 		list("Entrenching Tool (ET)", round(scale * 2), /obj/item/tool/shovel/etool/folded, VENDOR_ITEM_REGULAR),
 		list("Screwdriver", round(scale * 5), /obj/item/tool/screwdriver, VENDOR_ITEM_REGULAR),
@@ -467,7 +475,7 @@
 		list("Fire Extinguisher (Portable)", round(scale * 1), /obj/item/tool/extinguisher/mini, VENDOR_ITEM_REGULAR),
 		list("Roller Bed", round(scale * 2), /obj/item/roller, VENDOR_ITEM_REGULAR),
 		list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
-		list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
+		list("Tactical Monocular", round(scale * 2), /obj/item/device/binoculars/range/monocular, VENDOR_ITEM_REGULAR),
 		list("AN/PSQ-55 Sentry Console", round(scale * 1), /obj/item/device/sentry_computer, VENDOR_ITEM_REGULAR),
 		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit/advanced, VENDOR_ITEM_REGULAR),
 		list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),

code/game/objects/effects/decals/strata_decals.dm

@@ -1,14 +1,14 @@
 /obj/effect/decal/strata_decals
 	icon = 'icons/effects/strata_decals.dmi'
 	layer = TURF_LAYER
+	anchored = TRUE
 
 /obj/effect/decal/strata_decals/catwalk/prison //For finding and replacing prison catwalk objects since they nasty
 	icon = 'icons/turf/floors/strata_floor.dmi'
 	icon_state = "catwalk"
 	name = "catwalk"
 	layer = CATWALK_LAYER
 	desc = "These things have no depth to them, are they just, painted on?"
-	anchored = TRUE
 
 //////////////////OUTDOOR STUFF/////////////////
 
@@ -36,6 +36,7 @@
 	icon_state = ""
 	name = "a stain"
 	desc = "A nasty looking brown stain, could be coffee, soot, water damage. Who knows."
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/effect/decal/strata_decals/grime/grime1
 	icon_state = "grime1"

code/game/objects/effects/spawners/spawner.dm

@@ -1,2 +1,3 @@
 /obj/effect/spawner
 	name = "object spawner"
+	icon = 'icons/landmarks.dmi'