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/hydroponics/beekeeping/beebox.dm

@@ -192,8 +192,8 @@
 
 	..()
 
-
-/obj/structure/beebox/attack_hand(mob/user)
+/obj/structure/beebox/interact(mob/user)
+	. = ..()
 	if(!user.bee_friendly())
 		//Time to get stung!
 		var/bees = FALSE

code/modules/hydroponics/biogenerator.dm

@@ -151,10 +151,10 @@
 	else
 		to_chat(user, "<span class='warning'>You cannot put this in [src.name]!</span>")
 
-/obj/machinery/biogenerator/interact(mob/user)
+/obj/machinery/biogenerator/ui_interact(mob/user)
 	if(stat & BROKEN || panel_open)
 		return
-	user.set_machine(src)
+	. = ..()
 	var/dat
 	if(processing)
 		dat += "<div class='statusDisplay'>Biogenerator is processing! Please wait...</div><BR>"
@@ -202,15 +202,11 @@
 	var/datum/browser/popup = new(user, "biogen", name, 350, 520)
 	popup.set_content(dat)
 	popup.open()
-	return
-
-/obj/machinery/biogenerator/attack_hand(mob/user)
-	interact(user)
 
 /obj/machinery/biogenerator/proc/activate()
-	if (usr.stat != 0)
+	if (usr.stat != CONSCIOUS)
 		return
-	if (src.stat != 0) //NOPOWER etc
+	if (src.stat != NONE) //NOPOWER etc
 		return
 	if(processing)
 		to_chat(usr, "<span class='warning'>The biogenerator is in the process of working.</span>")
@@ -233,7 +229,6 @@
 		update_icon()
 	else
 		menustat = "void"
-	return
 
 /obj/machinery/biogenerator/proc/check_cost(list/materials, multiplier = 1, remove_points = 1)
 	if(materials.len != 1 || materials[1] != MAT_BIOMASS)

code/modules/hydroponics/gene_modder.dm

@@ -98,14 +98,8 @@
 	else
 		..()
 
-
-/obj/machinery/plantgenes/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/plantgenes/interact(mob/user)
-	user.set_machine(src)
+/obj/machinery/plantgenes/ui_interact(mob/user)
+	. = ..()
 	if(!user)
 		return
 

code/modules/hydroponics/grown/chili.dm

@@ -78,7 +78,9 @@
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
-	..()
+	. = ..()
+	if(.)
+		return
 	if( ismob(loc) )
 		held_mob = loc
 		START_PROCESSING(SSobj, src)

code/modules/hydroponics/grown/towercap.dm

@@ -161,6 +161,9 @@
 
 
 /obj/structure/bonfire/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	if(burning)
 		to_chat(user, "<span class='warning'>You need to extinguish [src] before removing the logs!</span>")
 		return
@@ -173,8 +176,6 @@
 			new /obj/item/stack/rods(loc, 1)
 		qdel(src)
 		return
-	..()
-
 
 /obj/structure/bonfire/proc/CheckOxygen()
 	if(isopenturf(loc))

code/modules/hydroponics/hydroitemdefines.dm

@@ -131,7 +131,7 @@
 			playsound(src,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
 	return (BRUTELOSS)
 
-/obj/item/scythe/pre_attackby(atom/A, mob/living/user, params)
+/obj/item/scythe/pre_attack(atom/A, mob/living/user, params)
 	if(swiping || !istype(A, /obj/structure/spacevine) || get_turf(A) == get_turf(user))
 		return ..()
 	else

code/modules/hydroponics/hydroponics.dm

@@ -847,6 +847,9 @@
 		return ..()
 
 /obj/machinery/hydroponics/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	if(issilicon(user)) //How does AI know what plant is?
 		return
 	if(harvest)

code/modules/hydroponics/seed_extractor.dm

@@ -119,13 +119,9 @@
 	src.potency = poten
 	src.amount = am
 
-/obj/machinery/seed_extractor/attack_hand(mob/user)
-	user.set_machine(src)
-	interact(user)
-
-/obj/machinery/seed_extractor/interact(mob/user)
+/obj/machinery/seed_extractor/ui_interact(mob/user)
 	if (stat)
-		return 0
+		return FALSE
 
 	var/dat = "<b>Stored seeds:</b><br>"