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

modular_citadel/code/modules/cargo/packs.dm

@@ -6,7 +6,7 @@
 	contraband = TRUE
 	contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate)
 	crate_name = "Kinkmate construction kit"
-  
+
 
 //Food and livestocks
 
@@ -15,15 +15,14 @@
 	cost = 2000
 	contains = list( /mob/living/simple_animal/kiwi)
 	crate_name = "space kiwi crate"
-  
-  
+
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Miscellaneous ///////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-/datum/supply_pack/misc/disco
-	name = "Disco Ball"
+/datum/supply_pack/misc/jukebox
+	name = "Jukebox"
 	cost = 1000000
-	contains = list(/obj/machinery/jukebox/disco)
-	crate_name = "Disco Ball"
-
+	contains = list(/obj/machinery/jukebox)
+	crate_name = "Jukebox"

modular_citadel/code/modules/mob/living/carbon/human/species.dm

@@ -47,7 +47,7 @@
 			playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 			target.visible_message("<span class='danger'>[user] has pushed [target]!</span>",
 				"<span class='userdanger'>[user] has pushed [target]!</span>", null, COMBAT_MESSAGE_RANGE)
-			target.apply_effect(40, KNOCKDOWN, target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
+			target.apply_effect(40, EFFECT_KNOCKDOWN, target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
 			target.forcesay(GLOB.hit_appends)
 			add_logs(user, target, "disarmed", " pushing them to the ground")
 			return

modular_citadel/code/modules/mob/living/living.dm

@@ -106,7 +106,7 @@
 				playsound(src, "bodyfall", 20, 1)
 			return FALSE
 
-/mob/living/carbon/proc/update_stamina()
+/mob/living/carbon/update_stamina()
 	var/total_health = (min(health*2,100) - staminaloss)
 	if(staminaloss)
 		if(!recoveringstam && total_health <= STAMINA_CRIT_TRADITIONAL && !stat)

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -267,7 +267,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 				return
 			L.Stun(4) // normal stunbaton is force 7 gimme a break good sir!
 			L.Knockdown(80)
-			L.apply_effect(STUTTER, 4)
+			L.apply_effect(EFFECT_STUTTER, 4)
 			L.visible_message("<span class='danger'>[R] has shocked [L] with its tongue!</span>", \
 								"<span class='userdanger'>[R] has shocked you with its tongue! You can feel the betrayal.</span>")
 			playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)

modular_citadel/code/modules/recycling/disposal/bin.dm

@@ -1,5 +1,5 @@
 /obj/machinery/disposal/bin/alt_attack_hand(mob/user)
-	if(is_interactable() && !user.stat)
+	if(can_interact(usr))
 		flush = !flush
 		update_icon()
 		return TRUE