Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm

code/game/objects/effects/decals/Cleanable/fuel.dm

@@ -12,18 +12,20 @@
 			log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
 		src.amount = amt
 
+		var/has_spread = 0
 		//Be absorbed by any other liquid fuel in the tile.
 		for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
 			if(other != src)
 				other.amount += src.amount
-				
-				var/oldsrc = src
-				src = null
-				spawn other.Spread()
-				del(oldsrc)
+				other.Spread()
+				has_spread = 1
+				break
 
-		Spread()
 		. = ..()
+		if(!has_spread)
+			Spread()
+		else
+			del(src)
 
 	proc/Spread(exclude=list())
 		//Allows liquid fuels to sometimes flow into other tiles.

code/game/objects/random/random.dm

@@ -188,10 +188,17 @@
 	item_to_spawn()
 		return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,\
 					prob(2);/obj/item/weapon/gun/projectile/automatic/wt550,\
-					prob(3);/obj/item/weapon/gun/projectile/sec,\
-					prob(2);/obj/item/weapon/gun/projectile/sec/wood,\
 					prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat)
 
+/obj/random/handgun
+	name = "Random Handgun"
+	desc = "This is a random security sidearm."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "secgundark"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/gun/projectile/sec,\
+					prob(1);/obj/item/weapon/gun/projectile/sec/wood)
+
 
 /obj/random/ammo
 	name = "Random Ammunition"

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -52,7 +52,7 @@
 
 /obj/structure/closet/secure_closet/medical3
 	name = "medical doctor's locker"
-	req_access = list(access_surgery)
+	req_access = list(access_medical)
 	icon_state = "securemed1"
 	icon_closed = "securemed"
 	icon_locked = "securemed1"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -196,7 +196,7 @@
 		new /obj/item/clothing/head/soft/sec/corp(src)
 		new /obj/item/clothing/under/rank/security/corp(src)
 		new /obj/item/ammo_magazine/c45m/rubber(src)
-		new /obj/item/weapon/gun/projectile/sec(src)
+		new /obj/item/weapon/gun/energy/taser(src)
 		return