[MIRROR] Fixed the floortile crate, adds them to blackmarket (#1221)

* Fixed the floortile crate, adds them to blackmarket (#81742) tgstation/tgstation#81512 i accidentally added it to the emagged console it should be on contraband now. also added a backpack to present it from interfering. and its available in uplink :cl: add: box with a set of floortile camo, which can be ordered in black market uplink add: also adds a backpack to camouflage fix: i had the crate under emagged console, should be fixed now. /:cl: --------- Co-authored-by: Ghom <[email protected]> * Fixed the floortile crate, adds them to blackmarket --------- Co-authored-by: bigfatbananacyclops <[email protected]> Co-authored-by: Ghom <[email protected]>
Fluffy-Frontier · Mar 1, 2024 · d4a3c7a · d4a3c7a
1 parent 4b7a0e8
commit d4a3c7a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -193,6 +193,12 @@
 	icon_state = "backpack-virology"
 	inhand_icon_state = "viropack"
 
+/obj/item/storage/backpack/floortile
+	name = "floortile backpack"
+	desc = "It's a backpack especially designed for use in floortiles..."
+	icon_state = "floortile_backpack"
+	inhand_icon_state = "backpack"
+
 /obj/item/storage/backpack/ert
 	name = "emergency response team commander backpack"
 	desc = "A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team."

diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm
@@ -196,3 +196,18 @@
 	new /obj/item/clothing/suit/hooded/chaplain_hoodie/divine_archer(src)
 	new /obj/item/clothing/gloves/divine_archer(src)
 	new /obj/item/clothing/shoes/divine_archer(src)
+
+/obj/item/storage/box/floor_camo
+	name = "floor tile camo box"
+	desc = "Thank you for shopping from Camo-J's, our uniquely designed \
+		floor-tile 'NT scum' styled camouflage fatigues is the ultimate \
+		espionage uniform used by the very best. Providing the best \
+		flexibility, with our latest Camo-tech threads. Perfect for \
+		risky-espionage hallway operations. Enjoy our product!"
+
+/obj/item/storage/box/floor_camo/PopulateContents()
+	new /obj/item/clothing/under/syndicate/floortilecamo(src)
+	new /obj/item/clothing/mask/floortilebalaclava(src)
+	new /obj/item/clothing/gloves/combat/floortile(src)
+	new /obj/item/clothing/shoes/jackboots/floortile(src)
+	new /obj/item/storage/backpack/floortile(src)
diff --git a/code/modules/cargo/markets/market_items/clothing.dm b/code/modules/cargo/markets/market_items/clothing.dm
@@ -79,3 +79,19 @@
 	price_max = CARGO_CRATE_VALUE * 1.5
 	stock_max = 5
 	availability_prob = 70
+
+/datum/market_item/clothing/floortileset
+	name = "Floor-tile Camouflage Uniform"
+	desc = "Hey there, looking to surprise somebody? Spy? Steal? Then you're lucky, meet our newest \
+		floor-tile 'NT SCUM' styled camouflage fatigues. This is the ultimate \
+		espionage uniform used by the very best. Providing the best \
+		flexibility, with our latest Camo-tech threads. Perfect for \
+		risky espionage hallway operations. Enjoy our product!"
+	item = /obj/item/storage/box/floor_camo
+	price_min = CARGO_CRATE_VALUE * 0.5
+	price_max = CARGO_CRATE_VALUE
+	stock_max = 3
+	availability_prob = 40
+
+
+
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
@@ -315,17 +315,18 @@
 
 /datum/supply_pack/imports/floortilecamo
 	name = "Floor-tile Camouflage Uniform"
-	desc = "Thank you for shopping from Camo-J's, our uniquely designed \
-		floor-tile 'NT SCUM' styled camouflage fatigues is the ultimate \
+	desc = "Hey there, looking to surprise somebody? Spy? Steal? Then you're lucky, meet our newest \
+		floor-tile 'NT SCUM' styled camouflage fatigues. This is the ultimate \
 		espionage uniform used by the very best. Providing the best \
 		flexibility, with our latest Camo-tech threads. Perfect for \
 		risky espionage hallway operations. Enjoy our product!"
-	hidden = TRUE
+	contraband = TRUE
 	cost = CARGO_CRATE_VALUE * 6
-	contains = list(/obj/item/clothing/under/syndicate/floortilecamo = 4,
-			/obj/item/clothing/mask/floortilebalaclava = 4,
-			/obj/item/clothing/gloves/combat/floortile = 4,
-			/obj/item/clothing/shoes/jackboots/floortile = 4
+	contains = list(/obj/item/clothing/under/syndicate/floortilecamo = 3,
+			/obj/item/clothing/mask/floortilebalaclava = 3,
+			/obj/item/clothing/gloves/combat/floortile = 3,
+			/obj/item/clothing/shoes/jackboots/floortile = 3,
+			/obj/item/storage/backpack/floortile = 3
 	)
 	crate_name = "floortile camouflauge crate"
 	crate_type = /obj/structure/closet/crate/secure/weapon
diff --git a/icons/mob/clothing/back/backpack.dmi b/icons/mob/clothing/back/backpack.dmi
diff --git a/icons/obj/storage/backpack.dmi b/icons/obj/storage/backpack.dmi