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/mining/lavaland/ash_flora.dm

@@ -63,12 +63,13 @@
 		return ..()
 
 /obj/structure/flora/ash/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	if(!harvested && !needs_sharp_harvest)
 		user.visible_message("<span class='notice'>[user] starts to harvest from [src].</span>","<span class='notice'>You begin to harvest from [src].</span>")
 		if(do_after(user, harvest_time, target = src))
 			harvest(user)
-	else
-		..()
 
 /obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things
 	regrowth_time_low = 4200

code/modules/mining/lavaland/ruins/gym.dm

@@ -8,10 +8,15 @@
 	var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
 	'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
 
-/obj/structure/punching_bag/attack_hand(mob/living/user)
+/obj/structure/punching_bag/attack_hand(mob/user as mob)
+	. = ..()
+	if(.)
+		return
 	flick("[icon_state]2", src)
-	playsound(src.loc, pick(src.hit_sounds), 25, 1, -1)
-	user.apply_status_effect(STATUS_EFFECT_EXERCISED)
+	playsound(loc, pick(hit_sounds), 25, 1, -1)
+	if(isliving(user))
+		var/mob/living/L = user
+		L.apply_status_effect(STATUS_EFFECT_EXERCISED)
 
 /obj/structure/stacklifter
 	name = "Weight Machine"
@@ -22,6 +27,9 @@
 	anchored = TRUE
 
 /obj/structure/stacklifter/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
 	if(obj_flags & IN_USE)
 		to_chat(user, "It's already in use - wait a bit.")
 		return
@@ -61,6 +69,9 @@
 	anchored = TRUE
 
 /obj/structure/weightlifter/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
 	if(obj_flags & IN_USE)
 		to_chat(user, "It's already in use - wait a bit.")
 		return