Fix access mining and fix shield. Revert integrated system (#2617)

code/modules/integrated_electronics/subtypes/input.dm

@@ -869,7 +869,7 @@
 	power_draw_per_use = 5
 
 	var/language_preferred = LANGUAGE_HUMAN_EURO
-	var/languages_understood = list(LANGUAGE_HUMAN_EURO, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, LANGUAGE_HUMAN_INDIAN, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_HUMAN_SELENIAN, LANGUAGE_SPACER)
+	var/languages_understood = list(LANGUAGE_HUMAN_EURO, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, LANGUAGE_HUMAN_INDIAN, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN, LANGUAGE_HUMAN_SELENIAN, LANGUAGE_SPACER,  LANGUAGE_EAL, LANGUAGE_UNATHI_SINTA, LANGUAGE_UNATHI_YEOSA,  LANGUAGE_SKRELLIAN,  LANGUAGE_ROBOT_GLOBAL, LANGUAGE_DRONE_GLOBAL, LANGUAGE_GUTTER, LANGUAGE_ROOTLOCAL, LANGUAGE_PRIMITIVE, LANGUAGE_HUMAN_AVALON, LANGUAGE_HUMAN_LORRIMAN, LANGUAGE_HUMAN_MIRANIAN, LANGUAGE_LEGALESE, LANGUAGE_RESOMI, LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR)
 	var/invalid_flags = NONVERBAL | SIGNLANG | HIVEMIND | ALT_TRANSMIT
 
 /obj/item/integrated_circuit/input/microphone/Initialize()
@@ -897,8 +897,8 @@
 			if(translated && !(speaking.name == language_preferred))
 				activate_pin(2)
 
-
-/obj/item/integrated_circuit/input/microphone/modem
+// [SIERRA DELETE]
+/*/obj/item/integrated_circuit/input/microphone/modem
 	name = "machine modulating microphone"
 	languages_understood = list(LANGUAGE_HUMAN_EURO, LANGUAGE_EAL)
 	spawn_flags = IC_SPAWN_RESEARCH
@@ -916,8 +916,8 @@
 	languages_understood = list(LANGUAGE_SPACER, LANGUAGE_GUTTER, LANGUAGE_HUMAN_CHINESE, LANGUAGE_HUMAN_ARABIC, LANGUAGE_HUMAN_INDIAN, LANGUAGE_HUMAN_IBERIAN, LANGUAGE_HUMAN_RUSSIAN)
 	language_preferred = LANGUAGE_HUMAN_RUSSIAN
 	spawn_flags = 0
-	extended_desc = "This microphone did not come with any documentation."
-
+	extended_desc = "This microphone did not come with any documentation."*/
+// [SIERRA-DELETE-END]
 
 /obj/item/integrated_circuit/input/sensor
 	name = "sensor"

code/modules/shieldgen/shieldwallgen.dm

@@ -193,24 +193,37 @@
 		T2 = T
 		var/obj/machinery/shieldwall/CF = new(T, src, G) //(ref to this gen, ref to connected gen)
 		CF.set_dir(field_dir)
+// [SIERRA EDIT]
+/obj/machinery/shieldwallgen/use_tool(obj/item/W, mob/living/user)
+	if(isWrench(W))
+		if(active)
+			to_chat(user, SPAN_WARNING("Turn off \the [src] first.."))
+			return
 
-/obj/machinery/shieldwallgen/can_anchor(obj/item/tool, mob/user, silent)
-	if (active)
-		to_chat(user, SPAN_WARNING("Turn off \the [src] first."))
-		return FALSE
-	..()
+		else if(!anchored)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			to_chat(user, "You secure the external reinforcing bolts to the floor.")
+			src.anchored = TRUE
+			return
+
+		else if(anchored)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			to_chat(user, "You undo the external reinforcing bolts.")
+			src.anchored = FALSE
+			return
 
-/obj/machinery/shieldwallgen/use_tool(obj/item/W, mob/living/user, list/click_params)
 	if(istype(W, /obj/item/card/id)||istype(W, /obj/item/modular_computer))
-		if (allowed(user))
-			locked = !locked
+		if (src.allowed(user))
+			src.locked = !src.locked
 			to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
 		else
 			to_chat(user, SPAN_WARNING("Access denied."))
-		return TRUE
-
-	return ..()
+		return
 
+	else
+		src.add_fingerprint(user)
+		..()
+// [SIERRA-EDIT-END]
 /obj/machinery/shieldwallgen/proc/cleanup(NSEW)
 	var/obj/machinery/shieldwall/F
 	var/obj/machinery/shieldwallgen/G

maps/sierra/job/access.dm

@@ -133,5 +133,11 @@ var/global/const/access_chief_steward = "ACCESS_SIERRA_CHIEF_STEWARD"
 	desc = "Chief Steward"
 	region = ACCESS_REGION_GENERAL
 
+var/global/const/access_adjutants = "ACCESS_ADJUTANTS"
+/datum/access/adjutants
+	id = access_adjutants
+	desc = "adjutants"
+	region = ACCESS_REGION_COMMAND
+
 /datum/access/network
 	region = ACCESS_REGION_COMMAND

maps/sierra/job/jobs_cargo.dm

@@ -98,7 +98,7 @@
 	allowed_ranks = list(/datum/mil_rank/civ/nt, /datum/mil_rank/civ/contractor)
 
 	access = list(access_mining, access_mining_office, access_mining_station,
-						access_expedition_shuttle, access_guppy, access_hangar, access_guppy_helm)
+						access_expedition_shuttle, access_guppy, access_hangar, access_guppy_helm, access_cargo)
 
 
 

maps/sierra/job/jobs_command.dm

@@ -95,7 +95,7 @@
 		access_guppy_helm, access_expedition_shuttle_helm, access_explorer, access_el, access_tox,
 		access_tox_storage, access_research, access_mining, access_mining_office, access_mining_station,
 		access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor, access_chief_steward,
-		access_bar, access_commissary, access_pilot, access_field_eng, access_field_med, access_network_admin, access_research_storage
+		access_bar, access_commissary, access_pilot, access_field_eng, access_field_med, access_network_admin, access_research_storage, access_adjutants
 	)
 	software_on_spawn = list(
 		/datum/computer_file/program/comm,
@@ -469,7 +469,7 @@
 		access_heads, access_bridge, access_janitor, access_kitchen, access_actor, access_cargo,
 		access_RC_announce, access_keycard_auth, access_guppy, access_guppy_helm,
 		access_external_airlocks, access_expedition_shuttle, access_eva, access_hangar,
-		access_explorer, access_expedition_shuttle_helm, access_gun, access_bar
+		access_explorer, access_expedition_shuttle_helm, access_gun, access_bar, access_adjutants
 	)
 
 	software_on_spawn = list(

maps/sierra/structures/closets/command.dm

@@ -73,7 +73,7 @@
 
 /obj/structure/closet/secure_closet/adjutant
 	name = "adjutant's locker"
-	req_access = list(access_bridge)
+	req_access = list(access_adjutants)
 	closet_appearance = /singleton/closet_appearance/secure_closet/sierra/command/adjutant
 
 /obj/structure/closet/secure_closet/adjutant/WillContain()