From 7baa3face9ad5bfe0b00ec80dc75783d6909fbd4 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 27 Jun 2016 19:32:46 +0100 Subject: [PATCH] Adjusts and attempts to normalize cargo costs --- code/datums/supplypacks/atmospherics.dm | 8 ++--- code/datums/supplypacks/contraband.dm | 4 +-- code/datums/supplypacks/costumes.dm | 2 +- code/datums/supplypacks/engineering.dm | 18 ++++++------ code/datums/supplypacks/hospitality.dm | 2 +- code/datums/supplypacks/hydroponics.dm | 16 +++++----- code/datums/supplypacks/medical.dm | 16 +++++----- code/datums/supplypacks/misc.dm | 4 +-- code/datums/supplypacks/munitions.dm | 16 +++++----- code/datums/supplypacks/recreation.dm | 4 +-- code/datums/supplypacks/robotics.dm | 2 +- code/datums/supplypacks/science.dm | 2 +- code/datums/supplypacks/security.dm | 39 +++++++++++++------------ code/datums/supplypacks/supply.dm | 4 +-- code/datums/supplypacks/voidsuits.dm | 6 ++-- 15 files changed, 72 insertions(+), 71 deletions(-) diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 91c85f8ac2..0c8d3748d1 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -52,7 +52,7 @@ /datum/supply_packs/atmos/canister_sleeping_agent name = "N2O gas canister" - cost = 40 + cost = 15 containername = "N2O gas canister crate" containertype = /obj/structure/closet/crate/secure/large access = access_atmospherics @@ -60,7 +60,7 @@ /datum/supply_packs/atmos/canister_carbon_dioxide name = "Carbon dioxide gas canister" - cost = 40 + cost = 15 containername = "CO2 canister crate" containertype = /obj/structure/closet/crate/secure/large access = access_atmospherics @@ -69,7 +69,7 @@ /datum/supply_packs/atmos/air_dispenser contains = list(/obj/machinery/pipedispenser/orderable) name = "Pipe Dispenser" - cost = 35 + cost = 25 containertype = /obj/structure/closet/crate/secure/large containername = "Pipe Dispenser Crate" access = access_atmospherics @@ -77,7 +77,7 @@ /datum/supply_packs/atmos/disposals_dispenser contains = list(/obj/machinery/pipedispenser/disposal/orderable) name = "Disposals Pipe Dispenser" - cost = 35 + cost = 25 containertype = /obj/structure/closet/crate/secure/large containername = "Disposal Dispenser Crate" access = access_atmospherics \ No newline at end of file diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index fa8c237fe8..14761d6cd9 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -14,7 +14,7 @@ ) name = "Contraband crate" - cost = 30 + cost = 25 containertype = /obj/structure/closet/crate containername = "Unlabeled crate" contraband = 1 @@ -28,7 +28,7 @@ /obj/item/weapon/pen/reagent/paralysis, /obj/item/weapon/grenade/chem_grenade/incendiary ) - cost = 20 + cost = 25 containertype = /obj/structure/closet/crate containername = "Special Ops crate" hidden = 1 diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm index b5a494321a..cb5a950bfe 100644 --- a/code/datums/supplypacks/costumes.dm +++ b/code/datums/supplypacks/costumes.dm @@ -124,7 +124,7 @@ datum/supply_packs/costumes/witch /datum/supply_packs/randomised/costumes/costume_hats name = "Costume hats" containername = "Actor hats crate" - containertype = /obj/structure/closet + containertype = /obj/structure/closet/crate cost = 10 num_contained = 3 contains = list( diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 900419d0d3..fd3c130b61 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -29,7 +29,7 @@ /obj/item/weapon/cell = 2, /obj/item/weapon/cell/high = 2 ) - cost = 15 + cost = 10 containertype = /obj/structure/closet/crate containername = "Electrical maintenance crate" @@ -48,7 +48,7 @@ /datum/supply_packs/eng/fueltank name = "Fuel tank crate" contains = list(/obj/structure/reagent_dispensers/fueltank) - cost = 8 + cost = 10 containertype = /obj/structure/largecrate containername = "fuel tank crate" @@ -110,7 +110,7 @@ /datum/supply_packs/eng/shield_gen contains = list(/obj/item/weapon/circuitboard/shield_gen) name = "Bubble shield generator circuitry" - cost = 50 + cost = 30 containertype = /obj/structure/closet/crate/secure containername = "bubble shield generator circuitry crate" access = access_ce @@ -118,7 +118,7 @@ /datum/supply_packs/eng/shield_gen_ex contains = list(/obj/item/weapon/circuitboard/shield_gen_ex) name = "Hull shield generator circuitry" - cost = 50 + cost = 30 containertype = /obj/structure/closet/crate/secure containername = "hull shield generator circuitry crate" access = access_ce @@ -126,7 +126,7 @@ /datum/supply_packs/eng/shield_cap contains = list(/obj/item/weapon/circuitboard/shield_cap) name = "Bubble shield capacitor circuitry" - cost = 50 + cost = 30 containertype = /obj/structure/closet/crate/secure containername = "shield capacitor circuitry crate" access = access_ce @@ -142,7 +142,7 @@ /datum/supply_packs/eng/teg contains = list(/obj/machinery/power/generator) name = "Mark I Thermoelectric Generator" - cost = 75 + cost = 50 containertype = /obj/structure/closet/crate/secure/large containername = "Mk1 TEG crate" access = access_engine @@ -150,7 +150,7 @@ /datum/supply_packs/eng/circulator contains = list(/obj/machinery/atmospherics/binary/circulator) name = "Binary atmospheric circulator" - cost = 60 + cost = 50 containertype = /obj/structure/closet/crate/secure/large containername = "Atmospheric circulator crate" access = access_engine @@ -167,7 +167,7 @@ /datum/supply_packs/eng/pacman_parts name = "P.A.C.M.A.N. portable generator parts" - cost = 45 + cost = 25 containername = "P.A.C.M.A.N. Portable Generator Construction Kit" containertype = /obj/structure/closet/crate/secure access = access_tech_storage @@ -180,7 +180,7 @@ /datum/supply_packs/eng/super_pacman_parts name = "Super P.A.C.M.A.N. portable generator parts" - cost = 55 + cost = 35 containername = "Super P.A.C.M.A.N. portable generator construction kit" containertype = /obj/structure/closet/crate/secure access = access_tech_storage diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm index 6dd421b243..0e245f1921 100644 --- a/code/datums/supplypacks/hospitality.dm +++ b/code/datums/supplypacks/hospitality.dm @@ -22,7 +22,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4, ) - cost = 20 + cost = 10 containertype = /obj/structure/closet/crate containername = "Party equipment" diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index a9a26fd561..25f06143d0 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -17,21 +17,21 @@ /datum/supply_packs/hydro/farwa name = "Farwa crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes) - cost = 30 + cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Farwa crate" /datum/supply_packs/hydro/neara name = "Neaera crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes) - cost = 30 + cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Neaera crate" /datum/supply_packs/hydro/stok name = "Stok crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes) - cost = 30 + cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Stok crate" @@ -55,14 +55,14 @@ /obj/item/weapon/material/minihoe, /obj/item/weapon/storage/box/botanydisk ) - cost = 15 + cost = 20 containertype = /obj/structure/closet/crate/hydroponics containername = "Hydroponics crate" access = access_hydroponics /datum/supply_packs/hydro/cow name = "Cow crate" - cost = 30 + cost = 25 containertype = /obj/structure/largecrate/animal/cow containername = "Cow crate" access = access_hydroponics @@ -76,7 +76,7 @@ /datum/supply_packs/hydro/chicken name = "Chicken crate" - cost = 20 + cost = 25 containertype = /obj/structure/largecrate/animal/chick containername = "Chicken crate" access = access_hydroponics @@ -123,7 +123,7 @@ /datum/supply_packs/hydro/watertank name = "Water tank crate" contains = list(/obj/structure/reagent_dispensers/watertank) - cost = 8 + cost = 10 containertype = /obj/structure/largecrate containername = "water tank crate" @@ -142,7 +142,7 @@ /datum/supply_packs/hydro/tray name = "Empty hydroponics tray" - cost = 30 + cost = 20 containertype = /obj/structure/closet/crate/hydroponics containername = "Hydroponics tray crate" contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0}) diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index c7cc7dc575..3972114440 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -42,7 +42,7 @@ /datum/supply_packs/med/cryobag name = "Stasis bag crate" contains = list(/obj/item/bodybag/cryobag = 3) - cost = 50 + cost = 40 containertype = /obj/structure/closet/crate/medical containername = "Stasis bag crate" @@ -75,7 +75,7 @@ /obj/item/weapon/storage/box/gloves, /obj/item/weapon/storage/belt/medical = 3 ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate" containername = "Sterile equipment crate" @@ -87,7 +87,7 @@ /obj/item/device/radio/headset/headset_med/alt = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3 ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Medical surplus equipment" access = access_medical @@ -111,7 +111,7 @@ /obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/syringe ) - cost = 60 + cost = 50 containertype = "/obj/structure/closet/crate/secure" containername = "Chief medical officer equipment" access = access_cmo @@ -157,7 +157,7 @@ /obj/item/weapon/storage/box/pillbottles, /obj/item/weapon/reagent_containers/syringe ) - cost = 15 + cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Chemist equipment" access = access_chemistry @@ -204,7 +204,7 @@ /obj/item/weapon/pen, /obj/item/weapon/cartridge/medical ) - cost = 15 + cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Psychiatrist equipment" access = access_psychiatrist @@ -225,7 +225,7 @@ /obj/item/weapon/storage/box/masks, /obj/item/weapon/storage/box/gloves ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Medical scrubs crate" access = access_medical_equip @@ -269,7 +269,7 @@ /obj/item/weapon/storage/box/masks, /obj/item/weapon/storage/box/gloves ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Medical uniform crate" access = access_medical_equip diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 80c25b48a3..21b8481854 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -67,7 +67,7 @@ /obj/item/clothing/accessory/storage/white_drop_pouches, /obj/item/clothing/accessory/storage/webbing ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate" containername = "Webbing crate" @@ -92,6 +92,6 @@ /obj/item/clothing/head/helmet/space/emergency = 4, /obj/item/clothing/mask/gas = 4 ) - cost = 45 + cost = 35 containertype = /obj/structure/closet/crate/internals containername = "Emergency crate" \ No newline at end of file diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index a33c9accac..8edee72239 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -40,7 +40,7 @@ contains = list( /obj/item/weapon/gun/energy/xray = 2, /obj/item/weapon/shield/energy = 2) - cost = 125 + cost = 100 containertype = /obj/structure/closet/crate/secure/weapon containername = "Experimental weapons crate" access = access_armory @@ -60,7 +60,7 @@ /obj/item/weapon/storage/box/shotgunshells, /obj/item/weapon/gun/projectile/shotgun/pump/combat = 2 ) - cost = 65 + cost = 50 containertype = /obj/structure/closet/crate/secure containername = "Shotgun crate" access = access_armory @@ -68,7 +68,7 @@ /datum/supply_packs/munitions/erifle name = "Energy marksman crate" contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) - cost = 90 + cost = 100 containertype = /obj/structure/closet/crate/secure containername = "Energy marksman crate" access = access_armory @@ -91,7 +91,7 @@ /obj/item/weapon/gun/projectile/automatic/wt550, /obj/item/weapon/gun/projectile/automatic/z8 ) - cost = 90 + cost = 100 containertype = /obj/structure/closet/crate/secure containername = "Automatic weapon crate" access = access_armory @@ -119,12 +119,12 @@ containername = "Weapons crate" /datum/supply_packs/munitions/shotgunammo - name = "Ballistic ammunition crate" + name = "Shotgun ammunition crate" contains = list( /obj/item/weapon/storage/box/shotgunammo = 2, /obj/item/weapon/storage/box/shotgunshells = 2 ) - cost = 60 + cost = 25 containertype = /obj/structure/closet/crate/secure containername = "ballistic ammunition crate" access = access_armory @@ -137,7 +137,7 @@ /obj/item/ammo_magazine/mc9mmt/rubber, /obj/item/ammo_magazine/a556 ) - cost = 20 + cost = 25 containertype = /obj/structure/closet/crate/secure containername = "Automatic weapon ammunition crate" access = access_armory @@ -145,7 +145,7 @@ /datum/supply_packs/munitions/beanbagammo name = "Beanbag shells" contains = list(/obj/item/weapon/storage/box/beanbags = 3) - cost = 30 + cost = 25 containertype = /obj/structure/closet/crate containername = "Beanbag shells" access = null diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm index 18895b48f4..7bfdaaeeb6 100644 --- a/code/datums/supplypacks/recreation.dm +++ b/code/datums/supplypacks/recreation.dm @@ -19,7 +19,7 @@ /obj/item/weapon/material/twohanded/spear/foam = 2, /obj/item/weapon/material/twohanded/fireaxe/foam = 2 ) - cost = 80 + cost = 50 containertype = /obj/structure/closet/crate containername = "foam weapon crate" @@ -33,7 +33,7 @@ ) containertype = /obj/structure/closet containername = "Lasertag Closet" - cost = 20 + cost = 10 /datum/supply_packs/recreation/artscrafts name = "Arts and Crafts supplies" diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm index 090f3d2078..f2ab73b824 100644 --- a/code/datums/supplypacks/robotics.dm +++ b/code/datums/supplypacks/robotics.dm @@ -58,7 +58,7 @@ /obj/item/weapon/circuitboard/mecha/ripley/main, /obj/item/weapon/circuitboard/mecha/ripley/peripherals ) - cost = 30 + cost = 25 containertype = /obj/structure/closet/crate/secure containername = "APLU \"Ripley\" Circuit Crate" access = access_robotics diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm index e95cb2d9cf..d9df7aa9b7 100644 --- a/code/datums/supplypacks/science.dm +++ b/code/datums/supplypacks/science.dm @@ -8,7 +8,7 @@ /datum/supply_packs/sci/coolanttank name = "Coolant tank crate" contains = list(/obj/structure/reagent_dispensers/coolanttank) - cost = 16 + cost = 15 containertype = /obj/structure/largecrate containername = "coolant tank crate" diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 483d8e0c12..6c45e5c036 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -82,7 +82,7 @@ /obj/item/clothing/gloves/arm_guard/bulletproof, /obj/item/clothing/shoes/leg_guard/bulletproof ) - cost = 35 + cost = 40 containertype = /obj/structure/closet/crate/secure containername = "bullet resistant armor set crate" access = access_armory @@ -104,7 +104,7 @@ name = "Tactical suits" containertype = /obj/structure/closet/crate/secure containername = "Tactical Suit Locker" - cost = 60 + cost = 40 access = access_armory contains = list( /obj/item/clothing/under/tactical, @@ -162,7 +162,7 @@ /obj/item/device/radio/headset/headset_sec/alt = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3 ) - cost = 25 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Security surplus equipment" access = null @@ -189,7 +189,7 @@ /obj/item/device/flashlight/maglight, /obj/item/weapon/storage/briefcase/crimekit ) - cost = 40 + cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Forensic equipment" access = access_forensics_lockers @@ -210,7 +210,7 @@ /obj/item/clothing/accessory/badge/holo/detective = 2, /obj/item/clothing/gloves/black = 2 ) - cost = 20 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Investigation clothing" access = access_forensics_lockers @@ -240,7 +240,7 @@ /obj/item/weapon/gun/energy/taser, /obj/item/device/flashlight/maglight ) - cost = 30 + cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Officer equipment" access = access_brig @@ -268,7 +268,7 @@ /obj/item/clothing/head/beret/sec/corporate/warden, /obj/item/device/flashlight/maglight ) - cost = 45 + cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Warden equipment" access = access_armory @@ -294,7 +294,7 @@ /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/device/flashlight/maglight ) - cost = 65 + cost = 50 containertype = "/obj/structure/closet/crate/secure" containername = "Head of security equipment" access = access_hos @@ -314,7 +314,7 @@ /obj/item/clothing/gloves/black = 4, /obj/item/weapon/storage/box/holobadge ) - cost = 20 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Security uniform crate" @@ -335,7 +335,7 @@ /obj/item/clothing/gloves/black = 4, /obj/item/weapon/storage/box/holobadge ) - cost = 20 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Navy blue security uniform crate" @@ -355,21 +355,22 @@ /obj/item/clothing/gloves/black = 4, /obj/item/weapon/storage/box/holobadge ) - cost = 20 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Corporate security uniform crate" /datum/supply_packs/security/biosuit name = "Security biohazard gear" contains = list( - /obj/item/clothing/head/bio_hood/security, - /obj/item/clothing/under/rank/security, - /obj/item/clothing/suit/bio_suit/security, - /obj/item/clothing/shoes/white, - /obj/item/clothing/mask/gas, - /obj/item/weapon/tank/oxygen, - /obj/item/clothing/gloves/latex + /obj/item/clothing/head/bio_hood/security = 3, + /obj/item/clothing/under/rank/security = 3, + /obj/item/clothing/suit/bio_suit/security = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/mask/gas = 3, + /obj/item/weapon/tank/oxygen = 3, + /obj/item/clothing/gloves/latex, + /obj/item/weapon/storage/box/gloves ) - cost = 35 + cost = 50 containertype = "/obj/structure/closet/crate/secure" containername = "Security biohazard gear" diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index e9832b3657..3f143c88d6 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -103,7 +103,7 @@ /obj/item/clothing/glasses/material, /obj/item/clothing/glasses/meson ) - cost = 15 + cost = 10 containertype = "/obj/structure/closet/crate/secure" containername = "Shaft miner equipment" access = access_mining @@ -118,7 +118,7 @@ /datum/supply_packs/supply/cargotrain name = "Cargo Train Tug" contains = list(/obj/vehicle/train/cargo/engine) - cost = 45 + cost = 35 containertype = /obj/structure/largecrate containername = "Cargo Train Tug Crate" diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index 3d37bd171a..6bf5c0f5b3 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -16,7 +16,7 @@ /obj/item/clothing/shoes/magboots = 2, /obj/item/weapon/tank/oxygen = 2, ) - cost = 45 + cost = 40 containertype = "/obj/structure/closet/crate/secure" containername = "Atmospheric voidsuit crate" access = access_atmospherics @@ -58,7 +58,7 @@ /obj/item/clothing/shoes/magboots = 2, /obj/item/weapon/tank/oxygen = 2 ) - cost = 55 + cost = 40 containertype = "/obj/structure/closet/crate/secure" containername = "Security voidsuit crate" @@ -70,7 +70,7 @@ /obj/item/clothing/mask/breath = 2, /obj/item/weapon/tank/oxygen = 2 ) - cost = 35 + cost = 40 containertype = "/obj/structure/closet/crate/secure" containername = "Mining voidsuit crate" access = access_mining \ No newline at end of file