diff --git a/code/modules/cargo/items/cargo_items.dm b/code/modules/cargo/items/cargo_items.dm index 548c46ce161..3fe31edbaf8 100644 --- a/code/modules/cargo/items/cargo_items.dm +++ b/code/modules/cargo/items/cargo_items.dm @@ -1,4 +1,3 @@ - /// Master singleton for cargo items. Contains data relating to what a cargo item spawns, price, desc, supplier, access, etc. /singleton/cargo_item /// The category this item belongs to. This MUST match the cargo_category "name" this item belongs to. diff --git a/code/modules/cargo/items/cartridges.dm b/code/modules/cargo/items/cartridges.dm index 9d3b7d6e6f1..9902c57000b 100644 --- a/code/modules/cargo/items/cartridges.dm +++ b/code/modules/cargo/items/cartridges.dm @@ -45,7 +45,7 @@ name = "drink cartridge - champagne" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 55 + price = 72 items = list( /obj/item/reagent_containers/chem_disp_cartridge/champagne ) @@ -59,7 +59,7 @@ name = "drink cartridge - coffee" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 24 + price = 20 items = list( /obj/item/reagent_containers/chem_disp_cartridge/coffee ) @@ -73,7 +73,7 @@ name = "drink cartridge - cognac" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 55 + price = 65 items = list( /obj/item/reagent_containers/chem_disp_cartridge/cognac ) @@ -101,7 +101,7 @@ name = "drink cartridge - cream" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 24 items = list( /obj/item/reagent_containers/chem_disp_cartridge/cream ) @@ -129,7 +129,7 @@ name = "drink cartridge - gin" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/gin ) @@ -143,7 +143,7 @@ name = "drink cartridge - ice" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 8 items = list( /obj/item/reagent_containers/chem_disp_cartridge/ice ) @@ -227,7 +227,7 @@ name = "drink cartridge - orange juice" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 22 items = list( /obj/item/reagent_containers/chem_disp_cartridge/orange ) @@ -241,7 +241,7 @@ name = "drink cartridge - rum" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 50 items = list( /obj/item/reagent_containers/chem_disp_cartridge/rum ) @@ -269,7 +269,7 @@ name = "drink cartridge - soda water" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 12 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sodawater ) @@ -283,7 +283,7 @@ name = "drink cartridge - Vacuum Fizz" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 15 items = list( /obj/item/reagent_containers/chem_disp_cartridge/spaceup ) @@ -311,7 +311,7 @@ name = "drink cartridge - tequila" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tequila ) @@ -325,7 +325,7 @@ name = "drink cartridge - tonic" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tonic ) @@ -339,7 +339,7 @@ name = "drink cartridge - vermouth" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 28 items = list( /obj/item/reagent_containers/chem_disp_cartridge/vermouth ) @@ -353,7 +353,7 @@ name = "drink cartridge - vodka" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 50 items = list( /obj/item/reagent_containers/chem_disp_cartridge/vodka ) @@ -367,7 +367,7 @@ name = "drink cartridge - watermelon" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 18 + price = 20 items = list( /obj/item/reagent_containers/chem_disp_cartridge/watermelon ) @@ -381,7 +381,7 @@ name = "drink cartridge - whiskey" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 45 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/whiskey ) @@ -395,7 +395,7 @@ name = "drink cartridge - wine" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 55 + price = 42 items = list( /obj/item/reagent_containers/chem_disp_cartridge/wine ) @@ -691,7 +691,7 @@ name = "chemical cartridge - water" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 1.50 + price = 10 items = list( /obj/item/reagent_containers/chem_disp_cartridge/water ) diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index af670f2f1d7..93975cc5ffd 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -180,9 +180,51 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/producebox_adhomai + category = "hospitality" + name = "adhomian produce box" + supplier = "zharkov" + description = "A large box of random, leftover produce from Adhomai." + price = 45 + items = list( + /obj/item/storage/box/large/produce/adhomai + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/producebox_moghes + category = "hospitality" + name = "moghresian produce box" + supplier = "hephaestus" + description = "A large box of random, leftover produce from Moghes." + price = 45 + items = list( + /obj/item/storage/box/large/produce/moghes + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/producebox_nralakk + category = "hospitality" + name = "skrellian produce box" + supplier = "hephaestus" + description = "A large box of random, leftover produce from various Skrellian worlds." + price = 50 + items = list( + /obj/item/storage/box/large/produce/nralakk + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/spacespices category = "hospitality" - name = "space spices" + name = "space spices (x2)" supplier = "getmore" description = "An exotic blend of spices for cooking. It must flow." price = 15 @@ -192,7 +234,7 @@ access = 0 container_type = "freezer" groupable = TRUE - spawn_amount = 1 + spawn_amount = 2 /singleton/cargo_item/sliced_bread category = "hospitality" diff --git a/code/modules/cargo/items/hydroponics.dm b/code/modules/cargo/items/hydroponics.dm index b4d01b762d3..d641bbbe73c 100644 --- a/code/modules/cargo/items/hydroponics.dm +++ b/code/modules/cargo/items/hydroponics.dm @@ -73,7 +73,7 @@ name = "cat" supplier = "molinaris" description = "A domesticated, feline pet. Has a tendency to adopt crewmembers." - price = 150 + price = 350 items = list( /mob/living/simple_animal/cat ) @@ -87,7 +87,7 @@ name = "chicken" supplier = "molinaris" description = "Adorable! They make such a racket though." - price = 30 + price = 80 items = list( /mob/living/simple_animal/chick ) @@ -115,7 +115,7 @@ name = "cow" supplier = "molinaris" description = "Known for their milk, just don't tip them over." - price = 1200 + price = 800 items = list( /mob/living/simple_animal/cow ) @@ -124,6 +124,62 @@ groupable = FALSE spawn_amount = 1 +/singleton/cargo_item/icetunneler + category = "hydroponics" + name = "ice tunneler" + supplier = "zharkov" + description = "A crate containing a ice tunneler." + price = 700 + items = list( + /obj/structure/largecrate/animal/adhomai + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/goat + category = "hydroponics" + name = "goat" + supplier = "molinaris" + description = "Not known for their pleasant disposition." + price = 400 + items = list( + /mob/living/simple_animal/hostile/retaliate/goat + ) + access = 0 + container_type = "box" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/pig + category = "hydroponics" + name = "pig" + supplier = "molinaris" + description = "Used in the past simply as meat farms, modern people recognize the affectionate side of these bacon factories." + price = 300 + items = list( + /mob/living/simple_animal/pig + ) + access = 0 + container_type = "box" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/hakhma + category = "hydroponics" + name = "hakhma" + supplier = "molinaris" + description = "An oversized insect breed by Scarab colony ships, known for their milk." + price = 800 + items = list( + /mob/living/simple_animal/hakhma + ) + access = 0 + container_type = "box" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/schlorrgoegg category = "hydroponics" name = "schlorrgo egg" @@ -166,34 +222,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/goat - category = "hydroponics" - name = "goat" - supplier = "molinaris" - description = "Not known for their pleasant disposition." - price = 250 - items = list( - /mob/living/simple_animal/hostile/retaliate/goat - ) - access = 0 - container_type = "box" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/hakhma - category = "hydroponics" - name = "hakhma" - supplier = "molinaris" - description = "An oversized insect breed by Scarab colony ships, known for their milk." - price = 300 - items = list( - /mob/living/simple_animal/hakhma - ) - access = 0 - container_type = "box" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/honeyextractor category = "hydroponics" name = "honey extractor" @@ -213,7 +241,7 @@ name = "hydroponics tray" supplier = "nanotrasen" description = "A safe space to raise your plants." - price = 50 + price = 100 items = list( /obj/machinery/portable_atmospherics/hydroponics ) @@ -222,20 +250,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/icetunneler - category = "hydroponics" - name = "ice tunneler" - supplier = "zharkov" - description = "A crate containing a ice tunneler." - price = 300 - items = list( - /obj/structure/largecrate/animal/adhomai - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/leathergloves category = "hydroponics" name = "leather gloves" diff --git a/code/modules/cargo/items/medical.dm b/code/modules/cargo/items/medical.dm index 3ea0c165fe4..dc5597a9df9 100644 --- a/code/modules/cargo/items/medical.dm +++ b/code/modules/cargo/items/medical.dm @@ -74,7 +74,7 @@ /singleton/cargo_item/oxygendeprivationfirstaid category = "medical" - name = "oxygen deprivation first aid" + name = "oxygen deprivation first aid kit" supplier = "nanotrasen" description = "An emergency medical kit for oxygen deprivation, including cardiac arrest." price = 150 @@ -88,7 +88,7 @@ /singleton/cargo_item/toxinfirstaid category = "medical" - name = "toxin first aid" + name = "toxin first aid kit" supplier = "nanotrasen" description = "An emergency medical kit for toxin exposure." price = 150 @@ -102,7 +102,7 @@ /singleton/cargo_item/radfirstaid category = "medical" - name = "radiation first aid" + name = "radiation first aid kit" supplier = "nanotrasen" description = "An emergency medical kit for severe radiation exposure." price = 150 @@ -119,7 +119,7 @@ name = "O- blood pack (x2)" supplier = "zeng_hu" description = "A blood pack filled with universally-compatible O- Blood." - price = 800 + price = 600 items = list( /obj/item/reagent_containers/blood/OMinus ) @@ -130,17 +130,17 @@ /singleton/cargo_item/bloodpack_sbs category = "medical" - name = "SBS blood pack (x1)" + name = "SBS blood pack (x2)" supplier = "zeng_hu" description = "A blood pack filled with Synthetic Blood Substitute. WARNING: Not compatible with organic blood!" - price = 675 + price = 475 items = list( /obj/item/reagent_containers/blood/sbs ) access = ACCESS_MEDICAL container_type = "freezer" groupable = TRUE - spawn_amount = 1 + spawn_amount = 2 /singleton/cargo_item/bloodpacksbags category = "medical" @@ -154,35 +154,7 @@ access = ACCESS_MEDICAL container_type = "crate" groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/dexplus_vial - category = "medical" - name = "dexalin plus vial" - supplier = "nanotrasen" - description = "A vial that comes with 15 units of Dexalin Plus, an advanced chemical used to rapidly oxygenate blood cells." - price = 900 - items = list( - /obj/item/reagent_containers/glass/beaker/vial/dexalin_plus - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/peridaxon_vial - category = "medical" - name = "peridaxon vial" - supplier = "nanotrasen" - description = "A vial that comes with 15 units of Peridaxon, an advanced organ regenerative compound." - price = 1300 - items = list( - /obj/item/reagent_containers/glass/beaker/vial/peridaxon - ) - access = ACCESS_MEDICAL - container_type = "crate" - groupable = TRUE - spawn_amount = 1 + spawn_amount = 3 /singleton/cargo_item/pneumalin_inhalers category = "medical" @@ -324,20 +296,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/arithrazine_vial - category = "medical" - name = "arithrazine vial" - supplier = "nanotrasen" - description = "A bottle containing Arithrazine, a potent anti-radiation medication." - price = 750 - items = list( - /obj/item/reagent_containers/glass/beaker/vial/arithrazine - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/inaprovaline_bottle category = "medical" name = "inaprovaline bottle" @@ -394,6 +352,48 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/arithrazine_vial + category = "medical" + name = "arithrazine vial" + supplier = "nanotrasen" + description = "A bottle containing Arithrazine, a potent anti-radiation medication." + price = 750 + items = list( + /obj/item/reagent_containers/glass/beaker/vial/arithrazine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/dexplus_vial + category = "medical" + name = "dexalin plus vial" + supplier = "nanotrasen" + description = "A vial that comes with 15 units of Dexalin Plus, an advanced chemical used to rapidly oxygenate blood cells." + price = 900 + items = list( + /obj/item/reagent_containers/glass/beaker/vial/dexalin_plus + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/peridaxon_vial + category = "medical" + name = "peridaxon vial" + supplier = "nanotrasen" + description = "A vial that comes with 15 units of Peridaxon, an advanced organ regenerative compound." + price = 1300 + items = list( + /obj/item/reagent_containers/glass/beaker/vial/peridaxon + ) + access = ACCESS_MEDICAL + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/medicalbelt category = "medical" name = "medical belt" @@ -492,20 +492,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/nanopaste - category = "medical" - name = "nanopaste" - supplier = "zeng_hu" - description = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." - price = 750 - items = list( - /obj/item/stack/nanopaste - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/pillbottles category = "medical" name = "pill bottles" @@ -751,7 +737,7 @@ name = "organ cooler" supplier = "zeng_hu" description = "A sealed, cooled container to keep organs from decaying." - price = 300 + price = 80 items = list( /obj/item/storage/box/unique/freezer/organcooler ) @@ -759,3 +745,18 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/iv_stand + category = "medical" + name = "IV stand" + supplier = "zeng_hu" + description = "An intravenous drip stand used for hooking up IV bags. It also features an emergency positive pressure system for breathing-compromised patients. Comes with a breath mask. Tank or IV bags not included." + price = 150 + items = list( + /obj/machinery/iv_drip, + /obj/item/clothing/mask/breath/medical + ) + access = ACCESS_MEDICAL + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/miscellaneous.dm b/code/modules/cargo/items/miscellaneous.dm index 44d2a7b5da2..e2019216535 100644 --- a/code/modules/cargo/items/miscellaneous.dm +++ b/code/modules/cargo/items/miscellaneous.dm @@ -40,3 +40,35 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/camping_set + category = "miscellaneous" + name = "camping set" + supplier = "orion" + description = "A set of camping supplies for two. For your lovely getaway to paradise. Or hell, whichever is your fancy. Contains a tent, two sleeping bags, two folding chairs and a folding table." + price = 500 + items = list( + /obj/item/tent, + /obj/item/sleeping_bag, + /obj/item/sleeping_bag, + /obj/item/material/stool/chair/folding/camping, + /obj/item/material/stool/chair/folding/camping, + /obj/item/material/folding_table, + ) + access = 0 + container_type = "box" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/sleeping_bag + category = "miscellaneous" + name = "sleeping bag" + supplier = "orion" + description = "A sleeping bag, for sleeping in. Great for a night under the stars." + price = 12.50 + items = list( + /obj/item/sleeping_bag, + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/operations.dm b/code/modules/cargo/items/operations.dm index 18b15942094..8c150de5ccc 100644 --- a/code/modules/cargo/items/operations.dm +++ b/code/modules/cargo/items/operations.dm @@ -14,20 +14,6 @@ groupable = TRUE spawn_amount = 2 -/singleton/cargo_item/camera - category = "operations" - name = "camera" - supplier = "nanotrasen" - description = "A polaroid camera. 10 photos left." - price = 45 - items = list( - /obj/item/device/camera - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/cargotraintrolley category = "operations" name = "cargo train trolley" @@ -112,20 +98,6 @@ groupable = FALSE spawn_amount = 1 -/singleton/cargo_item/filmcartridge - category = "operations" - name = "film cartridge" - supplier = "nanotrasen" - description = "A camera film cartridge. Insert it into a camera to reload it." - price = 8 - items = list( - /obj/item/device/camera_film - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/flare category = "operations" name = "flare" @@ -276,7 +248,7 @@ /singleton/cargo_item/poster19 category = "operations" - name = "rolled-up poster - No. 19" + name = "random poster" supplier = "orion" description = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface." price = 3.50 diff --git a/code/modules/cargo/items/recreation.dm b/code/modules/cargo/items/recreation.dm index 9a848c15955..3de5c1afe29 100644 --- a/code/modules/cargo/items/recreation.dm +++ b/code/modules/cargo/items/recreation.dm @@ -368,3 +368,17 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/game_helm + category = "recreation" + name = "InUs Game-Helm" + supplier = "orion" + description = "A popular portable gaming console with thousands of games available for play." + price = 150 + items = list( + /obj/item/gamehelm + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/robotics.dm b/code/modules/cargo/items/robotics.dm index 81efd4bbaad..0ea3ccdd436 100644 --- a/code/modules/cargo/items/robotics.dm +++ b/code/modules/cargo/items/robotics.dm @@ -1,3 +1,45 @@ +/singleton/cargo_item/cleanbot + category = "robotics" + name = "Cleanbot" + supplier = "hephaestus" + description = "A little cleaning robot, consisting of a bucket, a proximity sensor, and a prosthetic arm. It looks excited to clean!" + price = 175 + items = list( + /mob/living/bot/cleanbot + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/farmbot + category = "robotics" + name = "Farmbot" + supplier = "hephaestus" + description = "The botanist's best friend. Various farming equipment seems haphazardly attached to it." + price = 220 + items = list( + /mob/living/bot/farmbot + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/medibot + category = "robotics" + name = "Medibot" + supplier = "nanotrasen" + description = "A little medical robot. He looks somewhat underwhelmed." + price = 400 + items = list( + /mob/living/bot/medbot + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/positronicbrain category = "robotics" name = "positronic brain" @@ -124,3 +166,17 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/nanopaste + category = "robotics" + name = "nanopaste" + supplier = "zeng_hu" + description = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." + price = 750 + items = list( + /obj/item/stack/nanopaste + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/security.dm b/code/modules/cargo/items/security.dm index 7da20366b9e..51bfd62f32e 100644 --- a/code/modules/cargo/items/security.dm +++ b/code/modules/cargo/items/security.dm @@ -217,7 +217,7 @@ name = "standard plate carrier" supplier = "zavodskoi" description = "A plate carrier with basic accessories and an armor plate." - price = 800 + price = 600 items = list( /obj/item/clothing/suit/armor/carrier/officer ) @@ -562,3 +562,17 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/autopsy_scanner + category = "security" + name = "autopsy scanner" + supplier = "nanotrasen" + description = "A handheld autopsy scanner that extracts information on wounds." + price = 250 + items = list( + /obj/item/autopsy_scanner + ) + access = ACCESS_FORENSICS_LOCKERS + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/supply.dm b/code/modules/cargo/items/supply.dm index 3eb23dfdfc9..9c1567655e4 100644 --- a/code/modules/cargo/items/supply.dm +++ b/code/modules/cargo/items/supply.dm @@ -12,6 +12,34 @@ groupable = TRUE spawn_amount = 5 +/singleton/cargo_item/package_wrapper + category = "supply" + name = "package wrapping paper (x2)" + supplier = "orion" + description = "Package wrapping paper, for deliveries." + price = 10 + items = list( + /obj/item/stack/packageWrap + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 2 + +/singleton/cargo_item/gift_wrapper + category = "supply" + name = "gift wrapping paper (x2)" + supplier = "orion" + description = "Gift wrapping paper, for festive activities." + price = 10 + items = list( + /obj/item/stack/wrapping_paper + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 2 + /singleton/cargo_item/bucket category = "supply" name = "bucket" @@ -44,7 +72,7 @@ category = "supply" name = "clipboard" supplier = "orion" - description = "The timeless prop for looking like your working." + description = "The timeless prop for looking like you're working." price = 12 items = list( /obj/item/clipboard @@ -56,9 +84,9 @@ /singleton/cargo_item/folderblue category = "supply" - name = "blue folder" + name = "blue folders (x5)" supplier = "orion" - description = "A blue folder." + description = "Five blue folders." price = 4.50 items = list( /obj/item/folder/blue @@ -66,13 +94,13 @@ access = 0 container_type = "crate" groupable = TRUE - spawn_amount = 1 + spawn_amount = 5 /singleton/cargo_item/folderyellow category = "supply" - name = "yellow folder" + name = "yellow folders (x5)" supplier = "orion" - description = "A yellow folder." + description = "Five yellow folders." price = 4.50 items = list( /obj/item/folder/yellow @@ -80,13 +108,13 @@ access = 0 container_type = "crate" groupable = TRUE - spawn_amount = 1 + spawn_amount = 5 /singleton/cargo_item/folderred category = "supply" - name = "red folder" + name = "red folders (x5)" supplier = "orion" - description = "A red folder." + description = "Five red folders." price = 4.50 items = list( /obj/item/folder/red @@ -94,13 +122,13 @@ access = 0 container_type = "crate" groupable = TRUE - spawn_amount = 1 + spawn_amount = 5 /singleton/cargo_item/folderwhite category = "supply" - name = "white folder" + name = "white folders (x5)" supplier = "orion" - description = "A white folder." + description = "Five white folders." price = 4.50 items = list( /obj/item/folder/white @@ -108,7 +136,7 @@ access = 0 container_type = "crate" groupable = TRUE - spawn_amount = 1 + spawn_amount = 5 /singleton/cargo_item/handlabeler category = "supply" @@ -126,7 +154,7 @@ /singleton/cargo_item/inflatableduck category = "supply" - name = "inflatable duck" + name = "rubber duck" supplier = "nanotrasen" description = "No bother to sink or swim when you can just float!" price = 4.50 @@ -250,6 +278,104 @@ groupable = TRUE spawn_amount = 2 +/singleton/cargo_item/camera + category = "supply" + name = "camera" + supplier = "nanotrasen" + description = "A polaroid camera. 10 photos left." + price = 45 + items = list( + /obj/item/device/camera + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/filmcartridge + category = "supply" + name = "film cartridge" + supplier = "nanotrasen" + description = "A camera film cartridge. Insert it into a camera to reload it." + price = 8 + items = list( + /obj/item/device/camera_film + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/pda + category = "supply" + name = "PDA" + supplier = "nanotrasen" + description = "A personal data assistant. Useful for replacing lost ones, or ordering for new crew." + price = 200 + items = list( + /obj/item/modular_computer/handheld/pda + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/taperecorder + category = "supply" + name = "universal recorder" + supplier = "nanotrasen" + description = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." + price = 20 + items = list( + /obj/item/device/taperecorder + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/paperscanner + category = "supply" + name = "paper scanner" + supplier = "nanotrasen" + description = "A simple device that can be used to scan paper or paper bundles in order to digitize them." + price = 15 + items = list( + /obj/item/paper_scanner + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/datadisk + category = "supply" + name = "basic data disk" + supplier = "nanotrasen" + description = "Small diskette with imprinted photonic circuits that can be used to store data. Its capacity is 16 GQ." + price = 8.50 + items = list( + /obj/item/computer_hardware/hard_drive/portable + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/datadisk_adv + category = "supply" + name = "advanced data disk" + supplier = "nanotrasen" + description = "Small diskette with imprinted high-density photonic circuits that can be used to store data. Its capacity is 64 GQ." + price = 20 + items = list( + /obj/item/computer_hardware/hard_drive/portable/advanced + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/potted_plant_small category = "supply" name = "small potted plant" diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index b86dbdb6ca3..976271a8df6 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(minevendor_list, list( new /datum/data/mining_equipment(/obj/item/stack/flag/yellow, 10, 50), new /datum/data/mining_equipment(/obj/item/stack/flag/purple, 10, 50), new /datum/data/mining_equipment(/obj/item/storage/bag/ore, 25, 50), - new /datum/data/mining_equipment(pick(subtypesof(/obj/item/pizzabox)), 25, 50), + new /datum/data/mining_equipment(pick(subtypesof(/obj/item/pizzabox)), 2, 50), new /datum/data/mining_equipment(/obj/item/device/flashlight/lantern, 10, 75), new /datum/data/mining_equipment(/obj/item/shovel, 15, 100), new /datum/data/mining_equipment(/obj/item/pickaxe, 10, 100), diff --git a/html/changelogs/nauticall-cargochanges.yml b/html/changelogs/nauticall-cargochanges.yml new file mode 100644 index 00000000000..9e90a58d50c --- /dev/null +++ b/html/changelogs/nauticall-cargochanges.yml @@ -0,0 +1,63 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: nauticall + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "The following items have been added to cargo (1): pig, Cleanbot, Farmbot, Medibot, autopsy scanner, package/gift wrapping paper, PDA, universal (tape) recorder." + - rscadd: "The following items have been added to cargo (2): IV stand, camping set & sleeping bags, InUs Game-Helm, paper scanner, data drives, produce boxes." + - qol: "Moved certain cargo items to other categories." + - qol: "Modified the pricing of blood, hydroponics trays, certain drink canisters, organ coolers, animals, and some security items. Made folders and SBS blood come in multiple per order." + - spellcheck: "Miscellaneous spellchecks and grammar fixes in cargo." + - rscdel: "Capped the amount of pizza boxes available in mining vendors to 2."