Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mining_Expansion_The_Diggening

code/game/objects/items/devices/flash.dm

@@ -122,9 +122,9 @@
 	if(use_external_power)
 		battery = get_external_power_supply()
 
-	if(times_used <= max_flashes && battery && battery.checked_use(charge_cost))
+	if(times_used <= max_flashes && battery && battery.charge >= charge_cost)
 		last_used = world.time
-		if(prob( max(0, times_used - safe_flashes) * 2 + (times_used >= 1) ) && can_break)	//if you use it 10 times in a minute it has a 30% chance to break.
+		if(prob( max(0, times_used - safe_flashes) * 2 + (times_used >= safe_flashes)) && can_break)	//if you use it 10 times in a minute it has a 30% chance to break.
 			broken = TRUE
 			if(user)
 				to_chat(user, "<span class='warning'>The bulb has burnt out!</span>")

code/game/objects/structures/simple_doors.dm

@@ -131,7 +131,7 @@
 			user << "You finished digging."
 			Dismantle()
 	else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc?
-		hardness -= W.force/100
+		hardness -= W.force/10
 		user << "You hit the [name] with your [W.name]!"
 		CheckHardness()
 	else if(istype(W,/obj/item/weapon/weldingtool))
@@ -142,6 +142,10 @@
 		attack_hand(user)
 	return
 
+/obj/structure/simple_door/bullet_act(var/obj/item/projectile/Proj)
+	hardness -= Proj.force/10
+	CheckHardness()
+
 /obj/structure/simple_door/proc/CheckHardness()
 	if(hardness <= 0)
 		Dismantle(1)