FIX: December replacement tests major fix

maps/sierra/areas/z2_sierra_deck3.dm

@@ -60,6 +60,7 @@
 
 /area/crew_quarters/sleep/cryo/thirddeck
 	name = "Third Deck - Living - Cryogenic Storage"
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /area/crew_quarters/head/deck3

maps/sierra/areas/z3_sierra_deck2.dm

@@ -244,11 +244,13 @@
 	name = "Second Deck - Living - Cryogenic Storage"
 	icon = 'maps/sierra/icons/turf/areas.dmi'
 	icon_state = "cryo"
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /area/crew_quarters/sleep/cryo/south
 	name = "Second Deck - Living - Cryogenic Storage - South"
 	icon_state = "cryo_south"
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /area/crew_quarters/adherent

maps/sierra/areas/z4_sierra_deck1.dm

@@ -172,6 +172,7 @@
 /area/crew_quarters/sleep/cryo/firstdeck
 	name = "First Deck - Living - Cryogenic Storage"
 	icon_state = "cryo_up"
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /area/crew_quarters/dungeon_master_lounge
@@ -268,6 +269,7 @@
 /area/security/opscheck
 	name = "First Deck - RND - Security Checkpoint"
 	icon_state = "checkpoint"
+	req_access = list(access_security)
 
 /* MEDBAY AREAS
  * ============

maps/sierra/areas/z5_sierra_bridge.dm

@@ -34,6 +34,7 @@
 
 /area/crew_quarters/sleep/cryo/bridge
 	name = "Bridge - Living - Cryogenic Storage"
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /* COMMAND AREAS

maps/sierra/datums/supplypacks/security.dm

@@ -68,7 +68,7 @@
 
 /singleton/hierarchy/supply_pack/security/armory/pdw
 	name = "Weapons - Ballistic NT41"
-	contains = list(/obj/item/gun/projectile/automatic = 2)
+	contains = list(/obj/item/gun/projectile/automatic/nt41 = 2)
 	cost = 60
 	containername = "\improper Ballistic PDW crate"
 	security_level = SUPPLY_SECURITY_HIGH
@@ -124,3 +124,19 @@
 	containername = "pistol ammunition crate"
 	access = access_security
 	security_level = SUPPLY_SECURITY_ELEVATED
+
+/singleton/hierarchy/supply_pack/security/tacticalarmor
+	name = "Armor - Tactical"
+	contains = list(/obj/item/clothing/under/tactical,
+					/obj/item/clothing/suit/armor/pcarrier/tan/tactical,
+					/obj/item/clothing/head/helmet/tactical,
+					/obj/item/clothing/mask/balaclava/tactical,
+					/obj/item/clothing/glasses/tacgoggles,
+					/obj/item/storage/belt/holster/security/tactical,
+					/obj/item/clothing/shoes/tactical,
+					/obj/item/clothing/gloves/tactical)
+	cost = 45
+	containertype = /obj/structure/closet/crate/secure
+	containername = "tactical armor crate"
+	access = access_armory
+	security_level = SUPPLY_SECURITY_ELEVATED

maps/sierra/items/clothing/clothing.dm

@@ -12,3 +12,49 @@
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/mounted/energy/taser
 		)
+
+/obj/item/clothing/suit/space/void/sapper
+	name = "\improper sapper voidsuit"
+	desc = "A specially produced heavy suit for sapper units on space facilities. Usually, uses as emergency spacesuit."
+	icon_state = "rig-secTG"
+	item_state = "rig-secTG"
+	icon = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi'
+	item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi')
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_RESISTANT,
+		bomb = ARMOR_BOMB_SHIELDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_MINOR
+	)
+	flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
+	siemens_coefficient = 0
+
+/obj/item/clothing/suit/space/void/sapper/New()
+	..()
+	slowdown_per_slot[slot_wear_suit] = 2
+
+/obj/item/clothing/head/helmet/space/void/sapper
+	name = "sapper voidsuit helmet"
+	desc = "A specially produced heavy helmet for sapper units on space facilities."
+	icon_state = "rig0-secTG"
+	item_state = "rig0-secTG"
+	item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_head.dmi')
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_RESISTANT,
+		bomb = ARMOR_BOMB_SHIELDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_MINOR
+	)
+	item_state_slots = list(
+		slot_l_hand_str = "sec_helm",
+		slot_r_hand_str = "sec_helm",
+		)
+	siemens_coefficient = 0
+	light_overlay = "helmet_light_dual"

maps/sierra/loadout/loadout_accessories.dm

@@ -63,3 +63,8 @@
 	display_name = "holser belt"
 	path = /obj/item/storage/belt/holster/general
 	allowed_roles = list(/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, /datum/job/iaa, /datum/job/adjutant)
+
+/datum/gear/accessory/corpbadge
+	display_name = "investigator holobadge (IAA)"
+	path = /obj/item/clothing/accessory/badge/holo/investigator
+	allowed_roles = list(/datum/job/iaa)

maps/sierra/loadout/loadout_eyes.dm

@@ -9,3 +9,16 @@
 
 /datum/gear/eyes/material
 	allowed_roles = TECHNICAL_ROLES
+
+/datum/gear/eyes/fashionglasses
+	display_name = "non-prescription glasses"
+	path = /obj/item/clothing/glasses
+
+/datum/gear/eyes/fashionglasses/New()
+	..()
+	var/glasses = list()
+	glasses["green glasses"] = /obj/item/clothing/glasses/green
+	glasses["hipster glasses"] = /obj/item/clothing/glasses/hipster
+	glasses["monocle"] = /obj/item/clothing/glasses/monocle
+	glasses["scanning goggles"] = /obj/item/clothing/glasses/scanners
+	gear_tweaks += new/datum/gear_tweak/path(glasses)

maps/sierra/loadout/loadout_pda.dm

@@ -83,3 +83,20 @@
 			NME.log_in()
 	if(H.equip_to_slot_if_possible(item, slot, equip_flags = TRYEQUIP_REDRAW))
 		. = item
+
+/datum/gear/utility/modular_scanner
+	display_name = "Scanner module, paper"
+	cost = 1
+	path = /obj/item/stock_parts/computer/scanner/paper
+
+/datum/gear/utility/modular_scanner/chemical
+	display_name = "Scanner module, reagents"
+	path = /obj/item/stock_parts/computer/scanner/reagent
+
+/datum/gear/utility/modular_scanner/atmos
+	display_name = "Scanner module, atmos"
+	path = /obj/item/stock_parts/computer/scanner/atmos
+
+/datum/gear/utility/modular_scanner/medical
+	display_name = "Scanner module, medical"
+	path = /obj/item/stock_parts/computer/scanner/medical

maps/sierra/machinery/machinery.dm

@@ -49,6 +49,52 @@
 /obj/machinery/suit_cycler/pilot
 	req_access = list(access_explorer) //because unathi version of expeditonary suit it shit
 
+// Overrides
+
+/obj/machinery/suit_storage_unit/security
+	name = "security voidsuit storage unit"
+	suit= /obj/item/clothing/suit/space/void/security
+	helmet = /obj/item/clothing/head/helmet/space/void/security
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
+	mask = /obj/item/clothing/mask/breath
+	req_access = list(access_security)
+	islocked = 1
+	ssu_color = "#cc0000"
+
+/obj/machinery/suit_storage_unit/medical
+	name = "medical voidsuit storage unit"
+	suit= /obj/item/clothing/suit/space/void/medical
+	helmet = /obj/item/clothing/head/helmet/space/void/medical
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
+	mask = /obj/item/clothing/mask/breath
+	req_access = list(access_medical)
+	islocked = 1
+	ssu_color = "#55aaaa"
+
+/obj/machinery/suit_storage_unit/mining/Initialize()
+	. = ..()
+	ssu_color = "#b88a3b"
+
+/obj/machinery/suit_storage_unit/engineering/Initialize()
+	. = ..()
+	ssu_color = "#ffbf00"
+
+/obj/machinery/suit_storage_unit/atmos/Initialize()
+	. = ..()
+	ssu_color = "#00cccc"
+
+/obj/machinery/suit_storage_unit/science/Initialize()
+	. = ..()
+	ssu_color = "#990000"
+
+/obj/machinery/suit_storage_unit/security/sapper
+	name = "Sapper Voidsuit Storage Unit"
+	suit = /obj/item/clothing/suit/space/void/sapper
+	helmet = /obj/item/clothing/head/helmet/space/void/sapper
+	ssu_color = "#54654c"
+
 /obj/machinery/suit_storage_unit/explorer
 	name = "Exploration Voidsuit Storage Unit"
 	suit = /obj/item/clothing/suit/space/void/exploration
@@ -58,7 +104,7 @@
 	mask = /obj/item/clothing/mask/gas/half
 	req_access = list(access_explorer)
 	islocked = 1
-
+	ssu_color = "#9966ff"
 
 /obj/machinery/suit_storage_unit/pilot
 	name = "Expeditionary Pilot Voidsuit Storage Unit"
@@ -69,9 +115,11 @@
 	mask = /obj/item/clothing/mask/breath
 	req_access = list(access_explorer, access_expedition_shuttle_helm)
 	islocked = 1
-
+	ssu_color = "#990000"
 
 /obj/machinery/suit_storage_unit/standard_unit
+	icon_state = "industrial"
+	base_icon_state = "industrial"
 	islocked = 0
 
 /obj/machinery/photocopier/faxmachine/centcomm
@@ -192,3 +240,25 @@
 	check_weapons = 1	//checks if it can shoot people that have a weapon they aren't authorized to have
 	check_access = 1	//if this is active, the turret shoots everything that does not meet the access requirements
 	req_access = list(access_bridge)
+
+// Fabricator overrides
+
+/datum/fabricator_recipe/medical/beaker
+	path = /obj/item/reagent_containers/glass/beaker
+	fabricator_types = list(FABRICATOR_CLASS_MICRO,FABRICATOR_CLASS_GENERAL)
+
+/datum/fabricator_recipe/medical/beaker_large
+	path = /obj/item/reagent_containers/glass/beaker/large
+	fabricator_types = list(FABRICATOR_CLASS_MICRO,FABRICATOR_CLASS_GENERAL)
+
+/datum/fabricator_recipe/medical/beaker_insul
+	path = /obj/item/reagent_containers/glass/beaker/insulated
+	fabricator_types = list(FABRICATOR_CLASS_MICRO,FABRICATOR_CLASS_GENERAL)
+
+/datum/fabricator_recipe/medical/beaker_insul_large
+	path = /obj/item/reagent_containers/glass/beaker/insulated/large
+	fabricator_types = list(FABRICATOR_CLASS_MICRO,FABRICATOR_CLASS_GENERAL)
+
+/datum/fabricator_recipe/medical/vial
+	path = /obj/item/reagent_containers/glass/beaker/vial
+	fabricator_types = list(FABRICATOR_CLASS_MICRO,FABRICATOR_CLASS_GENERAL)

packs/infinity/machinery/suit_storage.dm → maps/sierra/machinery/suit_storage.dm

@@ -1,11 +1,16 @@
 /obj/machinery/suit_storage_unit
-	icon = 'packs/infinity/icons/obj/suitstorage.dmi'
-	icon_state = "ssu_classic"
-	var/base_icon_state = "ssu_classic"
-
+	icon = 'maps/sierra/icons/obj/suitstorage.dmi'
+	icon_state = "industrial"
+	var/base_icon_state = "industrial"
+	var/ssu_color = "color_overlay_colorable"
 
 /obj/machinery/suit_storage_unit/on_update_icon()
 	ClearOverlays()
+	if(ssu_color)
+		var/image/I = image(icon = icon, icon_state = "[base_icon_state]_colorable")
+		I.appearance_flags |= RESET_COLOR
+		I.color = ssu_color
+		AddOverlays(I)
 	//if things arent powered, these show anyways
 	if(panelopen)
 		AddOverlays(image(icon,"[base_icon_state]_panel"))
@@ -37,8 +42,3 @@
 				AddOverlays(overlay_image(icon,"[base_icon_state]_uv", plane = EFFECTS_ABOVE_LIGHTING_PLANE, layer = ABOVE_LIGHTING_LAYER))
 		else
 			AddOverlays(overlay_image(icon, "[base_icon_state]_ready", plane = EFFECTS_ABOVE_LIGHTING_PLANE, layer = ABOVE_LIGHTING_LAYER))
-
-/obj/machinery/suit_storage_unit/industrial
-	name = "industrial suit storage unit"
-	icon_state = "industrial"
-	base_icon_state = "industrial"

maps/sierra/sierra.dm

@@ -95,6 +95,7 @@
 	#include "machinery/navbeacons.dm"
 	#include "machinery/power.dm"
 	#include "machinery/random.dm"
+	#include "machinery/suit_storage.dm"
 	#include "machinery/tcomms.dm"
 	#include "machinery/thrusters.dm"
 	#include "machinery/uniform_vendor.dm"