Alternative Surv Nerf.

code/game/machinery/vending/vendor_types/food.dm

@@ -108,6 +108,32 @@
 		list("Vacuum Flask", 5, /obj/item/reagent_container/food/drinks/flask/vacuumflask, VENDOR_ITEM_REGULAR)
 	)
 
+/obj/structure/machinery/cm_vending/sorted/boozeomat/populate_product_list_and_boxes(scale)
+	. = ..()
+
+	// If this is groundside and isn't dynamically changing we will spawn with stock randomly removed from it
+	if(vend_flags & VEND_STOCK_DYNAMIC)
+		return
+	if(Check_WO())
+		return
+	var/turf/location = get_turf(src)
+	if(location && is_ground_level(location.z))
+		random_unstock()
+
+/// Randomly removes amounts of listed_products and reagents
+/obj/structure/machinery/cm_vending/sorted/boozeomat/proc/random_unstock()
+	for(var/list/vendspec as anything in listed_products)
+		var/amount = vendspec[2]
+		if(amount <= 0)
+			continue
+
+		// Chance to just be empty
+		if(prob(25))
+			vendspec[2] = 0
+			continue
+
+		// Otherwise its some amount between 1 and the original amount
+		vendspec[2] = rand(1, 3)
 
 /obj/structure/machinery/cm_vending/sorted/boozeomat/chess
 	name = "\improper Chess-O-Mat"

code/game/objects/effects/spawners/random.dm

@@ -268,13 +268,8 @@
 	icon_state = "loot_goggles"
 
 /obj/effect/spawner/random/goggles/item_to_spawn()
