shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

Browse Source 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
This commit is contained in:
kevinz000
2019-11-14 16:00:45 -07:00
committed by GitHub
parent 04b9e3fe91 73661cfe52
commit 4c89b8c33f
40 changed files with 1254 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/console.dm
+3 -3
View File
@@ -31,11 +31,11 @@
obj_flags &= ~EMAGGED
/obj/machinery/computer/cargo/proc/get_export_categories()
var/cat = EXPORT_CARGO
. = EXPORT_CARGO
if(contraband)
cat |= EXPORT_CONTRABAND
. |= EXPORT_CONTRABAND
if(obj_flags & EMAGGED)
cat |= EXPORT_EMAG
. |= EXPORT_EMAG
/obj/machinery/computer/cargo/emag_act(mob/user)
. = ..()
code/modules/cargo/export_scanner.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/item/export_scanner
name = "export scanner"
desc = "A device used to check objects against Nanotrasen exports and bounty database."
desc = "A device used to check objects against Nanotrasen exports and bounty database. Sadly can not scan reagents vaule."
icon = 'icons/obj/device.dmi'
icon_state = "export_scanner"
item_state = "radio"
@@ -31,7 +31,7 @@
else
// Before you fix it:
// yes, checking manifests is a part of intended functionality.
var/datum/export_report/ex = export_item_and_contents(O, cargo_console.get_export_categories(), dry_run=TRUE)
var/price = 0
for(var/x in ex.total_amount)
code/modules/cargo/exports.dm
+8 -4
View File
@@ -21,9 +21,10 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
// Simple holder datum to pass export results around
/datum/export_report
var/list/exported_atoms = list() //names of atoms sold/deleted by export
var/list/total_amount = list() //export instance => total count of sold objects of its type, only exists if any were sold
var/list/total_value = list() //export instance => total value of sold objects
var/list/exported_atoms = list()//names of atoms sold/deleted by export
var/list/total_amount = list() //export instance => total count of sold objects of its type, only exists if any were sold
var/list/total_value = list() //export instance => total value of sold objects
var/list/total_reagents = list()//export reagents => into the total vaule of the object sold
// external_report works as "transaction" object, pass same one in if you're doing more than one export in single go
/proc/export_item_and_contents(atom/movable/AM, allowed_categories = EXPORT_CARGO, apply_elastic = TRUE, delete_unsold = TRUE, dry_run=FALSE, datum/export_report/external_report)
@@ -47,6 +48,9 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
sold = E.sell_object(thing, report, dry_run, allowed_categories , apply_elastic)
report.exported_atoms += " [thing.name]"
break
if(thing.reagents)
for(var/datum/reagent/R in thing.reagents.reagent_list)
report.total_reagents[R] += R.volume
if(!dry_run && (sold || delete_unsold))
if(ismob(thing))
thing.investigate_log("deleted through cargo export",INVESTIGATE_CARGO)
@@ -58,7 +62,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
var/unit_name = "" // Unit name. Only used in "Received [total_amount] [name]s [message]." message
var/message = ""
var/cost = 100 // Cost of item, in cargo credits. Must not alow for infinite price dupes, see above.
var/k_elasticity = 1/20 //coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" - CIT EDIT 30 - > 20
var/k_elasticity = 1/300 //coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" - CIT EDIT 1/30 - > 0
var/list/export_types = list() // Type of the exported object. If none, the export datum is considered base type.
var/include_subtypes = TRUE // Set to FALSE to make the datum apply only to a strict type.
var/list/exclude_types = list() // Types excluded from export
code/modules/cargo/exports/food_wine.dm
+181
View File
@@ -0,0 +1,181 @@
/datum/export/food
k_elasticity = 0
include_subtypes = TRUE
/datum/export/booze //Like the kind you bottle!
k_elasticity = 0
unit_name = "brand unit of booze"
include_subtypes = TRUE
/datum/export/food/meat
cost = 5
unit_name = "protein based food"
export_types = list(/obj/item/reagent_containers/food/snacks/meat/slab)
/datum/export/food/raw_cutlets
cost = 3
unit_name = "protein based food"
export_types = list(/obj/item/reagent_containers/food/snacks/meat/rawcutlet)
/datum/export/food/cooked_cutlets
cost = 4
unit_name = "cooked protein based food"
export_types = list(/obj/item/reagent_containers/food/snacks/meat/cutlet)
/datum/export/food/cooked_meat
cost = 8
unit_name = "cooked protein based food"
export_types = list(/obj/item/reagent_containers/food/snacks/meat/steak)
/datum/export/food/dough
cost = 3
unit_name = "uncooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/flatdough)
/datum/export/food/cooked_dough
cost = 5
unit_name = "cooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/pizzabread)
/datum/export/food/buns
cost = 3
unit_name = "cooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/bun)
/datum/export/food/buns
cost = 3
unit_name = "cooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/bun)
/datum/export/food/eggs
cost = 4
unit_name = "cooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/friedegg)
/datum/export/food/eggs_food
cost = 20
unit_name = "cooked egg based food"
export_types = list(/obj/item/reagent_containers/food/snacks/omelette, /obj/item/reagent_containers/food/snacks/benedict, /obj/item/reagent_containers/food/snacks/salad/eggbowl)
/datum/export/food/sweets
cost = 4
unit_name = "pastery base"
export_types = list(/obj/item/reagent_containers/food/snacks/rawpastrybase, /obj/item/reagent_containers/food/snacks/pastrybase)
/datum/export/food/cake_pie_raw
cost = 12
unit_name = "uncooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/cakebatter, /obj/item/reagent_containers/food/snacks/piedough)
/datum/export/food/cooked_cake_pie
cost = 15
unit_name = "cooked food base"
export_types = list(/obj/item/reagent_containers/food/snacks/store/cake/plain, /obj/item/reagent_containers/food/snacks/pie/plain)
/datum/export/food/glassbottle
cost = 10
unit_name = "glass bottle"
export_types = list(/obj/item/reagent_containers/food/drinks/bottle)
/datum/export/food/produce
cost = 3
unit_name = "produce"
export_types = list(/obj/item/reagent_containers/food/snacks/grown)
exclude_types = list(/obj/item/grown/log)
/datum/export/food/egg
cost = 2
unit_name = "egg"
export_types = list(/obj/item/reagent_containers/food/snacks/egg)
/datum/export/food/soup
cost = 30
unit_name = "bowl of soup"
export_types = list(/obj/item/reagent_containers/food/snacks/soup)
/datum/export/food/bread
cost = 20
unit_name = "load of bread"
export_types = list(/obj/item/reagent_containers/food/snacks/store/bread)
/datum/export/food/bread_slice
cost = 4
unit_name = "slice of bread"
export_types = list(/obj/item/reagent_containers/food/snacks/breadslice)
/datum/export/food/burger
cost = 12
unit_name = "burger"
export_types = list(/obj/item/reagent_containers/food/snacks/burger)
/datum/export/food/cake
cost = 50
unit_name = "cake"
export_types = list(/obj/item/reagent_containers/food/snacks/store/cake)
/datum/export/food/cake_slice
cost = 10
unit_name = "cake slice"
export_types = list(/obj/item/reagent_containers/food/snacks/cakeslice)
/datum/export/food/cheese_wheel
cost = 70
unit_name = "cheese wheel"
export_types = list(/obj/item/reagent_containers/food/snacks/store/cheesewheel)
/datum/export/food/cheese_wheel
cost = 20
unit_name = "cheese wedge"
export_types = list(/obj/item/reagent_containers/food/snacks/cheesewedge)
/datum/export/food/candy
cost = 5
unit_name = "candy" //Not anything from the vender
export_types = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/candiedapple, /obj/item/reagent_containers/food/snacks/spiderlollipop, \
/obj/item/reagent_containers/food/snacks/chococoin, /obj/item/reagent_containers/food/snacks/fudgedice, /obj/item/reagent_containers/food/snacks/chocoorange, /obj/item/reagent_containers/food/snacks/lollipop, \
/obj/item/reagent_containers/food/snacks/gumball, /obj/item/reagent_containers/food/snacks/tinychocolate)
/datum/export/food/pastery
cost = 30
unit_name = "baked goods"
export_types = list(/obj/item/reagent_containers/food/snacks/donut, /obj/item/reagent_containers/food/snacks/muffin, /obj/item/reagent_containers/food/snacks/waffles, /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, \
/obj/item/reagent_containers/food/snacks/chococornet, /obj/item/reagent_containers/food/snacks/cherrycupcake, /obj/item/reagent_containers/food/snacks/bluecherrycupcake, /obj/item/reagent_containers/food/snacks/honeybun, /obj/item/reagent_containers/food/snacks/pancakes)
/datum/export/food/pasta
cost = 20
unit_name = "pasta based meal"
export_types = list(/obj/item/reagent_containers/food/snacks/spaghetti, /obj/item/reagent_containers/food/snacks/boiledspaghetti, /obj/item/reagent_containers/food/snacks/pastatomato, /obj/item/reagent_containers/food/snacks/copypasta, \
/obj/item/reagent_containers/food/snacks/meatballspaghetti, /obj/item/reagent_containers/food/snacks/spesslaw, /obj/item/reagent_containers/food/snacks/chowmein, /obj/item/reagent_containers/food/snacks/beefnoodle, /obj/item/reagent_containers/food/snacks/butternoodles)
/datum/export/food/pizza
cost = 120
unit_name = "pizza"
export_types = list(/obj/item/reagent_containers/food/snacks/pizza)
/datum/export/food/sliced_pizza
cost = 12
unit_name = "pizza slice"
export_types = list(/obj/item/reagent_containers/food/snacks/pizzaslice)
/datum/export/food/snowcone
cost = 3
unit_name = "snowcone"
export_types = list(/obj/item/reagent_containers/food/snacks/snowcones)
/datum/export/booze/brands
cost = 200
unit_name = "export bottle"
export_types = list(/obj/item/export/bottle/kahlua, /obj/item/export/bottle/whiskey, /obj/item/export/bottle/vodka, /obj/item/export/bottle/gin, \
/obj/item/export/bottle/rum, /obj/item/export/bottle/tequila, /obj/item/export/bottle/vermouth, /obj/item/export/bottle/wine, /obj/item/export/bottle/grappa, /obj/item/export/bottle/cognac, \
/obj/item/export/bottle/absinthe, /obj/item/export/bottle/goldschlager, /obj/item/export/bottle/patron, /obj/item/export/bottle/sake, /obj/item/export/bottle/hcider, /obj/item/export/bottle/champagne, \
/obj/item/export/bottle/applejack, /obj/item/export/bottle/trappist, /obj/item/export/bottle/blazaam, /obj/item/export/bottle/grenadine, /obj/item/export/bottle/fernet)
/datum/export/booze/bottled
cost = 400
unit_name = "exotic brews"
export_types = list(/obj/item/export/bottle/blooddrop, /obj/item/export/bottle/slim_gold, /obj/item/export/bottle/white_bloodmoon, /obj/item/export/bottle/greenroad)
/datum/export/booze/bottledkeg
cost = 250
unit_name = "exotic brews"
export_types = list(/obj/item/export/bottle/minikeg) //Its just beer
code/modules/cargo/exports/gear.dm
+1
View File
@@ -793,6 +793,7 @@ datum/export/gear/glasses //glasses are not worth selling
//////////////////////
/datum/export/gear/chameleon //Selling a full kit is easy money for 2 tc
cost = 280
k_elasticity = 0
unit_name = "chameleon item"
export_types = list(/obj/item/clothing/head/chameleon, /obj/item/clothing/mask/chameleon, /obj/item/clothing/under/chameleon, /obj/item/clothing/suit/chameleon, /obj/item/clothing/glasses/chameleon,\
/obj/item/clothing/gloves/chameleon, /obj/item/clothing/head/chameleon, /obj/item/clothing/shoes/chameleon, /obj/item/storage/backpack/chameleon, \
code/modules/cargo/exports/large_objects.dm
+15 -10
View File
@@ -24,11 +24,16 @@
export_types = list(/obj/structure/ore_box)
/datum/export/large/crate/wood
cost = 140
cost = 140 //
unit_name = "wooden crate"
export_types = list(/obj/structure/closet/crate/wooden)
exclude_types = list()
/datum/export/large/barrel
cost = 500 //150 to make meaning proffit of 350
unit_name = "wooden barrel"
export_types = list(/obj/structure/fermenting_barrel)
/datum/export/large/crate/coffin
cost = 150
unit_name = "coffin"
@@ -282,17 +287,17 @@
include_subtypes = FALSE
/datum/export/large/mech/odysseus
cost = 5500
cost = 7500
unit_name = "working odysseus"
export_types = list(/obj/mecha/medical/odysseus)
/datum/export/large/mech/ripley
cost = 6500
cost = 12000
unit_name = "working ripley"
export_types = list(/obj/mecha/working/ripley)
/datum/export/large/mech/firefighter
cost = 9000
cost = 14000
unit_name = "working firefighter"
export_types = list(/obj/mecha/working/ripley/firefighter)
@@ -302,12 +307,12 @@
export_types = list(/obj/mecha/combat/gygax)
/datum/export/large/mech/durand
cost = 10000
cost = 16000
unit_name = "working durand"
export_types = list(/obj/mecha/combat/durand)
/datum/export/large/mech/phazon
cost = 25000 //Little over half do to needing a core
cost = 35000 //Little over half do to needing a core
unit_name = "working phazon"
export_types = list(/obj/mecha/combat/phazon)
@@ -317,7 +322,7 @@
export_types = list(/obj/mecha/combat/marauder)
/datum/export/large/mech/deathripley
cost = 8500 //Still a "Combat class" mech - Illegal tech as well! 165% "normal" boundy price.
cost = 18500 //Still a "Combat class" mech - Illegal tech as well! 165% "normal" boundy price.
unit_name = "working illegally modified"
export_types = list(/obj/mecha/working/ripley/deathripley)
@@ -332,12 +337,12 @@
export_types = list(/obj/mecha/working/ripley/mining)
/datum/export/large/mech/honk
cost = 12000 //Still a "Combat class" mech - Comats bordem honk!
cost = 16000 //Still a "Combat class" mech - Comats bordem honk!
unit_name = "working honker"
export_types = list(/obj/mecha/combat/honker)
/datum/export/large/mech/reticence
cost = 12000 //Still a "Combat class" mech - Has cloking and lethal weaponds.
cost = 16000 //Still a "Combat class" mech - Has cloking and lethal weaponds.
unit_name = "working reticence"
export_types = list(/obj/mecha/combat/reticence)
@@ -347,6 +352,6 @@
export_types = list(/obj/mecha/combat/marauder/seraph)
/datum/export/large/mech/mauler
cost = 12000 //Still a Combat class mech - CC lethal weaponds.
cost = 25000 //Still a Combat class mech - CC lethal weaponds.
unit_name = "working legally modified marauder"
export_types = list(/obj/mecha/combat/marauder/mauler)
code/modules/cargo/exports/materials.dm
-1
View File
@@ -42,7 +42,6 @@
/datum/export/material/plasma
cost = 100
k_elasticity = 0
material_id = MAT_PLASMA
message = "cm3 of plasma"
code/modules/cargo/exports/orgains_robotics.dm → code/modules/cargo/exports/organs_robotics.dm
+50 -3
View File
@@ -8,7 +8,7 @@
include_subtypes = FALSE
k_elasticity = 0 //ALWAYS worth selling upgrades
/datum/export/orgains
/datum/export/organs
include_subtypes = TRUE
k_elasticity = 0 //ALWAYS worth selling orgains
@@ -36,6 +36,7 @@
/datum/export/implant/breathtube
cost = 150
k_elasticity = 300/20 //Large before depleating
unit_name = "breath implant"
export_types = list(/obj/item/organ/cyberimp/mouth/breathing_tube)
@@ -110,7 +111,18 @@
export_types = list(/obj/item/organ/liver)
exclude_types = list(/obj/item/organ/liver/cybernetic, /obj/item/organ/liver/cybernetic/upgraded)
/datum/export/orgains/tail //Shhh
/datum/export/organs/cybernetic
cost = 225
unit_name = "cybernetic organ"
export_types = list(/obj/item/organ/liver/cybernetic, /obj/item/organ/lungs/cybernetic, /obj/item/organ/eyes/robotic, /obj/item/organ/heart/cybernetic)
exclude_types = list(/obj/item/organ/lungs/cybernetic/upgraded, /obj/item/organ/liver/cybernetic/upgraded)
/datum/export/organs/upgraded
cost = 275
unit_name = "upgraded cybernetic organ"
export_types = list(/obj/item/organ/lungs/cybernetic/upgraded, /obj/item/organ/liver/cybernetic/upgraded)
/datum/export/organs/tail //Shhh
cost = 500
unit_name = "error shipment failer"
export_types = list(/obj/item/organ/tail)
@@ -136,6 +148,41 @@
export_types = list(/obj/item/bodypart/l_arm/robot/surplus_upgraded, /obj/item/bodypart/r_arm/robot/surplus_upgraded, /obj/item/bodypart/l_leg/robot/surplus_upgraded, /obj/item/bodypart/r_leg/robot/surplus_upgraded)
/datum/export/robotics/surgery_gear_basic
cost = 5
cost = 10
unit_name = "surgery tool"
export_types = list(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/surgical_drapes)
/datum/export/robotics/mech_weapon_laser
cost = 300 //Sadly just metal and glass
unit_name = "mech laser based weapon"
include_subtypes = TRUE
export_types = list(/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam, /obj/item/mecha_parts/mecha_equipment/weapon/energy)
/datum/export/robotics/mech_weapon_bullet
cost = 250
unit_name = "mech bullet based weapon"
include_subtypes = TRUE
export_types = list(/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun, /obj/item/mecha_parts/mecha_equipment/weapon/honker, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic)
/datum/export/robotics/mech_tools
cost = 150
unit_name = "mech based tool"
include_subtypes = TRUE
export_types = list(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/extinguisher, /obj/item/mecha_parts/mecha_equipment/rcd, /obj/item/mecha_parts/mecha_equipment/cable_layer, \
/obj/item/mecha_parts/mecha_equipment/drill, /obj/item/mecha_parts/mecha_equipment/mining_scanner, /obj/item/mecha_parts/mecha_equipment/medical/sleeper)
/datum/export/robotics/mech_blue_space
cost = 750
k_elasticity = 1/10
unit_name = "mech bluespace tech"
export_types = list(/obj/item/mecha_parts/mecha_equipment/teleporter, /obj/item/mecha_parts/mecha_equipment/wormhole_generator, /obj/item/mecha_parts/mecha_equipment/gravcatapult)
/datum/export/robotics/mech_reactors
cost = 350
unit_name = "mech based reactor"
export_types = list(/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, /obj/item/mecha_parts/mecha_equipment/generator, /obj/item/mecha_parts/mecha_equipment/generator/nuclear)
/datum/export/robotics/mech_armor
cost = 350
unit_name = "mech armor tech"
export_types = list(/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/repair_droid)
code/modules/cargo/exports/parts.dm
+5 -4
View File
@@ -6,14 +6,15 @@
export_types = list(/obj/item/solar_assembly)
/datum/export/solar/tracker_board
cost = 30
cost = 10
unit_name = "solar tracker board"
export_types = list(/obj/item/electronics/tracker)
/datum/export/solar/control_board
cost = 75
cost = 15
unit_name = "solar panel control board"
export_types = list(/obj/item/circuitboard/computer/solar_control)
include_subtypes = FALSE
/datum/export/swarmer
cost = 500
@@ -30,9 +31,9 @@
/datum/export/board/SMES
cost = 20
k_elasticity = 1/2 //Only a few
unit_name = "smes board"
export_types = list(/obj/item/circuitboard/machine/smes)
include_subtypes = FALSE
//Stock Parts
@@ -70,7 +71,7 @@
export_types = list(/obj/item/stock_parts/cell)
include_subtypes = TRUE
/datum/export/cell
/datum/export/cellupgraded
cost = 10
unit_name = "upgraded power cell"
export_types = list(/obj/item/stock_parts/cell/upgraded, /obj/item/stock_parts/cell/upgraded/plus)
code/modules/cargo/exports/sheets.dm
+13 -2
View File
@@ -83,6 +83,11 @@
unit_name = "wood plank"
export_types = list(/obj/item/stack/sheet/mineral/wood)
/datum/export/stack/log
cost = 10
unit_name = "raw wood"
export_types = list(/obj/item/grown/log)
/datum/export/stack/cardboard
cost = 2
message = "of cardboard"
@@ -100,11 +105,17 @@
export_types = list(/obj/item/stack/cable_coil)
/datum/export/stack/cloth
cost = 10
cost = 20
unit_name = "sheets"
message = "of cloth"
export_types = list(/obj/item/stack/sheet/cloth)
/datum/export/stack/silk
cost = 200 //The new plasma
unit_name = "sheets"
message = "of silk"
export_types = list(/obj/item/stack/sheet/silk)
/datum/export/stack/duracloth
cost = 40
unit_name = "sheets"
@@ -145,4 +156,4 @@
unit_name = "sheets"
cost = 30
message = "of paperframes"
export_types = list(/obj/item/stack/sheet/paperframes)
export_types = list(/obj/item/stack/sheet/paperframes)
code/modules/cargo/exports/tools.dm
+3 -3
View File
@@ -12,7 +12,7 @@
/datum/export/gear/powerdrill
cost = 25
k_elasticity = 1/40 //Market can only take so much
k_elasticity = 1/80 //Market can only take so much
unit_name = "power tool"
export_types = list(/obj/item/crowbar/power, /obj/item/screwdriver/power, \
/obj/item/weldingtool/experimental, /obj/item/wirecutters/power, /obj/item/wrench/power)
@@ -65,13 +65,13 @@
// Basic tools
/datum/export/basicmining
cost = 20
cost = 30
unit_name = "basic mining tool"
export_types = list(/obj/item/pickaxe, /obj/item/pickaxe/mini, /obj/item/shovel, /obj/item/resonator)
include_subtypes = FALSE
/datum/export/upgradedmining
cost = 50
cost = 80
unit_name = "mining tool"
export_types = list(/obj/item/pickaxe/silver, /obj/item/pickaxe/drill, /obj/item/gun/energy/plasmacutter, /obj/item/resonator/upgraded)
include_subtypes = FALSE
code/modules/cargo/exports/weapons.dm
+7 -7
View File
@@ -125,7 +125,7 @@
/datum/export/weapon/temp_gun
cost = 175 //Its just smaller
unit_name = "small temperature gun"
k_elasticity = 1/5 //Its just a smaller temperature gun, easy to mass make
k_elasticity = 1/30 //Its just a smaller temperature gun, easy to mass make
export_types = list(/obj/item/gun/energy/temperature)
/datum/export/weapon/flowergun
@@ -140,7 +140,7 @@
/datum/export/weapon/ioncarbine
cost = 200
k_elasticity = 1/5 //Its just a smaller temperature gun, easy to mass make
k_elasticity = 1/30 //Its just a smaller temperature gun, easy to mass make
unit_name = "ion carbine"
export_types = list(/obj/item/gun/energy/ionrifle/carbine)
@@ -174,12 +174,12 @@
/////////////////
/datum/export/weapon/wtammo
cost = 10
cost = 15
unit_name = "WT-550 automatic rifle ammo"
export_types = list(/obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9/wtrubber)
/datum/export/weapon/wtammo/advanced
cost = 30
cost = 45
unit_name = "advanced WT-550 automatic rifle ammo"
export_types = list( /obj/item/ammo_box/magazine/wt550m9/wtap, /obj/item/ammo_box/magazine/wt550m9/wttx, /obj/item/ammo_box/magazine/wt550m9/wtic)
@@ -194,7 +194,7 @@
export_types = list(/obj/item/firing_pin/test_range)
/datum/export/weapon/techslug
cost = 15
cost = 25
k_elasticity = 0
unit_name = "advanced shotgun shell"
export_types = list(/obj/item/ammo_casing/shotgun/dragonsbreath, /obj/item/ammo_casing/shotgun/meteorslug, /obj/item/ammo_casing/shotgun/pulseslug, /obj/item/ammo_casing/shotgun/frag12, /obj/item/ammo_casing/shotgun/ion, /obj/item/ammo_casing/shotgun/laserslug)
@@ -345,13 +345,13 @@
export_types = list(/obj/item/storage/toolbox/gold_real)
/datum/export/weapon/melee
cost = 30
cost = 50
unit_name = "unlisted weapon"
export_types = list(/obj/item/melee)
include_subtypes = TRUE
/datum/export/weapon/gun
cost = 30
cost = 50
unit_name = "unlisted weapon"
export_types = list(/obj/item/gun)
include_subtypes = TRUE
code/modules/cargo/packs/livestock.dm
+15
View File
@@ -10,6 +10,21 @@
group = "Livestock"
crate_type = /obj/structure/closet/crate/critter
/datum/supply_pack/critter/animal_feed
name = "Animal Feed Crate"
desc = "Feed for livestock, like cows and hens. Contains fifty Wheat bundles and fifty Oat bundles."
cost = 1500
contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/oat)
crate_name = "animal feed crate"
crate_type = /obj/structure/closet/crate/freezer
/datum/supply_pack/critter/animal_feed/generate()
. = ..()
for(var/i in 1 to 49)
new /obj/item/reagent_containers/food/snacks/grown/wheat(.)
/datum/supply_pack/critter/butterfly
name = "Butterflies Crate"
desc = "Not a very dangerous insect, but they do give off a better image than, say, flies or cockroaches."//is that a motherfucking worm reference
code/modules/cargo/packs/materials.dm
+38
View File
@@ -65,6 +65,28 @@
contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
crate_name = "wood planks crate"
/datum/supply_pack/organic/rawcotton
name = "Raw Cotton Crate"
desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets."
cost = 800 // 100 net cost, 20 x 20 = 400. 300 proffit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000
contains = list(/obj/item/stack/sheet/cotton/thirty,
/obj/item/stack/sheet/cotton/ten
)
crate_name = "cotton crate"
crate_type = /obj/structure/closet/crate/hydroponics
/datum/supply_pack/organic/rawlumber
name = "Raw Lumber Crate"
desc = "Raw logs from towercaps. Contains fifty logs."
cost = 1000
contains = list(/obj/item/grown/log)
crate_name = "lumber crate"
/datum/supply_pack/critter/animal_feed/generate()
. = ..()
for(var/i in 1 to 49)
new /obj/item/grown/log(.)
/datum/supply_pack/materials/rcdammo
name = "Spare RDC ammo"
desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on."
@@ -168,3 +190,19 @@
contains = list(/obj/structure/reagent_dispensers/watertank/high)
crate_name = "high-capacity water tank crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/materials/loom
name = "Loom"
desc = "A large pre-made loom."
cost = 1000
contains = list(/obj/structure/loom)
crate_name = "loom crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/materials/wooden_barrel
name = "Wooden Barrel"
desc = "Wooden barrels ready for storage."
cost = 1500
contains = list(/obj/structure/fermenting_barrel)
crate_name = "wooden barrel crate"
crate_type = /obj/structure/closet/crate/large
code/modules/cargo/packs/organic.dm
+109 -44
View File
@@ -69,31 +69,24 @@
/obj/item/storage/fancy/donut_box)
crate_name = "candy crate"
/datum/supply_pack/organic/cutlery
name = "Kitchen Cutlery Deluxe Set"
desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
cost = 10000
contraband = TRUE
contains = list(/obj/item/sharpener,
/obj/item/kitchen/fork,
/obj/item/kitchen/fork,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife/butcher,
/obj/item/kitchen/knife/butcher,
/obj/item/kitchen/rollingpin, //Deluxe for a reason
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
crate_name = "kitchen cutlery deluxe set"
/datum/supply_pack/organic/exoticseeds
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!"
cost = 1500
contains = list(/obj/item/seeds/nettle,
/obj/item/seeds/replicapod,
/obj/item/seeds/replicapod,
/obj/item/seeds/replicapod,
/obj/item/seeds/plump,
/obj/item/seeds/liberty,
/obj/item/seeds/amanita,
/obj/item/seeds/reishi,
/obj/item/seeds/banana,
/obj/item/seeds/eggplant/eggy,
/obj/item/seeds/random,
/obj/item/seeds/random)
crate_name = "exotic seeds crate"
crate_type = /obj/structure/closet/crate/hydroponics
/datum/supply_pack/organic/food
name = "Food Crate"
@@ -120,6 +113,71 @@
/obj/item/reagent_containers/food/snacks/grown/banana)
crate_name = "food crate"
/datum/supply_pack/organic/fruit_1
name = "Fruit Basic Crate"
desc = "Getting scurvy on the station? Well heres your fixing! Contains three of each - bananas, watermelons, limes, lemons, oranges and even three pineapple."
cost = 2250
contains = list(/obj/item/reagent_containers/food/snacks/grown/watermelon,
/obj/item/reagent_containers/food/snacks/grown/watermelon,
/obj/item/reagent_containers/food/snacks/grown/watermelon,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana)
crate_name = "fruit crate"
/datum/supply_pack/organic/fruit_2
name = "Fruit Delux Crate"
desc = "Getting tired of the basic fruits and want to have something a bit more decadent! This crate is for you! Contains three of each - bunches of berries, apples, pineapples, cherries, green & red grapes, eggplants, bananas lastly ten strawberry."
cost = 3500
contains = list(/obj/item/reagent_containers/food/snacks/grown/berries,
/obj/item/reagent_containers/food/snacks/grown/berries,
/obj/item/reagent_containers/food/snacks/grown/berries,
/obj/item/reagent_containers/food/snacks/grown/apple,
/obj/item/reagent_containers/food/snacks/grown/apple,
/obj/item/reagent_containers/food/snacks/grown/apple,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/pineapple,
/obj/item/reagent_containers/food/snacks/grown/cherries,
/obj/item/reagent_containers/food/snacks/grown/cherries,
/obj/item/reagent_containers/food/snacks/grown/cherries,
/obj/item/reagent_containers/food/snacks/grown/grapes,
/obj/item/reagent_containers/food/snacks/grown/grapes,
/obj/item/reagent_containers/food/snacks/grown/grapes,
/obj/item/reagent_containers/food/snacks/grown/grapes/green,
/obj/item/reagent_containers/food/snacks/grown/grapes/green,
/obj/item/reagent_containers/food/snacks/grown/grapes/green,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/eggplant,
/obj/item/reagent_containers/food/snacks/grown/eggplant,
/obj/item/reagent_containers/food/snacks/grown/eggplant,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry,
/obj/item/reagent_containers/food/snacks/grown/strawberry)
crate_name = "fruit crate"
/datum/supply_pack/organic/cream_piee
name = "High-yield Clown-grade Cream Pie Crate"
desc = "Designed by Aussec's Advanced Warfare Research Division, these high-yield, Clown-grade cream pies are powered by a synergy of performance and efficiency. Guaranteed to provide maximum results."
@@ -171,6 +229,32 @@
crate_name = "hydroponics backpack crate"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/organic/cutlery
name = "Kitchen Cutlery Deluxe Set"
desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
cost = 10000
contraband = TRUE
contains = list(/obj/item/sharpener,
/obj/item/kitchen/fork,
/obj/item/kitchen/fork,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife,
/obj/item/kitchen/knife/butcher,
/obj/item/kitchen/knife/butcher,
/obj/item/kitchen/rollingpin, //Deluxe for a reason
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/trash/plate,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
crate_name = "kitchen cutlery deluxe set"
/datum/supply_pack/organic/mre
name = "MRE supply kit (emergency rations)"
desc = "The lights are out. Oxygen's running low. You've run out of food except space weevils. Don't let this be you! Order our NT branded MRE kits today! This pack contains 5 MRE packs with a randomized menu and an oxygen tank."
@@ -269,22 +353,3 @@
/obj/item/valentine)
crate_name = "valentine crate"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/organic/exoticseeds
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!"
cost = 1500
contains = list(/obj/item/seeds/nettle,
/obj/item/seeds/replicapod,
/obj/item/seeds/replicapod,
/obj/item/seeds/replicapod,
/obj/item/seeds/plump,
/obj/item/seeds/liberty,
/obj/item/seeds/amanita,
/obj/item/seeds/reishi,
/obj/item/seeds/banana,
/obj/item/seeds/eggplant/eggy,
/obj/item/seeds/random,
/obj/item/seeds/random)
crate_name = "exotic seeds crate"
crate_type = /obj/structure/closet/crate/hydroponics
code/modules/cargo/packs/science.dm
+1 -1
View File
@@ -85,7 +85,7 @@
/datum/supply_pack/science/monkey
name = "Monkey Cube Crate"
desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
cost = 2000
cost = 1500
contains = list (/obj/item/storage/box/monkeycubes)
crate_name = "monkey cube crate"