roomba spam

PMC-Unga-Marines · Dec 21, 2024 · 3636bb9 · 3636bb9
1 parent bd0991e
commit 3636bb9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 4 deletions.
diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
@@ -116,6 +116,8 @@
 //flags_storage
 ///If a storage container can be restocked into a vendor
 #define BYPASS_VENDOR_CHECK (1<<0)
+///Upon being put into cryo, this storage won't store it's contents into the cryo
+#define BYPASS_CRYO_CHECK (1<<1)
 
 //flags_id
 ///If you can get buy a loadout

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -480,6 +480,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 	),
 	"flags_storage" = list(
 		"BYPASS_VENDOR_CHECK" = BYPASS_VENDOR_CHECK,
+		"BYPASS_CRYO_CHECK" = BYPASS_CRYO_CHECK,
 	),
 	"flags_id" = list(
 		"CAN_BUY_LOADOUT" = CAN_BUY_LOADOUT,

diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
@@ -381,6 +381,7 @@
 	max_storage_space = 14
 	spawn_type = /obj/item/explosive/grenade/flare
 	spawn_number = 14
+	flags_storage = BYPASS_CRYO_CHECK
 
 /obj/item/storage/box/m94/update_icon_state()
 	. = ..()
@@ -408,14 +409,14 @@
 	spawn_type = /obj/item/lightstick/red
 	spawn_number = 7
 
-
 /obj/item/storage/box/MRE
 	name = "\improper TGMC MRE"
 	desc = "Meal Ready-to-Eat, meant to be consumed in the field, and has an expiration that is two decades past a marine's average combat life expectancy."
 	icon_state = "mealpack"
 	w_class = WEIGHT_CLASS_SMALL
 	can_hold = list(/obj/item/reagent_containers/food/snacks/packaged_meal)
 	storage_slots = 4
+	flags_storage = BYPASS_CRYO_CHECK
 	foldable = 0
 	var/isopened = 0
 	///the item left behind when this is used up

diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
@@ -133,6 +133,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 2
 	flags_equip_slot = ITEM_SLOT_BELT
+	flags_storage = BYPASS_CRYO_CHECK
 	max_storage_space = 18
 	storage_slots = 18
 	can_hold = list(

diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
@@ -262,6 +262,7 @@
 	storage_slots = null
 	use_sound = 'sound/items/pillbottle.ogg'
 	max_storage_space = 16
+	flags_storage = BYPASS_CRYO_CHECK
 	greyscale_config = /datum/greyscale_config/pillbottle
 	greyscale_colors = "#d9cd07#f2cdbb" //default colors
 	refill_types = list(/obj/item/storage/pill_bottle)

diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
@@ -514,6 +514,7 @@
 	name = "flare pouch"
 	desc = "A pouch designed to hold flares and a single flaregun. Refillable with a M94 flare pack."
 	flags_equip_slot = ITEM_SLOT_POCKET
+	flags_storage = BYPASS_CRYO_CHECK
 	storage_slots = 28
 	max_storage_space = 28
 	icon = 'icons/Marine/marine-pouches.dmi'

diff --git a/code/game/objects/items/storage/pill_packets.dm b/code/game/objects/items/storage/pill_packets.dm
@@ -15,7 +15,7 @@
 	var/trash_item = /obj/item/trash/pillpacket
 	refill_types = null
 	refill_sound = null
-	flags_storage = BYPASS_VENDOR_CHECK
+	flags_storage = BYPASS_VENDOR_CHECK|BYPASS_CRYO_CHECK
 
 /obj/item/storage/pill_bottle/packet/remove_from_storage(obj/item/item, atom/new_location, mob/user)
 	. = ..()

diff --git a/code/game/objects/machinery/cryopod.dm b/code/game/objects/machinery/cryopod.dm
@@ -196,8 +196,9 @@
 	GLOB.cryoed_item_list += src
 
 /obj/item/storage/store_in_cryo()
-	for(var/obj/item/I AS in src)
-		I.store_in_cryo()
+	if(!(flags_storage & BYPASS_CRYO_CHECK))
+		for(var/obj/item/I AS in src)
+			I.store_in_cryo()
 	return ..()
 
 /obj/machinery/cryopod/attackby(obj/item/I, mob/user, params)