-	return pick(prob(4);/obj/item/clothing/glasses/thermal/syndi/bug_b_gone,\
-				prob(4);/obj/item/clothing/glasses/thermal/syndi,\
-				prob(4);/obj/item/clothing/glasses/thermal/monocle,\
-				prob(4);/obj/item/clothing/glasses/thermal/eyepatch,\
-				prob(4);/obj/item/clothing/glasses/welding/superior,\
+	return pick(prob(4);/obj/item/clothing/glasses/welding/superior,\
 				prob(4);/obj/item/clothing/glasses/hud/security/jensenshades,\
-				prob(4);/obj/item/clothing/glasses/meson/refurbished,\
 				prob(4);/obj/item/clothing/glasses/science,\
 				prob(4);/obj/item/clothing/glasses/hud/sensor,\
 				prob(4);/obj/item/clothing/glasses/hud/security)
@@ -521,7 +516,6 @@
 	guns = list(
 		/obj/item/weapon/gun/rifle/mar40/lmg = /obj/item/ammo_magazine/rifle/mar40/lmg,
 		/obj/item/weapon/gun/shotgun/merc = null,
-		/obj/item/weapon/gun/launcher/rocket/anti_tank/disposable = /obj/item/prop/folded_anti_tank_sadar,
 		/obj/item/weapon/gun/rifle/m41a = /obj/item/ammo_magazine/rifle,
 		/obj/item/weapon/gun/shotgun/combat = null,
 		/obj/item/weapon/gun/pistol/vp78 = /obj/item/ammo_magazine/pistol/vp78,

code/game/objects/items/reagent_containers/food/drinks/bottle.dm

@@ -107,7 +107,8 @@
 	if(alcohol_potency < BURN_LEVEL_TIER_1)
 		to_chat(user, SPAN_NOTICE("There's not enough flammable liquid in \the [src]!"))
 		return
-	alcohol_potency = clamp(alcohol_potency, BURN_LEVEL_TIER_1, BURN_LEVEL_TIER_7)
+
+	alcohol_potency = BURN_LEVEL_TIER_1
 
 	if(!do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
 		return

code/modules/clothing/glasses/thermal.dm

@@ -58,14 +58,6 @@
 	deactive_state = "rwelding-gup"
 	gender = PLURAL
 
-/obj/item/clothing/glasses/thermal/syndi/kutjevo
-	icon = 'icons/obj/items/clothing/glasses/goggles.dmi'
-	icon_state = "kutjevo_goggles"
-	deactive_state = "kutjevo_goggles"
-	item_icons = list(
-		WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/goggles.dmi',
-	)
-
 /obj/item/clothing/glasses/thermal/monocle
 	name = "Thermoncle"
 	desc = "A monocle thermal."

code/modules/clothing/gloves/marine_gloves.dm

@@ -48,6 +48,12 @@
 	icon_state = "black"
 	item_state = "black"
 
+/obj/item/clothing/gloves/marine/insulated/damaged_m5x
+	name = "\improper damaged M5X gauntlets"
+	desc = "A pair of heavily armored gloves made to complete the M5X exoskeleton armor. This pair looks to be damaged."
+	icon_state = "gauntlets"
+	item_state = "bgloves"
+
 /obj/item/clothing/gloves/marine/black
 	name = "marine black combat gloves"
 	adopts_squad_color = FALSE

maps/map_files/BigRed/BigRed.dmm

@@ -1027,6 +1027,14 @@
 /obj/structure/machinery/power/apc/power/north,
 /turf/open/floor/plating,
 /area/bigredv2/caves_north)
+"adY" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown{
+	layer = 3.1
+	},
+/obj/effect/landmark/corpsespawner/security/liaison,
+/turf/open/floor/wood,
+/area/bigredv2/outside/admin_building)
 "adZ" = (
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves/lambda/xenobiology)
@@ -1664,10 +1672,10 @@
 /area/bigredv2/outside/marshal_office)
 "agD" = (
 /obj/structure/surface/rack,
-/obj/item/ammo_magazine/shotgun/incendiary,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/clothing/accessory/storage/black_vest,
+/obj/item/ammo_magazine/shotgun/buckshot,
 /turf/open/floor/dark,
 /area/bigredv2/outside/marshal_office)
 "agH" = (
@@ -3977,11 +3985,11 @@
 /area/bigredv2/outside/ne)
 "arE" = (
 /obj/structure/surface/rack,
-/obj/item/ammo_magazine/shotgun/incendiary,
-/obj/item/ammo_magazine/shotgun/incendiary,
-/obj/item/ammo_magazine/shotgun/incendiary,
-/obj/item/weapon/gun/shotgun/combat,
 /obj/structure/machinery/door/window/eastleft,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/weapon/gun/shotgun/pump,
 /turf/open/floor/elevatorshaft/north,
 /area/bigredv2/caves/lambda/breakroom)
 "arF" = (
@@ -22737,10 +22745,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached15,
 /area/bigredv2/outside/nw)
-"hqC" = (
-/obj/item/ammo_magazine/rifle/mar40/lmg,
-/turf/open/mars_cave/mars_cave_2,
-/area/bigredv2/caves/mining)
 "hqD" = (
 /turf/open/floor/asteroidwarning/southwest,
 /area/bigredv2/outside/lz2_south_cas)
