Merge pull request #12015 from SteelSlayer/atmos-QoL

Atmos tech QoL & Disposal pipe tweaks

_maps/map_files/cyberiad/cyberiad.dmm

@@ -79988,7 +79988,7 @@
 "cMF" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engineering Checkpoint";
-	req_access_txt = "11"
+	req_one_access_txt = "11;24"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4

code/datums/pipe_datums.dm

@@ -337,6 +337,13 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list)			//Some pipes we don't want to be dispensable
 	pipe_icon = "intake"
 	rpd_dispensable = TRUE
 
+/datum/pipes/disposal/sortjunction
+	pipe_name = "disposals sort junction"
+	pipe_id = PIPE_DISPOSALS_SORT_RIGHT
+	orientations = 4
+	pipe_icon = "pipe-j1s"
+	rpd_dispensable = TRUE
+
 //Pipes the RPD can't dispense. Since these don't use an interface, we don't need to bother with setting an icon. We do, however, want to name these for other purposes
 
 /datum/pipes/atmospheric/circulator
@@ -363,12 +370,8 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list)			//Some pipes we don't want to be dispensable
 	pipe_name = "bent insulated pipe"
 	pipe_id = PIPE_INSULATED_BENT
 
-/datum/pipes/disposal/sortjunction
-	pipe_name = "disposals sort junction"
-	pipe_id = PIPE_DISPOSALS_SORT_RIGHT
-	pipe_icon = "pipe-j1s"
-
-/datum/pipes/disposal/sortjunction/left
+/datum/pipes/disposal/left_sortjunction
+	pipe_name = "disposals sort junction left"
 	pipe_id = PIPE_DISPOSALS_SORT_LEFT
 	pipe_icon = "pipe-j2s"
 

code/game/machinery/vending.dm

@@ -1355,7 +1355,7 @@
 	desc = "Spare tool vending. What? Did you expect some witty description?"
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
-	req_access_txt = "11" //Engineering Equipment access
+	req_one_access_txt = "11;24" // Engineers and atmos techs can use this
 	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/multitool = 4,/obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10)
 	contraband = list(/obj/item/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/storage/belt/utility = 3)

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

@@ -148,3 +148,4 @@
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/rpd(src)
+	new /obj/item/destTagger(src)

code/modules/client/asset_cache.dm

@@ -318,7 +318,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipe-item.dmi', state, D)
 	for(var/state in icon_states('icons/obj/pipes/disposal.dmi'))
-		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet"))) //Pipes we want sprites for
+		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet", "pipe-j1s"))) //Pipes we want sprites for
 			continue
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipes/disposal.dmi', state, D)

code/modules/recycling/disposal.dm

@@ -1036,6 +1036,7 @@
 
 		if(O.currTag > 0)// Tag set
 			sortType = O.currTag
+			name = GLOB.TAGGERLOCATIONS[O.currTag]
 			playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
 			var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag])
 			to_chat(user, "<span class='notice'>Changed filter to [tag]</span>")