From 5883124e0d626fe98ec3e590ac032988c6de9e18 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 27 Jan 2020 20:47:28 -0500 Subject: [PATCH] Removals. Removed: CBT Interrogation Pastry Crate Candlelit Dinner Crate Pest Control Crate --- code/modules/cargo/packs/misc.dm | 44 ----------------------------- code/modules/cargo/packs/organic.dm | 15 ---------- code/modules/cargo/packs/service.dm | 14 --------- 3 files changed, 73 deletions(-) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index ace9b241c3..b53b7761e5 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -119,37 +119,6 @@ //////////////////////////////// Entertainment /////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/misc/candlelitdinner - name = "Candlelit Dinner Crate" //This is meant for greenshifts Ghommie, reeeee. - desc = "Need to organise a date night? Set up a fancy room for it with this luxurious crate filled with romance! Contains 40 tiles of classic, blue, black, and green carpeting, materials to build chairs, several boxes of candles, eight bottles of wine, two boxes of drinking glasses, ten metal rods, twenty wood, and twenty metal." - cost = 3200 // 200 for each wine bottle, 450 for metal/wood, 800 + 700 + 450 = 2750. - contains = list(/obj/item/storage/fancy/candle_box, - /obj/item/storage/fancy/candle_box, - /obj/item/storage/fancy/candle_box, - /obj/item/storage/fancy/candle_box, - /obj/item/stack/tile/carpet/twenty, - /obj/item/stack/tile/carpet/twenty, - /obj/item/stack/tile/carpet/blue/twenty, - /obj/item/stack/tile/carpet/blue/twenty, - /obj/item/stack/tile/carpet/royalblack/twenty, - /obj/item/stack/tile/carpet/royalblack/twenty, - /obj/item/stack/tile/carpet/green/twenty, - /obj/item/stack/tile/carpet/green/twenty, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/reagent_containers/food/drinks/bottle/wine, - /obj/item/stack/rods/ten, - /obj/item/stack/sheet/metal/twenty, - /obj/item/stack/sheet/mineral/wood/twenty, - /obj/item/storage/box/drinkingglasses, - /obj/item/storage/box/drinkingglasses) - crate_name = "romance crate" - /datum/supply_pack/misc/randombedsheets name = "Bedsheet Crate (R)" desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" @@ -270,19 +239,6 @@ /obj/item/storage/box/matches) crate_name = "candle crate" -/datum/supply_pack/misc/interrogation - name = "CBT Interrogation Crate" - desc = "CBT is a special term used to describe an intricate form of information extraction. We can't tell you how to use this, but we can give you the tools required to get what you need." - contraband = TRUE - cost = 2400 - contains = list(/mob/living/simple_animal/chicken, - /obj/item/toy/beach_ball/holoball, - /obj/item/melee/baton/cattleprod, - /obj/item/soap/deluxe, - /obj/item/stock_parts/cell/high) - crate_name = "interrogation crate" - crate_type = /obj/structure/closet/crate/large - /datum/supply_pack/misc/exoticfootwear name = "Exotic Footwear Crate" desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index f6a9b11e71..cbab3c0537 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -89,21 +89,6 @@ /obj/item/reagent_containers/glass/bottle/capsaicin) crate_name = "fiesta crate" -/datum/supply_pack/organic/pastry - name = "Pastry Crate" - desc = "Cupcakes, Cake, and Donuts! What a sweet deal! Contains two cakes, six cupcakes, and one box of donuts." - cost = 5000 - contains = list(/obj/item/reagent_containers/food/snacks/store/cake/plain, - /obj/item/reagent_containers/food/snacks/store/cake/plain, - /obj/item/reagent_containers/food/snacks/cherrycupcake, - /obj/item/reagent_containers/food/snacks/cherrycupcake, - /obj/item/reagent_containers/food/snacks/bluecherrycupcake, - /obj/item/reagent_containers/food/snacks/bluecherrycupcake, - /obj/item/reagent_containers/food/snacks/strawberrycupcake, - /obj/item/reagent_containers/food/snacks/strawberrycupcake, - /obj/item/storage/fancy/donut_box) - crate_name = "pastry crate" - /datum/supply_pack/organic/pizza name = "Pizza Crate" desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!" diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 16703133f6..942720dd6b 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -272,17 +272,3 @@ crate_name = "janitorial cart crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/service/janitor/pestcontrol - name = "Pest Control Crate" - desc = "Show those dirty rats, and space bears who's boss with morally ambiguous pest control kit. Contains mouse traps, pest killer, unfinished grenades, bamboo cuttings, cable coil, and a bear trap." - cost = 5000 - contraband = TRUE - contains = list(/obj/item/reagent_containers/glass/bottle/killer/pestkiller, - /obj/item/grenade/chem_grenade, - /obj/item/grenade/chem_grenade, - /obj/item/grenade/chem_grenade, - /obj/item/grenade/chem_grenade, - /obj/item/stack/sheet/mineral/bamboo/twenty, - /obj/item/storage/box/mousetraps, - /obj/item/stack/cable_coil/random, - /obj/item/restraints/legcuffs/beartrap)