things with stuff (#6233)

* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already

code/modules/recycling/conveyor2.dm

@@ -1,6 +1,8 @@
 //conveyor2 is pretty much like the original, except it supports corners, but not diverters.
 //note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
 
+GLOBAL_LIST_EMPTY(conveyors_by_id)
+
 /obj/machinery/conveyor
 	icon = 'icons/obj/recycling.dmi'
 	icon_state = "conveyor0"
@@ -44,11 +46,27 @@
 	icon_state = "conveyor[operating * verted]"
 
 // create a conveyor
-/obj/machinery/conveyor/Initialize(mapload, newdir)
+/obj/machinery/conveyor/Initialize(mapload, newdir, newid)
 	. = ..()
 	if(newdir)
 		setDir(newdir)
+	if(newid)
+		id = newid
 	update_move_direction()
+	LAZYADD(GLOB.conveyors_by_id[id], src)
+
+/obj/machinery/conveyor/Destroy()
+	LAZYREMOVE(GLOB.conveyors_by_id[id], src)
+	. = ..()
+
+/obj/machinery/conveyor/vv_edit_var(var_name, var_value)
+	if (var_name == "id")
+		// if "id" is varedited, update our list membership
+		LAZYREMOVE(GLOB.conveyors_by_id[id], src)
+		. = ..()
+		LAZYADD(GLOB.conveyors_by_id[id], src)
+	else
+		return ..()
 
 /obj/machinery/conveyor/proc/update_move_direction()
 	switch(dir)
@@ -146,9 +164,11 @@
 
 // attack with hand, move pulled object onto conveyor
 /obj/machinery/conveyor/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	user.Move_Pulled(src)
 
-
 // make the conveyor broken
 // also propagate inoperability to any connected conveyor with the same ID
 /obj/machinery/conveyor/proc/broken()
@@ -198,29 +218,34 @@
 
 	var/id = "" 				// must match conveyor IDs to control them
 
-	var/list/conveyors		// the list of converyors that are controlled by this switch
 	anchored = TRUE
 	speed_process = TRUE
 
 
 
 /obj/machinery/conveyor_switch/Initialize(mapload, newid)
-	..()
-	if(!id)
+	. = ..()
+	if (newid)
 		id = newid
-	update()
+	update_icon()
+	LAZYADD(GLOB.conveyors_by_id[id], src)
 
-	return INITIALIZE_HINT_LATELOAD //for machines list
+/obj/machinery/conveyor_switch/Destroy()
+	LAZYREMOVE(GLOB.conveyors_by_id[id], src)
+	. = ..()
 
-/obj/machinery/conveyor_switch/LateInitialize()
-	conveyors = list()
-	for(var/obj/machinery/conveyor/C in GLOB.machines)
-		if(C.id == id)
-			conveyors += C
+/obj/machinery/conveyor_switch/vv_edit_var(var_name, var_value)
+	if (var_name == "id")
+		// if "id" is varedited, update our list membership
+		LAZYREMOVE(GLOB.conveyors_by_id[id], src)
+		. = ..()
+		LAZYADD(GLOB.conveyors_by_id[id], src)
+	else
+		return ..()
 
 // update the icon depending on the position
 
-/obj/machinery/conveyor_switch/proc/update()
+/obj/machinery/conveyor_switch/update_icon()
 	if(position<0)
 		icon_state = "switch-rev"
 	else if(position>0)
@@ -237,13 +262,16 @@
 		return
 	operated = 0
 
-	for(var/obj/machinery/conveyor/C in conveyors)
+	for(var/obj/machinery/conveyor/C in GLOB.conveyors_by_id[id])
 		C.operating = position
 		C.update_move_direction()
 		CHECK_TICK
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	add_fingerprint(user)
 	if(position == 0)
 		if(convdir)   //is it a oneway switch
@@ -260,13 +288,12 @@
 		position = 0
 
 	operated = 1
-	update()
+	update_icon()
 
 	// find any switches with same id as this one, and set their positions to match us
-	for(var/obj/machinery/conveyor_switch/S in GLOB.machines)
-		if(S.id == src.id)
-			S.position = position
-			S.update()
+	for(var/obj/machinery/conveyor_switch/S in GLOB.conveyors_by_id[id])
+		S.position = position
+		S.update_icon()
 		CHECK_TICK
 
 /obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
@@ -307,8 +334,7 @@
 	if(A == user.loc)
 		to_chat(user, "<span class='notice'>You cannot place a conveyor belt under yourself.</span>")
 		return
-	var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
-	C.id = id
+	var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A, cdir, id)
 	transfer_fingerprints_to(C)
 	qdel(src)
 

code/modules/recycling/disposal/bin.dm

@@ -9,7 +9,7 @@
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
 	max_integrity = 200
 	resistance_flags = FIRE_PROOF
-	interact_open = TRUE
+	interaction_flags_machine = INTERACT_MACHINE_OPEN
 	var/datum/gas_mixture/air_contents	// internal reservoir
 	var/full_pressure = FALSE
 	var/pressure_charging = TRUE

code/modules/recycling/sortingmachinery.dm

@@ -8,7 +8,7 @@
 	var/giftwrapped = FALSE
 	var/sortTag = 0
 
-/obj/structure/bigDelivery/attack_hand(mob/user)
+/obj/structure/bigDelivery/interact(mob/user)
 	playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
 	qdel(src)