@@ -24919,21 +24923,18 @@
 /turf/open/shuttle/escapepod/floor1/north,
 /area/bigredv2/oob)
 "jRi" = (
-/obj/item/ammo_magazine/smg/bizon{
-	pixel_x = 5;
-	pixel_y = -5
-	},
-/obj/item/weapon/gun/smg/bizon{
-	pixel_x = 1;
-	pixel_y = 11
+/obj/structure/machinery/light/small{
+	dir = 8
 	},
-/obj/item/ammo_magazine/smg/bizon{
-	pixel_x = 11;
+/obj/item/weapon/gun/smg/mp5,
+/obj/item/ammo_magazine/smg/mp5,
+/obj/item/ammo_magazine/smg/mp5{
+	pixel_x = -3;
 	pixel_y = -3
 	},
-/obj/item/ammo_magazine/smg/bizon,
-/obj/structure/machinery/light/small{
-	dir = 8
+/obj/item/ammo_magazine/smg/mp5{
+	pixel_x = 5;
+	pixel_y = -4
 	},
 /turf/open/floor/plating/platingdmg3/west,
 /area/bigredv2/caves/mining)
@@ -30157,7 +30158,12 @@
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
 /area/bigredv2/outside/c)
 "pjD" = (
-/obj/item/weapon/gun/smg/fp9000,
+/obj/item/weapon/gun/smg/mp5,
+/obj/item/ammo_magazine/smg/mp5,
+/obj/item/ammo_magazine/smg/mp5{
+	pixel_x = 5;
+	pixel_y = -4
+	},
 /turf/open/floor/wood,
 /area/bigredv2/outside/marshal_office)
 "pkd" = (
@@ -32975,9 +32981,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
 /obj/structure/surface/table,
-/obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary{
-	pixel_y = 12
-	},
+/obj/item/ammo_magazine/handful/shotgun/buckshot,
 /turf/open/floor/plating/platingdmg3/west,
 /area/bigredv2/caves/mining)
 "rXJ" = (
@@ -34720,6 +34724,7 @@
 /obj/item/ammo_casing/bullet{
 	icon_state = "cartridge_10_1"
 	},
+/obj/item/ammo_magazine/smg/mp5,
 /turf/open/floor/wood,
 /area/bigredv2/outside/marshal_office)
 "tFL" = (
@@ -36074,8 +36079,7 @@
 /obj/effect/decal/cleanable/blood{
 	icon_state = "gib6"
 	},
-/obj/item/weapon/gun/rifle/mar40/lmg,
-/obj/item/ammo_magazine/rifle/mar40/lmg,
+/obj/item/weapon/gun/rifle/m41a/training,
 /turf/open/mars_cave/mars_cave_2,
 /area/bigredv2/caves/mining)
 "vdh" = (
@@ -36611,11 +36615,8 @@
 /area/bigredv2/outside/n)
 "vCd" = (
 /obj/structure/surface/rack,
-/obj/item/weapon/twohanded/lungemine{
-	pixel_y = 8
-	},
-/obj/item/weapon/twohanded/lungemine{
-	pixel_y = -7
+/obj/item/explosive/grenade/high_explosive/frag{
+	desc = "High-Explosive Fragmenting-Antipersonnel. A small, but deceptively strong fragmentation grenade that has been phasing out the M15 fragmentation grenades alongside the M40 HEDP. Capable of being loaded in the M92 Launcher, or thrown by hand. This one seems to have weird insciptions all over it. You can barely make out 'PrAIs3 thE H3f@ G0d'"
 	},
 /turf/open/floor/plating/platingdmg3/west,
 /area/bigredv2/caves/mining)
@@ -39211,12 +39212,10 @@
 	dir = 4
 	},
 /obj/structure/closet/crate,
-/obj/item/weapon/gun/rifle/nsg23/no_lock,
-/obj/item/ammo_magazine/rifle/nsg23,
-/obj/item/ammo_magazine/rifle/nsg23,
-/obj/item/ammo_magazine/rifle/nsg23/ap,
-/obj/item/ammo_magazine/rifle/nsg23/ap,
-/obj/item/ammo_magazine/rifle/nsg23/extended,
+/obj/item/weapon/gun/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
 /turf/open/floor/plating/platingdmg3/west,
 /area/bigredv2/caves/mining)
 "ylx" = (
@@ -53332,7 +53331,7 @@ rxh
 rxh
 rxh
 vcA
-hqC
+rxh
 aao
 aao
 aao
@@ -61461,7 +61460,7 @@ aNQ
 aOO
 aUg
 aof
-aNQ
+adY
 aOO
 aXn
 aof

maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm

@@ -1105,10 +1105,13 @@
 /area/bigredv2/outside/marshal_office)
 "HS" = (
 /obj/structure/surface/rack,
-/obj/item/ammo_magazine/shotgun/incendiary,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/clothing/accessory/storage/black_vest,
 /obj/item/clothing/accessory/storage/black_vest,
+/obj/item/ammo_magazine/shotgun/buckshot{
+	pixel_y = -8;
+	pixel_x = -6
+	},
 /turf/open/floor/dark,
 /area/bigredv2/outside/marshal_office)
 "Io" = (