diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 34a5f8a6f14..392e407bd2a 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -53,10 +53,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/weapon/gun/projectile/revolver/derringer,
 					/obj/item/weapon/gun/projectile/dragunov,
 					/obj/item/weapon/gun/energy/retro)
-	cost = 60
+	cost = 120
 	containertype = /obj/structure/closet/crate
 	containername = "crate"
-	hidden = 1
+	contraband = 1
 	group = "Security"
 
 /datum/supply_packs/forensics
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 329f076f7fc..f9ab9aa60ba 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -63,8 +63,8 @@
 
 	var/excavation_amount = 30
 	var/wielded = 0
-	var/force_unwielded = 10.0
-	var/force_wielded = 30.0
+	var/force_unwielded = 5.0
+	var/force_wielded = 15.0
 	var/digspeed_unwielded = 30
 	var/digspeed_wielded = 10
 	var/drilling = 0
@@ -233,7 +233,7 @@
 	drill_sound = 'sound/weapons/sonic_jackhammer.ogg'
 	digspeed = 15
 	digspeed_unwielded = 15
-	force_unwielded = 25.0
+	force_unwielded = 15.0
 	excavation_amount = 100
 
 	can_wield = 0
@@ -252,7 +252,6 @@
 
 	digspeed_unwielded = 30
 	digspeed_wielded = 5
-	force_wielded = 35.0
 
 /obj/item/weapon/pickaxe/diamond
 	name = "diamond pickaxe"
@@ -264,7 +263,7 @@
 
 	digspeed_unwielded = 20
 	digspeed_wielded = 1
-	force_wielded = 35.0
+	force_wielded = 25.0
 
 /obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 	name = "diamond mining drill"
@@ -1277,7 +1276,9 @@ var/list/total_extraction_beacons = list()
 	density = 1
 	anchored = 1
 
-/obj/structure/weightlifter/attack_hand(mob/user as mob)
+/obj/structure/weightlifter/attack_hand(var/mob/living/carbon/human/user)
+	if(!istype(user))
+		return
 	if(in_use)
 		user << "It's already in use - wait a bit."
 		return
@@ -1314,6 +1315,7 @@ var/list/total_extraction_beacons = list()
 		icon_state = "fitnessweight"
 		overlays -= W
 		user << "[finishmessage]"
+		user.nutrition = user.nutrition - 10
 
 /******************************Seismic Charge*******************************/
 
diff --git a/code/modules/projectiles/guns/energy/mining.dm b/code/modules/projectiles/guns/energy/mining.dm
index f6b910051c3..f2311454dac 100644
--- a/code/modules/projectiles/guns/energy/mining.dm
+++ b/code/modules/projectiles/guns/energy/mining.dm
@@ -21,6 +21,7 @@
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(mob/living/user as mob)
 	if(power_supply.charge < power_supply.maxcharge)
+		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		user << "<span class='notice'>You begin charging \the [src]...</span>"
 		if(do_after(user,20))
 			playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
@@ -69,7 +70,7 @@
 /obj/item/projectile/kinetic
 	name = "kinetic force"
 	icon_state = null
-	damage = 30
+	damage = 15
 	damage_type = BRUTE
 	check_armour = "bomb"
 	kill_count = 5
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 361cdca781d..ea2151b19f8 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 3b94621dbbd..53c6f74522b 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index f09581a2d91..3f6b42f80a6 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