Revert "Merge branch 'master' into fairylights"

This reverts commit 2947727659, reversing
changes made to 91063fe882.

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -266,7 +266,7 @@
 	icon_state = "modkit"
 	w_class = WEIGHT_CLASS_SMALL
 	require_module = 1
-	module_type = list(/obj/item/robot_module/miner, /obj/item/robot_module/orepup)
+	module_type = /obj/item/robot_module/miner
 	var/denied_type = null
 	var/maximum_of_type = 1
 	var/cost = 30

code/modules/projectiles/projectile.dm

@@ -197,10 +197,7 @@
 			L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
 					"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>", null, COMBAT_MESSAGE_RANGE)
 		if(candink && def_zone == BODY_ZONE_HEAD)
-			if(prob(2))
-				playsound(src, 'hyperstation/sound/weapons/dinkalternate.ogg', 30, 0)
-			else
-				playsound(src, 'sound/weapons/dink.ogg', 30, 1)
+			playsound(src, 'sound/weapons/dink.ogg', 30, 1)
 		L.on_hit(src)
 
 	var/reagent_note