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/awaymissions/bluespaceartillery.dm

@@ -25,8 +25,8 @@
 /obj/structure/artilleryplaceholder/decorative
 	density = FALSE
 
-/obj/machinery/artillerycontrol/attack_hand(mob/user)
-	user.set_machine(src)
+/obj/machinery/artillerycontrol/ui_interact(mob/user)
+	. = ..()
 	var/dat = "<B>Bluespace Artillery Control:</B><BR>"
 	dat += "Locked on<BR>"
 	dat += "<B>Charge progress: [reload]/[reload_cooldown]:</B><BR>"
@@ -34,7 +34,6 @@
 	dat += "Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
 	user << browse(dat, "window=scroll")
 	onclose(user, "scroll")
-	return
 
 /obj/machinery/artillerycontrol/Topic(href, href_list)
 	if(..())

code/modules/awaymissions/capture_the_flag.dm

@@ -49,6 +49,7 @@
 				to_chat(M, "<span class='userdanger'>\The [src] has been returned to base!</span>")
 		STOP_PROCESSING(SSobj, src)
 
+//ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/item/twohanded/ctf/attack_hand(mob/living/user)
 	if(!is_ctf_target(user) && !anyonecanpickup)
 		to_chat(user, "Non players shouldn't be moving the flag!")
@@ -70,6 +71,7 @@
 		if(istype(mob_area, /area/ctf))
 			to_chat(M, "<span class='userdanger'>\The [src] has been taken!</span>")
 	STOP_PROCESSING(SSobj, src)
+	..()
 
 /obj/item/twohanded/ctf/dropped(mob/user)
 	..()
@@ -204,6 +206,7 @@
 	ctf_gear = /datum/outfit/ctf/blue
 	instagib_gear = /datum/outfit/ctf/blue/instagib
 
+//ATTACK GHOST IGNORING PARENT RETURN VALUE
 /obj/machinery/capture_the_flag/attack_ghost(mob/user)
 	if(ctf_enabled == FALSE)
 		if(user.client && user.client.holder)
@@ -663,6 +666,9 @@
 	capture(user)
 
 /obj/machinery/control_point/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	capture(user)
 
 /obj/machinery/control_point/proc/capture(mob/user)

code/modules/awaymissions/corpse.dm

@@ -27,6 +27,7 @@
 	var/show_flavour = TRUE
 	var/banType = "lavaland"
 
+//ATTACK GHOST IGNORING PARENT RETURN VALUE
 /obj/effect/mob_spawn/attack_ghost(mob/user)
 	if(!SSticker.HasRoundStarted() || !loc)
 		return
@@ -527,6 +528,7 @@
 	outfit = /datum/outfit/spacebartender
 	assignedrole = "Space Bar Patron"
 
+//ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user)
 	var/despawn = alert("Return to cryosleep? (Warning, Your mob will be deleted!)",,"Yes","No")
 	if(despawn == "No" || !loc || !Adjacent(user))

code/modules/awaymissions/gateway.dm

@@ -61,6 +61,9 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	icon_state = "off"
 
 /obj/machinery/gateway/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	if(!detect())
 		return
 	if(!active)

code/modules/awaymissions/mission_code/Cabin.dm

@@ -28,12 +28,10 @@
 	..()
 	toggleFirepit()
 
-/obj/structure/firepit/attack_hand(mob/living/user)
+/obj/structure/firepit/interact(mob/living/user)
 	if(active)
-		active = 0
+		active = FALSE
 		toggleFirepit()
-	else
-		..()
 
 /obj/structure/firepit/attackby(obj/item/W,mob/living/user,params)
 	if(!active)
@@ -48,6 +46,7 @@
 		W.fire_act()
 
 /obj/structure/firepit/proc/toggleFirepit()
+	active = !active
 	if(active)
 		set_light(8)
 		icon_state = "firepit-active"

code/modules/awaymissions/mission_code/wildwest.dm

@@ -70,9 +70,7 @@
 	var/chargesa = 1
 	var/insistinga = 0
 
-/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user)
-	usr.set_machine(src)
-
+/obj/machinery/wish_granter_dark/interact(mob/living/carbon/human/user)
 	if(chargesa <= 0)
 		to_chat(user, "The Wish Granter lies silent.")
 		return

code/modules/awaymissions/signpost.dm

@@ -16,6 +16,9 @@
 	return attack_hand(user)
 
 /obj/structure/signpost/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	switch(alert(question,name,"Yes","No"))
 		if("Yes")
 			var/turf/T = find_safe_turf(zlevels=zlevels)