Merge branch 'master' into upstream-merge-14220

code/datums/components/material_container.dm

@@ -140,12 +140,7 @@
 		return
 
 	// Cache this since S may go away after use()
-	var/list/sheet_matter
-	if(istype(S, /obj/item/stack/material))
-		var/obj/item/stack/material/MS = S
-		sheet_matter = list(MS.material.name = 2000)
-	else
-		sheet_matter = S.matter
+	var/list/sheet_matter = S.matter
 
 	// Calculate total amount of material for one sheet
 	var/matter_per_sheet = 0

code/datums/outfits/outfit.dm

@@ -41,7 +41,7 @@ var/list/outfits_decls_by_type_
 	var/l_hand = null
 	// In the list(path=count,otherpath=count) format
 	var/list/uniform_accessories = list() // webbing, armbands etc - fits in slot_tie
-	var/list/backpack_contents = list() 
+	var/list/backpack_contents = list()
 
 	var/id_type
 	var/id_desc

code/datums/roundstats/roundstats.dm

@@ -74,7 +74,7 @@ var/global/list/security_printer_tickets = list()	//VOREStation Edit
 
 	//VOREStation Add Start - Vore stats lets gooooo
 	if(GLOB.prey_eaten_roundstat > 0)
-		valid_stats_list.Add("A total of [GLOB.prey_eaten_roundstat] individuals were eaten today!")
+		valid_stats_list.Add("Individuals were eaten a total of [GLOB.prey_eaten_roundstat] times today!") //CHOMPEdit
 	if(GLOB.prey_digested_roundstat > 0)
 		valid_stats_list.Add("A total of [GLOB.prey_digested_roundstat] individuals were digested today!")
 	if(GLOB.prey_absorbed_roundstat > 0)

code/datums/supplypacks/misc.dm

@@ -153,6 +153,7 @@
 	containertype = /obj/structure/closet/crate/thinktronic
 	containername = "Holoplant crate"
 
+/* CHOMPedit, moved to medical.dm in modular folder
 /datum/supply_pack/misc/glucose_hypos
 	name = "Glucose Hypoinjectors"
 	contains = list(
@@ -161,7 +162,7 @@
 	cost = 25
 	containertype = /obj/structure/closet/crate/zenghu
 	containername = "Glucose Hypo Crate"
-
+*/
 /datum/supply_pack/misc/mre_rations
 	num_contained = 6
 	name = "Emergency - MREs"

code/datums/supplypacks/misc_vr.dm

@@ -176,3 +176,10 @@
 		access_pilot
 	)
 	one_access = TRUE
+
+/datum/supply_pack/misc/swoopie //CHOMPAdd
+	name = "SWOOPIE XL CleanBot Kit"
+	contains = list()
+	cost = 100
+	containertype = /obj/structure/largecrate/animal/swoopie
+	containername = "SWOOPIE XL CleanBot Starter Kit"

code/datums/supplypacks/munitions_vr.dm

@@ -1,23 +1,25 @@
-/datum/supply_pack/munitions/expeditionguns
-	name = "Frontier phaser (station-locked) crate"
+/datum/supply_pack/munitions/expeditionguns //CHOMP Edit begin: Re-appropriating this whole block. Changing frontier phasers to phaseguns.
+	name = "Exploration phasegun (station-locked) crate"
 	contains = list(
-			/obj/item/weapon/gun/energy/locked/frontier = 2,
-			/obj/item/weapon/gun/energy/locked/frontier/holdout = 2,
+			/obj/item/weapon/gun/energy/locked/phasegun/pistol = 2,
+			/obj/item/weapon/gun/energy/locked/phasegun/rifle = 2,
+			/obj/item/weapon/gun/energy/locked/phasegun =  2
 			)
 	cost = 35
 	containertype = /obj/structure/closet/crate/secure
-	containername = "frontier phaser crate"
-	access = access_explorer //CHOMP explo keep
+	containername = "phasegun crate"
+	access = access_explorer
 
-/datum/supply_pack/munitions/expeditionbows
-	name = "Frontier bows (station-locked) crate"
+/datum/supply_pack/munitions/expeditioncannon
+	name = "Exploration phasecannon (station-locked) crate"
 	contains = list(
-			/obj/item/weapon/gun/energy/locked/frontier/handbow=2
+			/obj/item/weapon/gun/energy/locked/phasegun/cannon = 1
 			)
-	cost = 20
+	cost = 50
 	containertype = /obj/structure/closet/crate/secure
-	containername = "phaser handbow crate"
-	access = access_explorer //CHOMP explo keep
+	containername = "phasegun cannon crate"
+	access = access_explorer 
+//CHOMP Edit end
 
 /datum/supply_pack/munitions/ofd_charge_emp
 	name = "OFD Charge - EMP"