Merge pull request #4400 from Loganbacca/re-engineering-merge

Engineering remap

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -5,8 +5,6 @@ obj/machinery/atmospherics/trinary/filter
 
 	name = "Gas filter"
 
-	req_access = list(access_atmospherics)
-
 	var/on = 0
 	var/temp = null // -- TLE
 

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -5,8 +5,6 @@ obj/machinery/atmospherics/trinary/mixer
 
 	name = "Gas mixer"
 
-	req_access = list(access_atmospherics)
-
 	var/on = 0
 
 	var/target_pressure = ONE_ATMOSPHERE

code/WorkInProgress/Cael_Aislinn/Rust/areas.dm

@@ -68,7 +68,3 @@
 	storage_hard
 		name = "\improper Engineering Hard Storage"
 		icon_state = "engine_storage"
-
-	hallway
-		name = "\improper Engineering storage"
-		icon_state = "engine_hallway"

code/game/area/Space Station 13 areas.dm

@@ -664,6 +664,10 @@ var/list/ghostteleportlocs = list()
 	name = "Waste Disposal"
 	icon_state = "disposal"
 
+/area/maintenance/evahallway
+	name = "\improper EVA Hallway"
+	icon_state = "eva"
+
 //Hallway
 
 /area/hallway/primary/fore
@@ -938,18 +942,38 @@ var/list/ghostteleportlocs = list()
 		name = "\improper Engine Monitoring Room"
 		icon_state = "engine_monitoring"
 
+	engineering_monitoring
+		name = "\improper Engineering Monitoring Room"
+		icon_state = "engine_monitoring"
+
 	engineering
 		name = "Engineering"
 		icon_state = "engine_smes"
 
+	engineering_foyer
+		name = "\improper Engineering Foyer"
+		icon_state = "engine"
+
 	break_room
-		name = "Engineering Foyer"
+		name = "\improper Engineering Break Room"
 		icon_state = "engine"
 
 	chiefs_office
 		name = "\improper Chief Engineer's office"
 		icon_state = "engine_control"
 
+	hallway
+		name = "\improper Engineering Hallway"
+		icon_state = "engine_hallway"
+
+	workshop
+		name = "\improper Engineering Workshop"
+		icon_state = "engine_storage"
+
+	locker_room
+		name = "\improper Engineering Locker Room"
+		icon_state = "engine_storage"
+
 
 //Solars
 

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -124,12 +124,12 @@
 /obj/structure/closet/secure_closet/atmos_personal
 	name = "Technician's Locker"
 	req_access = list(access_atmospherics)
-	icon_state = "secureeng1"
-	icon_closed = "secureeng"
-	icon_locked = "secureeng1"
-	icon_opened = "secureengopen"
-	icon_broken = "secureengbroken"
-	icon_off = "secureengoff"
+	icon_state = "secureatm1"
+	icon_closed = "secureatm"
+	icon_locked = "secureatm1"
+	icon_opened = "secureatmopen"
+	icon_broken = "secureatmbroken"
+	icon_off = "secureatmoff"
 
 
 	New()
@@ -151,4 +151,4 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/weapon/cartridge/atmos(src)
 		new /obj/item/taperoll/engineering(src)
-		return
+		return

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -154,6 +154,8 @@
 	..()
 	new /obj/item/clothing/suit/radiation(src)
 	new /obj/item/clothing/head/radiation(src)
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
 
 /*
  * Bombsuit closet

code/game/objects/structures/crates_lockers/crates.dm

@@ -276,6 +276,36 @@
 	new /obj/item/weapon/rcd_ammo(src)
 	new /obj/item/weapon/rcd(src)
 
+/obj/structure/closet/crate/solar
+	name = "Solar Pack crate"
+
+/obj/structure/closet/crate/solar/New()
+	..()
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/solar_assembly(src)
+	new /obj/item/weapon/circuitboard/solar_control(src)
+	new /obj/item/weapon/tracker_electronics(src)
+	new /obj/item/weapon/paper/solar(src)
+
 /obj/structure/closet/crate/freezer
 	desc = "A freezer."
 	name = "Freezer"