Biobags hold extracts, new crates, fabricator fixes (#404)

* cool

* initial

---------

Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>

_maps/map_files/MetaStation/MetaStation.dmm

@@ -4147,7 +4147,8 @@
 "bca" = (
 /obj/machinery/door/poddoor{
 	id = "QMLoaddoor2";
-	name = "Supply Dock Loading Door"
+	name = "Supply Dock Loading Door";
+	dir = 4
 	},
 /obj/machinery/conveyor{
 	dir = 4;
@@ -15091,6 +15092,7 @@
 	},
 /obj/structure/cable,
 /obj/effect/landmark/navigate_destination,
+/obj/effect/mapping_helpers/paint_wall/bridge,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/hop)
 "erM" = (
@@ -24404,10 +24406,6 @@
 /obj/machinery/meter,
 /turf/closed/wall/r_wall/prepainted/daedalus,
 /area/station/engineering/atmos)
-"hJJ" = (
-/obj/machinery/rnd/production/fabricator/omni,
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
 "hJO" = (
 /obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/tile/neutral{
@@ -44239,17 +44237,18 @@
 /turf/open/floor/iron/dark,
 /area/station/commons/locker)
 "oXt" = (
-/obj/machinery/door/poddoor{
-	id = "QMLoaddoor";
-	name = "Supply Dock Loading Door"
-	},
 /obj/machinery/conveyor{
 	dir = 8;
 	id = "QMLoad"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor";
+	name = "Supply Dock Loading Door";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/cargo/storage)
 "oXu" = (
@@ -53966,6 +53965,7 @@
 /obj/effect/turf_decal/siding{
 	dir = 1
 	},
+/obj/machinery/rnd/production/fabricator/omni,
 /turf/open/floor/iron/dark,
 /area/station/science/lab)
 "sFx" = (
@@ -55222,15 +55222,16 @@
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "teQ" = (
-/obj/machinery/door/poddoor{
-	id = "QMLoaddoor2";
-	name = "Supply Dock Loading Door"
-	},
 /obj/machinery/conveyor{
 	dir = 4;
 	id = "QMLoad2"
 	},
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor2";
+	name = "Supply Dock Loading Door";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/cargo/storage)
 "tfa" = (
@@ -60503,7 +60504,8 @@
 "vkd" = (
 /obj/machinery/door/poddoor{
 	id = "QMLoaddoor";
-	name = "Supply Dock Loading Door"
+	name = "Supply Dock Loading Door";
+	dir = 4
 	},
 /obj/machinery/conveyor{
 	dir = 8;
@@ -100802,7 +100804,7 @@ rGa
 uuT
 sFm
 iUN
-hJJ
+iUN
 tPA
 pIn
 esw
@@ -113589,9 +113591,9 @@ tdK
 tdK
 dnS
 dnz
-bXZ
-tdK
-tdK
+awI
+dnS
+dnS
 fQO
 kBI
 lDy
@@ -113847,8 +113849,8 @@ dzb
 lhd
 dqu
 bXZ
-tdK
-tdK
+dnS
+dnS
 fQO
 kBI
 hZj
@@ -114104,8 +114106,8 @@ qgX
 dnS
 bXZ
 bXZ
-tdK
-tdK
+dnS
+dnS
 fQO
 mNe
 lDy
@@ -114360,8 +114362,8 @@ tdK
 auB
 avG
 bXZ
-tdK
-tdK
+dnS
+dnS
 fQO
 fQO
 kBI
@@ -114617,8 +114619,8 @@ tdK
 tdK
 vBr
 bXZ
-tdK
-tdK
+dnS
+dnS
 fQO
 kBI
 iqW

code/game/objects/items/RCD.dm

@@ -874,7 +874,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window())
 
 /obj/item/rcd_ammo
 	name = "compressed matter cartridge"
-	desc = "Highly compressed matter for the RCD."
+	desc = "Compressed matter for the RCD."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "rcdammo"
 	w_class = WEIGHT_CLASS_TINY
@@ -884,6 +884,8 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window())
 	var/ammoamt = 40
 
 /obj/item/rcd_ammo/large
+	name = "highly compressed matter cartridge"
+	desc = "Tightly compressed matter for the RCD."
 	custom_materials = list(/datum/material/iron=48000, /datum/material/glass=32000)
 	ammoamt = 160
 

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -765,6 +765,7 @@
 	def_components = list(
 		/obj/item/disk/data = /obj/item/disk/data/hyper/preloaded/fabricator/medical
 	)
+
 /obj/item/circuitboard/machine/sleeper
 	name = "Sleeper (Machine Board)"
 	greyscale_colors = CIRCUIT_COLOR_MEDICAL
@@ -920,6 +921,9 @@
 	name = "Departmental Fabricator - Security (Machine Board)"
 	greyscale_colors = CIRCUIT_COLOR_SECURITY
 	build_path = /obj/machinery/rnd/production/fabricator/department/security
+	def_components = list(
+		/obj/item/disk/data = /obj/item/disk/data/hyper/preloaded/fabricator/security
+	)
 
 /obj/item/circuitboard/machine/recharger
 	name = "Weapon Recharger (Machine Board)"

code/game/objects/items/storage/bags.dm

@@ -438,13 +438,15 @@
 	worn_icon_state = "biobag"
 	desc = "A bag for the safe transportation and disposal of biowaste and other virulent materials."
 	resistance_flags = FLAMMABLE
+	slot_flags = null //Primarily to limit slime extract storage on one person at a time
 
 /obj/item/storage/bag/bio/Initialize()
 	. = ..()
 	atom_storage.max_total_storage = 200
 	atom_storage.max_slots = 25
 	atom_storage.set_holdable(list(
 		/obj/item/bodypart,
+		/obj/item/slime_extract,
 		/obj/item/food/monkeycube,
 		/obj/item/healthanalyzer,
 		/obj/item/organ,
@@ -456,7 +458,6 @@
 		/obj/item/reagent_containers/hypospray/medipen,
 		/obj/item/food/monkeycube,
 		/obj/item/organ,
-		/obj/item/bodypart,
 		/obj/item/healthanalyzer
 		))
 

code/modules/cargo/packs.dm

@@ -134,6 +134,8 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/clothing/suit/fire/firefighter,
 					/obj/item/clothing/suit/fire/firefighter,
+					/obj/item/extinguisher/mini,
+					/obj/item/extinguisher/mini,
 					/obj/item/clothing/mask/gas,
 					/obj/item/clothing/mask/gas,
 					/obj/item/flashlight,
@@ -388,13 +390,16 @@
 
 /datum/supply_pack/security/supplies
 	name = "Security Supplies Crate"
-	desc = "Contains seven flashbangs, seven teargas grenades, six flashes, and seven handcuffs. Requires Security access to open."
-	cost = CARGO_CRATE_VALUE * 3.5
+	desc = "Contains seven flashbangs, seven teargas grenades, six flashes, seven handcuffs, and three pepper sprays. Requires Security access to open."
+	cost = CARGO_CRATE_VALUE * 3.8
 	access_view = ACCESS_ARMORY
 	contains = list(/obj/item/storage/box/flashbangs,
 					/obj/item/storage/box/teargas,
 					/obj/item/storage/box/flashes,
-					/obj/item/storage/box/handcuffs)
+					/obj/item/storage/box/handcuffs,
+					/obj/item/reagent_containers/spray/pepper,
+					/obj/item/reagent_containers/spray/pepper,
+					/obj/item/reagent_containers/spray/pepper)
 	crate_name = "security supply crate"
 
 /datum/supply_pack/security/firingpins
@@ -543,6 +548,13 @@
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
 
+/datum/supply_pack/security/armory/ion_carbine
+	name = "Ion Carbine Parts Kit"
+	desc = "A suitcase containing the necessary gun parts to transform a standard laser gun into a ion carbine. Perfect against lockers you don't have access to."
+	cost = CARGO_CRATE_VALUE * 9
+	contains = list(/obj/item/weaponcrafting/gunkit/ion)
+	crate_name = "gun parts crate"
+
 /datum/supply_pack/security/armory/mindshield
 	name = "Mindshield Implants Crate"
 	desc = "Prevent against radical thoughts with three Mindshield implants. Requires Armory access to open."
@@ -1068,6 +1080,16 @@
 	contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
 	crate_name = "wood planks crate"
 
+/datum/supply_pack/materials/rcd_ammo
+	name = "RCD Ammo"
+	desc = "Contains four raw material cartridges that can be used to quickly recharge any RCD."
+	cost = CARGO_CRATE_VALUE * 8.5
+	contains = list(/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo/large,
+					/obj/item/rcd_ammo/large,)
+	crate_name = "rcd ammo crate"
+
 /datum/supply_pack/materials/foamtank
 	name = "Firefighting Foam Tank Crate"
 	desc = "Contains a tank of firefighting foam. Also known as \"plasmaman's bane\"."
@@ -1504,7 +1526,7 @@
 
 /datum/supply_pack/service/janitor
 	name = "Janitorial Supplies Crate"
-	desc = "Fight back against dirt and grime with Priapus' Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag."
+	desc = "Fight back against dirt and grime with Priapus' Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has two bear traps, a single mop, broom, spray cleaner, rag, and trash bag."
 	cost = CARGO_CRATE_VALUE * 2
 	access_view = ACCESS_JANITOR
 	contains = list(/obj/item/reagent_containers/glass/bucket,
@@ -1520,7 +1542,9 @@
 					/obj/item/reagent_containers/glass/rag,
 					/obj/item/grenade/chem_grenade/cleaner,
 					/obj/item/grenade/chem_grenade/cleaner,
-					/obj/item/grenade/chem_grenade/cleaner)
+					/obj/item/grenade/chem_grenade/cleaner,
+					/obj/item/restraints/legcuffs/beartrap,
+					/obj/item/restraints/legcuffs/beartrap)
 	crate_name = "janitorial supplies crate"
 
 /datum/supply_pack/service/janitor/janicart
@@ -2282,6 +2306,16 @@
 					/obj/item/ammo_box/magazine/toy/pistol)
 	crate_name = "foam force crate"
 
+/datum/supply_pack/costumes_toys/riot_foam
+	name = "Riot Foam Darts Crate"
+	desc = "Lock and load your foam force arsenal to floor your opponents with 120 of our new and improved high density foam darts! Remember, it's Donk or Die!"
+	contraband = TRUE
+	cost = CARGO_CRATE_VALUE * 4
+	contains = list(/obj/item/ammo_box/foambox/riot,
+					/obj/item/ammo_box/foambox/riot,
+					/obj/item/ammo_box/foambox/riot)
+	crate_name = "riot foam darts crate"
+
 /datum/supply_pack/costumes_toys/formalwear
 	name = "Formalwear Crate"
 	desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing."
@@ -3020,20 +3054,14 @@
 	group = "Data Disks"
 
 /datum/supply_pack/data_disk/preloaded
-	name = "Data Disk"
+	name = "Data Disk (Omnifab)"
 	desc = "Contains an extremely expensive data disk for use in fabricators."
 	cost = CARGO_CRATE_VALUE * 5
-	contains = list(/obj/item/disk/data/hyper/preloaded/fabricator/omni)
-	crate_name = "data disk crate"
-	hidden = TRUE
-
-/datum/supply_pack/data_disk/preloaded/omni
-	name = "Data Disk (Omnifab)"
 	access = ACCESS_RESEARCH
 	contains = list(/obj/item/disk/data/hyper/preloaded/fabricator/omni)
 	crate_name = "omnifab disk crate"
 
-/datum/supply_pack/data_disk/preloaded
+/datum/supply_pack/data_disk/preloaded/robotics
 	name = "Data Disk (Robofab)"
 	access = ACCESS_MECH_SCIENCE
 	contains = list(/obj/item/disk/data/hyper/preloaded/fabricator/robotics)