April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.

code/datums/martial/krav_maga.dm

@@ -132,8 +132,9 @@
 /datum/martial_art/krav_maga/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(check_streak(A,D))
 		return 1
+	var/obj/item/I = null
 	if(prob(60))
-		var/obj/item/I = D.get_active_held_item()
+		I = D.get_active_held_item()
 		if(I)
 			if(D.drop_item())
 				A.put_in_hands(I)
@@ -144,7 +145,7 @@
 		D.visible_message("<span class='danger'>[A] attempted to disarm [D]!</span>", \
 							"<span class='userdanger'>[A] attempted to disarm [D]!</span>")
 		playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-	add_logs(A, D, "disarmed with krav maga")
+	add_logs(A, D, "disarmed with krav maga", "[I ? " removing \the [I]" : ""]")
 	return 1
 
 //Krav Maga Gloves

code/datums/martial/wrestling.dm

@@ -186,6 +186,14 @@
 	add_logs(A, D, "has thrown with wrestling")
 	return 0
 
+/datum/martial_art/wrestling/proc/FlipAnimation(mob/living/carbon/human/D)
+	set waitfor = FALSE
+	if (D)
+		animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
+	sleep (15)
+	if (D)
+		animate(D, transform = null, time = 1, loop = 0)
+
 /datum/martial_art/wrestling/proc/slam(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!D)
 		return
@@ -198,12 +206,7 @@
 
 	A.visible_message("<span class = 'danger'><B>[A] lifts [D] up!</B></span>")
 
-	spawn (0)
-		if (D)
-			animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
-		sleep (15)
-		if (D)
-			animate(D, transform = null, time = 1, loop = 0)
+	FlipAnimation()
 
 	for (var/i = 0, i < 3, i++)
 		if (A && D)
@@ -300,6 +303,10 @@
 	add_logs(A, D, "body-slammed")
 	return 0
 
+/datum/martial_art/wrestling/proc/CheckStrikeTurf(mob/living/carbon/human/A, turf/T)
+	if (A && (T && isturf(T) && get_dist(A, T) <= 1))
+		A.forceMove(T)
+
 /datum/martial_art/wrestling/proc/strike(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!D)
 		return
@@ -309,9 +316,7 @@
 			A.setDir(turn(A.dir, 90))
 
 		A.forceMove(D.loc)
-		spawn (4)
-			if (A && (T && isturf(T) && get_dist(A, T) <= 1))
-				A.forceMove(T)
+		addtimer(CALLBACK(src, .proc/CheckStrikeTurf, A, T), 4)
 
 		A.visible_message("<span class = 'danger'><b>[A] headbutts [D]!</b></span>")
 		D.adjustBruteLoss(rand(10,20))