cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Crates and bountes are now defined by crate's value and paygrades. Civilian bounty payout is higher and uncheesable. (#55413)

Browse Source 
Does a value-wise refactor of crates and bounties in order to scale the value of these imports and exports to the value of crate exports (500 credits each). Then, I have adjusted the value of crate exports to 200 credits down from 500 to place the most standard unit of profit within cargo to a scale within that of roundstart paygrades currently on station. (350-1400 credits).

This effectively balances one of the biggest disparities left within the in-game economy, which is that cargo's price scales have really never been re-balanced with the considerations of on station prices, and have been still to the same scale as when they were based on cargo points 3 years ago. While admittedly some prices in vendors were scale to those original cargo values, so many of them weren't that it warranted a massive rebalance PR in order to places the scale of these items within an appropriate range of their intended user's cost values.
This commit is contained in:
ArcaneMusic
2020-12-10 23:43:46 +00:00
committed by GitHub
parent a8e17fdf90
commit e09a9032da
32 changed files with 545 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/cargo.dm
+3
View File
@@ -37,6 +37,9 @@
#define SUPPLYPOD_X_OFFSET -16
/// The baseline unit for cargo crates. Adjusting this will change the cost of all in-game shuttles, crate export values, bounty rewards, and all supply pack import values, as they use this as their unit of measurement.
#define CARGO_CRATE_VALUE 200
GLOBAL_LIST_EMPTY(supplypod_loading_bays)
GLOBAL_LIST_INIT(podstyles, list(\
code/datums/components/payment.dm
+1
View File
@@ -10,6 +10,7 @@
* Improving standardizing every form of payment handing, as some custom handling is specific to that object.
**/
/datum/component/payment
dupe_mode = COMPONENT_DUPE_UNIQUE ///NO OVERRIDING TO CHEESE BOUNTIES
///Standardized of operation.
var/cost = 10
///Flavor style for handling cash (Friendly? Hostile? etc.)
code/datums/shuttles.dm
+33 -32
View File
@@ -8,11 +8,12 @@
var/description
var/prerequisites
var/admin_notes
/// How much does this shuttle cost the cargo budget to purchase? Put in terms of CARGO_CRATE_VALUE to properly scale the cost with the current balance of cargo's income.
var/credit_cost = INFINITY
/// Can the be legitimately purchased by the station? Used by hardcoded or pre-mapped shuttles like the lavaland or cargo shuttle.
var/can_be_bought = TRUE
var/list/movement_force // If set, overrides default movement_force on shuttle
/// If set, overrides default movement_force on shuttle
var/list/movement_force
var/port_x_offset
var/port_y_offset
@@ -181,7 +182,7 @@
name = "Build your own shuttle kit"
description = "For the enterprising shuttle engineer! The chassis will dock upon purchase, but launch will have to be authorized as usual via shuttle call. Comes stocked with construction materials. Unlocks the ability to buy shuttle engine crates from cargo."
admin_notes = "No brig, no medical facilities, no shuttle console."
credit_cost = 2500
credit_cost = CARGO_CRATE_VALUE * 5
/datum/map_template/shuttle/emergency/airless/post_load()
. = ..()
@@ -194,7 +195,7 @@
suffix = "asteroid"
name = "Asteroid Station Emergency Shuttle"
description = "A respectable mid-sized shuttle that first saw service shuttling Nanotrasen crew to and from their asteroid belt embedded facilities."
credit_cost = 3000
credit_cost = CARGO_CRATE_VALUE * 6
/datum/map_template/shuttle/emergency/bar
suffix = "bar"
@@ -202,7 +203,7 @@
description = "Features include sentient bar staff (a Bardrone and a Barmaid), bathroom, a quality lounge for the heads, and a large gathering table."
admin_notes = "Bardrone and Barmaid are GODMODE, will be automatically sentienced by the fun balloon at 60 seconds before arrival. \
Has medical facilities."
credit_cost = 5000
credit_cost = CARGO_CRATE_VALUE * 10
/datum/map_template/shuttle/emergency/pod
suffix = "pod"
@@ -216,14 +217,14 @@
name = "Mother Russia Bleeds"
description = "Dis is a high-quality shuttle, da. Many seats, lots of space, all equipment! Even includes entertainment! Such as lots to drink, and a fighting arena for drunk crew to have fun! If arena not fun enough, simply press button of releasing bears. Do not worry, bears trained not to break out of fighting pit, so totally safe so long as nobody stupid or drunk enough to leave door open. Try not to let asimov babycons ruin fun!"
admin_notes = "Includes a small variety of weapons. And bears. Only captain-access can release the bears. Bears won't smash the windows themselves, but they can escape if someone lets them."
credit_cost = 5000 // While the shuttle is rusted and poorly maintained, trained bears are costly.
credit_cost = CARGO_CRATE_VALUE * 10 // While the shuttle is rusted and poorly maintained, trained bears are costly.
/datum/map_template/shuttle/emergency/meteor
suffix = "meteor"
name = "Asteroid With Engines Strapped To It"
description = "A hollowed out asteroid with engines strapped to it, the hollowing procedure makes it very difficult to hijack but is very expensive. Due to its size and difficulty in steering it, this shuttle may damage the docking area."
admin_notes = "This shuttle will likely crush escape, killing anyone there."
credit_cost = 15000
credit_cost = CARGO_CRATE_VALUE * 30
movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
/datum/map_template/shuttle/emergency/luxury
@@ -232,14 +233,14 @@
description = "A luxurious golden shuttle complete with an indoor swimming pool. Each crewmember wishing to board must bring 500 credits, payable in cash and mineral coin."
extra_desc = "This shuttle costs 500 credits to board."
admin_notes = "Due to the limited space for non paying crew, this shuttle may cause a riot."
credit_cost = 10000
credit_cost = CARGO_CRATE_VALUE * 20
/datum/map_template/shuttle/emergency/discoinferno
suffix = "discoinferno"
name = "Disco Inferno"
description = "The glorious results of centuries of plasma research done by Nanotrasen employees. This is the reason why you are here. Get on and dance like you're on fire, burn baby burn!"
admin_notes = "Flaming hot. The main area has a dance machine as well as plasma floor tiles that will be ignited by players every single time."
credit_cost = 10000
credit_cost = CARGO_CRATE_VALUE * 20
can_be_bought = FALSE
/datum/map_template/shuttle/emergency/arena
@@ -247,7 +248,7 @@
name = "The Arena"
description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle."
admin_notes = "RIP AND TEAR."
credit_cost = 10000
credit_cost = CARGO_CRATE_VALUE * 20
/// Whether the arena z-level has been created
var/arena_loaded = FALSE
@@ -269,12 +270,12 @@
suffix = "birdboat"
name = "Birdboat Station Emergency Shuttle"
description = "Though a little on the small side, this shuttle is feature complete, which is more than can be said for the pattern of station it was commissioned for."
credit_cost = 1000
credit_cost = CARGO_CRATE_VALUE * 2
/datum/map_template/shuttle/emergency/box
suffix = "box"
name = "Box Station Emergency Shuttle"
credit_cost = 2000
credit_cost = CARGO_CRATE_VALUE * 4
description = "The gold standard in emergency exfiltration, this tried and true design is equipped with everything the crew needs for a safe flight home."
/datum/map_template/shuttle/emergency/donut
@@ -282,7 +283,7 @@
name = "Donutstation Emergency Shuttle"
description = "The perfect spearhead for any crude joke involving the station's shape, this shuttle supports a separate containment cell for prisoners and a compact medical wing."
admin_notes = "Has airlocks on both sides of the shuttle and will probably intersect near the front on some stations that build past departures."
credit_cost = 2500
credit_cost = CARGO_CRATE_VALUE * 5
/datum/map_template/shuttle/emergency/clown
suffix = "clown"
@@ -293,7 +294,7 @@
Collect all the bedsheets before your neighbour does! Check if the AI is watching you with our patent pending \"Peeping Tom AI Multitool Detector\" or PEEEEEETUR for short. \
Have a fun ride!"
admin_notes = "Brig is replaced by anchored greentext book surrounded by lavaland chasms, stationside door has been removed to prevent accidental dropping. No brig."
credit_cost = 8000
credit_cost = CARGO_CRATE_VALUE * 16
/datum/map_template/shuttle/emergency/cramped
suffix = "cramped"
@@ -307,25 +308,25 @@
/datum/map_template/shuttle/emergency/meta
suffix = "meta"
name = "Meta Station Emergency Shuttle"
credit_cost = 4000
credit_cost = CARGO_CRATE_VALUE * 8
description = "A fairly standard shuttle, though larger and slightly better equipped than the Box Station variant."
/datum/map_template/shuttle/emergency/kilo
suffix = "kilo"
name = "Kilo Station Emergency Shuttle"
credit_cost = 5000
credit_cost = CARGO_CRATE_VALUE * 10
description = "A fully functional shuttle including a complete infirmary, storage facilties and regular amenities."
/datum/map_template/shuttle/emergency/mini
suffix = "mini"
name = "Ministation emergency shuttle"
credit_cost = 1000
credit_cost = CARGO_CRATE_VALUE * 2
description = "Despite its namesake, this shuttle is actually only slightly smaller than standard, and still complete with a brig and medbay."
/datum/map_template/shuttle/emergency/scrapheap
suffix = "scrapheap"
name = "Standby Evacuation Vessel \"Scrapheap Challenge\""
credit_cost = -1000
credit_cost = CARGO_CRATE_VALUE * -2
description = "Due to a lack of functional emergency shuttles, we bought this second hand from a scrapyard and pressed it into service. Please do not lean too heavily on the exterior windows, they are fragile."
admin_notes = "An abomination with no functional medbay, sections missing, and some very fragile windows. Surprisingly airtight."
movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
@@ -336,7 +337,7 @@
description = "Looks like this shuttle may have wandered into the darkness between the stars on route to the station. Let's not think too hard about where all the bodies came from."
admin_notes = "Contains real cult ruins, mob eyeballs, and inactive constructs. Cult mobs will automatically be sentienced by fun balloon. \
Cloning pods in 'medbay' area are showcases and nonfunctional."
credit_cost = 6667
credit_cost = 6667 ///The joke is the number so no defines
/datum/map_template/shuttle/emergency/narnar/prerequisites_met()
return SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR]
@@ -346,7 +347,7 @@
name = "Pubby Station Emergency Shuttle"
description = "A train but in space! Complete with a first, second class, brig and storage area."
admin_notes = "Choo choo motherfucker!"
credit_cost = 1000
credit_cost = CARGO_CRATE_VALUE * 2
/datum/map_template/shuttle/emergency/cere
suffix = "cere"
@@ -354,7 +355,7 @@
description = "The large, beefed-up version of the box-standard shuttle. Includes an expanded brig, fully stocked medbay, enhanced cargo storage with mech chargers, \
an engine room stocked with various supplies, and a crew capacity of 80+ to top it all off. Live large, live Cere."
admin_notes = "Seriously big, even larger than the Delta shuttle."
credit_cost = 10000
credit_cost = CARGO_CRATE_VALUE * 20
/datum/map_template/shuttle/emergency/supermatter
suffix = "supermatter"
@@ -367,7 +368,7 @@
Outside of admin intervention, it cannot explode. \
It does, however, still dust anything on contact, emits high levels of radiation, and induce hallucinations in anyone looking at it without protective goggles. \
Emitters spawn powered on, expect admin notices, they are harmless."
credit_cost = 100000
credit_cost = CARGO_CRATE_VALUE * 200
movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
/datum/map_template/shuttle/emergency/imfedupwiththisworld
@@ -383,7 +384,7 @@
suffix = "goon"
name = "NES Port"
description = "The Nanotrasen Emergency Shuttle Port(NES Port for short) is a shuttle used at other less known Nanotrasen facilities and has a more open inside for larger crowds, but fewer onboard shuttle facilities."
credit_cost = 500
credit_cost = CARGO_CRATE_VALUE
/datum/map_template/shuttle/emergency/rollerdome
suffix = "rollerdome"
@@ -391,7 +392,7 @@
description = "Developed by a member of Nanotrasen's R&D crew that claims to have travelled from the year 2028. \
He says this shuttle is based off an old entertainment complex from the 1990s, though our database has no records on anything pertaining to that decade."
admin_notes = "ONLY NINETIES KIDS REMEMBER. Uses the fun balloon and drone from the Emergency Bar."
credit_cost = 2500
credit_cost = CARGO_CRATE_VALUE * 5
/datum/map_template/shuttle/emergency/wabbajack
suffix = "wabbajack"
@@ -400,27 +401,27 @@
The only occupants were a number of dead rodents, who appeared to have clawed each other to death. \
Needless to say, no engineering team wanted to go near the thing, and it's only being used as an Emergency Escape Shuttle because there is literally nothing else available."
admin_notes = "If the crew can solve the puzzle, they will wake the wabbajack statue. It will likely not end well. There's a reason it's boarded up. Maybe they should have just left it alone."
credit_cost = 15000
credit_cost = CARGO_CRATE_VALUE * 30
/datum/map_template/shuttle/emergency/omega
suffix = "omega"
name = "Omegastation Emergency Shuttle"
description = "On the smaller size with a modern design, this shuttle is for the crew who like the cosier things, while still being able to stretch their legs."
credit_cost = 1000
credit_cost = CARGO_CRATE_VALUE * 2
/datum/map_template/shuttle/emergency/cruise
suffix = "cruise"
name = "The NTSS Independence"
description = "Ordinarily reserved for special functions and events, the Cruise Shuttle Independence can bring a summery cheer to your next station evacuation for a 'modest' fee!"
admin_notes = "This motherfucker is BIG. You might need to force dock it."
credit_cost = 50000
credit_cost = CARGO_CRATE_VALUE * 100
/datum/map_template/shuttle/emergency/monkey
suffix = "nature"
name = "Dynamic Environmental Interaction Shuttle"
description = "A large shuttle with a center biodome that is flourishing with life. Frolick with the monkeys! (Extra monkeys are stored on the bridge.)"
admin_notes = "Pretty freakin' large, almost as big as Raven or Cere. Excercise caution with it."
credit_cost = 8000
credit_cost = CARGO_CRATE_VALUE * 16
/datum/map_template/shuttle/ferry/base
suffix = "base"
@@ -507,7 +508,7 @@
name = "Delta Station Emergency Shuttle"
description = "A large shuttle for a large station, this shuttle can comfortably fit all your overpopulation and crowding needs. Complete with all facilities plus additional equipment."
admin_notes = "Go big or go home."
credit_cost = 7500
credit_cost = CARGO_CRATE_VALUE * 15
/datum/map_template/shuttle/emergency/raven
suffix = "raven"
@@ -516,7 +517,7 @@
Once first to the scene to pick through warzones for valuable remains, it now serves as an excellent escape option for stations under heavy fire from outside forces. \
This escape shuttle boasts shields and numerous anti-personnel turrets guarding its perimeter to fend off meteors and enemy boarding attempts."
admin_notes = "Comes with turrets that will target anything without the neutral faction (nuke ops, xenos etc, but not pets)."
credit_cost = 30000
credit_cost = CARGO_CRATE_VALUE * 60
/datum/map_template/shuttle/emergency/zeta
suffix = "zeta"
@@ -524,7 +525,7 @@
description = "A glitch appears on your monitor, flickering in and out of the options laid before you. \
It seems strange and alien, you may need a special technology to access the signal.."
admin_notes = "Has alien surgery tools, and a void core that provides unlimited power."
credit_cost = 8000
credit_cost = CARGO_CRATE_VALUE * 16
/datum/map_template/shuttle/emergency/zeta/prerequisites_met()
return SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_ALIENTECH]
code/game/machinery/civilian_bounties.dm
+1 -1
View File
@@ -100,7 +100,7 @@
SSeconomy.civ_bounty_tracker++
var/obj/item/bounty_cube/reward = new /obj/item/bounty_cube(drop_location())
reward.bounty_value = curr_bounty.reward
reward.AddComponent(/datum/component/pricetag, inserted_scan_id.registered_account, 10)
reward.AddComponent(/datum/component/pricetag, inserted_scan_id.registered_account, 30)
pad.visible_message("<span class='notice'>[pad] activates!</span>")
flick(pad.sending_state,pad)
pad.icon_state = pad.idle_state
code/modules/cargo/bounties/assistant.dm
+30 -30
View File
@@ -1,126 +1,126 @@
/datum/bounty/item/assistant/strange_object
name = "Strange Object"
description = "Nanotrasen has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away."
reward = 1200
reward = CARGO_CRATE_VALUE * 2.4
wanted_types = list(/obj/item/relic)
/datum/bounty/item/assistant/scooter
name = "Scooter"
description = "Nanotrasen has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
reward = 1080 // the mat hoffman
reward = CARGO_CRATE_VALUE * 2.16 // the mat hoffman
wanted_types = list(/obj/vehicle/ridden/scooter)
include_subtypes = FALSE
/datum/bounty/item/assistant/skateboard
name = "Skateboard"
description = "Nanotrasen has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up."
reward = 900 // the tony hawk
reward = CARGO_CRATE_VALUE * 1.8 // the tony hawk
wanted_types = list(/obj/vehicle/ridden/scooter/skateboard, /obj/item/melee/skateboard)
/datum/bounty/item/assistant/stunprod
name = "Stunprod"
description = "CentCom demands a stunprod to use against dissidents. Craft one, then ship it."
reward = 1300
reward = CARGO_CRATE_VALUE * 2.6
wanted_types = list(/obj/item/melee/baton/cattleprod)
/datum/bounty/item/assistant/soap
name = "Soap"
description = "Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 3
wanted_types = list(/obj/item/soap)
/datum/bounty/item/assistant/spear
name = "Spears"
description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 5
wanted_types = list(/obj/item/spear)
/datum/bounty/item/assistant/toolbox
name = "Toolboxes"
description = "There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 6
wanted_types = list(/obj/item/storage/toolbox)
/datum/bounty/item/assistant/statue
name = "Statue"
description = "Central Command would like to commision an artsy statue for the lobby. Ship one out, when possible."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
wanted_types = list(/obj/structure/statue)
/datum/bounty/item/assistant/clown_box
name = "Clown Box"
description = "The universe needs laughter. Stamp cardboard with a clown stamp and ship it out."
reward = 1500
reward = CARGO_CRATE_VALUE * 3
wanted_types = list(/obj/item/storage/box/clown)
/datum/bounty/item/assistant/cheesiehonkers
name = "Cheesie Honkers"
description = "Apparently the company that makes Cheesie Honkers is going out of business soon. CentCom wants to stock up before it happens!"
reward = 1200
reward = CARGO_CRATE_VALUE * 2.4
required_count = 3
wanted_types = list(/obj/item/food/cheesiehonkers)
/datum/bounty/item/assistant/baseball_bat
name = "Baseball Bat"
description = "Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 5
wanted_types = list(/obj/item/melee/baseball_bat)
/datum/bounty/item/assistant/extendohand
name = "Extendo-Hand"
description = "Commander Betsy is getting old, and can't bend over to get the telescreen remote anymore. Management has requested an extendo-hand to help her out."
reward = 2500
reward = CARGO_CRATE_VALUE * 5
wanted_types = list(/obj/item/extendohand)
/datum/bounty/item/assistant/donut
name = "Donuts"
description = "CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 10
wanted_types = list(/obj/item/food/donut)
/datum/bounty/item/assistant/donkpocket
name = "Donk-Pockets"
description = "Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 10
wanted_types = list(/obj/item/food/donkpocket)
/datum/bounty/item/assistant/briefcase
name = "Briefcase"
description = "Central Command will be holding a business convention this year. Ship a few briefcases in support."
reward = 2500
reward = CARGO_CRATE_VALUE * 5
required_count = 5
wanted_types = list(/obj/item/storage/briefcase, /obj/item/storage/secure/briefcase)
/datum/bounty/item/assistant/sunglasses
name = "Sunglasses"
description = "A famous blues duo is passing through the sector, but they've lost their shades and they can't perform. Ship new sunglasses to CentCom to rectify this."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 2
wanted_types = list(/obj/item/clothing/glasses/sunglasses)
/datum/bounty/item/assistant/monkey_hide
name = "Monkey Hide"
description = "One of the scientists at CentCom is interested in testing products on monkey skin. Your mission is to acquire monkey's hide and ship it."
reward = 1500
reward = CARGO_CRATE_VALUE * 3
wanted_types = list(/obj/item/stack/sheet/animalhide/monkey)
/datum/bounty/item/assistant/comfy_chair
name = "Comfy Chairs"
description = "Commander Pat is unhappy with his chair. He claims it hurts his back. Ship some alternatives out to humor him."
reward = 1500
reward = CARGO_CRATE_VALUE * 3
required_count = 5
wanted_types = list(/obj/structure/chair/comfy)
/datum/bounty/item/assistant/geranium
name = "Geraniums"
description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_count = 3
wanted_types = list(/obj/item/food/grown/poppy/geranium)
include_subtypes = FALSE
@@ -128,7 +128,7 @@
/datum/bounty/item/assistant/poppy
name = "Poppies"
description = "Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of Poppies - her favorite flower - and he'll happily reward you."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
required_count = 3
wanted_types = list(/obj/item/food/grown/poppy)
include_subtypes = FALSE
@@ -136,54 +136,54 @@
/datum/bounty/item/assistant/shadyjims
name = "Shady Jim's"
description = "There's an irate officer at CentCom demanding that he receive a box of Shady Jim's cigarettes. Please ship one. He's starting to make threats."
reward = 500
reward = CARGO_CRATE_VALUE
wanted_types = list(/obj/item/storage/fancy/cigarettes/cigpack_shadyjims)
/datum/bounty/item/assistant/potted_plants
name = "Potted Plants"
description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 8
wanted_types = list(/obj/item/kirbyplants)
/datum/bounty/item/assistant/monkey_cubes
name = "Monkey Cubes"
description = "Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 3
wanted_types = list(/obj/item/food/monkeycube)
/datum/bounty/item/assistant/ied
name = "IED"
description = "Nanotrasen's maximum security prison at CentCom is undergoing personnel training. Ship a handful of IEDs to serve as a training tools."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 3
wanted_types = list(/obj/item/grenade/iedcasing)
/datum/bounty/item/assistant/corgimeat
name = "Raw Corgi Meat"
description = "The Syndicate recently stole all of CentCom's Corgi meat. Ship out a replacement immediately."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/item/food/meat/slab/corgi)
/datum/bounty/item/assistant/action_figures
name = "Action Figures"
description = "The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_count = 5
wanted_types = list(/obj/item/toy/figure)
/datum/bounty/item/assistant/dead_mice
name = "Dead Mice"
description = "Station 14 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 5
wanted_types = list(/obj/item/food/deadmouse)
/datum/bounty/item/assistant/paper_bin
name = "Paper Bins"
description = "Our accounting division is all out of paper. We need a new shipment immediately."
reward = 2500
reward = CARGO_CRATE_VALUE * 5
required_count = 5
wanted_types = list(/obj/item/paper_bin)
@@ -191,14 +191,14 @@
/datum/bounty/item/assistant/crayons
name = "Crayons"
description = "Dr Jones' kid ate all our crayons again. Please send us yours."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 24
wanted_types = list(/obj/item/toy/crayon)
/datum/bounty/item/assistant/pens
name = "Pens"
description = "We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 10
include_subtypes = FALSE
wanted_types = list(/obj/item/pen)
code/modules/cargo/bounties/botany.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/bounty/item/botany
reward = 5000
reward = CARGO_CRATE_VALUE * 10
var/datum/bounty/item/botany/multiplier = 0 //adds bonus reward money; increased for higher tier or rare mutations
var/datum/bounty/item/botany/bonus_desc //for adding extra flavor text to bounty descriptions
var/datum/bounty/item/botany/foodtype = "meal" //same here
@@ -7,7 +7,7 @@
/datum/bounty/item/botany/New()
..()
description = "Central Command's head chef is looking to prepare a fine [foodtype] with [name]. [bonus_desc]"
reward += multiplier * 1000
reward += multiplier * (CARGO_CRATE_VALUE * 2)
required_count = rand(5, 10)
/datum/bounty/item/botany/ambrosia_vulgaris
code/modules/cargo/bounties/chef.dm
+22 -22
View File
@@ -1,144 +1,144 @@
/datum/bounty/item/chef/birthday_cake
name = "Birthday Cake"
description = "Nanotrasen's birthday is coming up! Ship them a birthday cake to celebrate!"
reward = 4000
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/food/cake/birthday, /obj/item/food/cakeslice/birthday)
/datum/bounty/item/chef/soup
name = "Soup"
description = "To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 3
wanted_types = list(/obj/item/food/soup)
/datum/bounty/item/chef/popcorn
name = "Popcorn Bags"
description = "Upper management wants to host a movie night. Ship bags of popcorn for the occasion."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 3
wanted_types = list(/obj/item/food/popcorn)
/datum/bounty/item/chef/onionrings
name = "Onion Rings"
description = "Nanotrasen is remembering Saturn day. Ship onion rings to show the station's support."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 3
wanted_types = list(/obj/item/food/onionrings)
/datum/bounty/item/chef/icecreamsandwich
name = "Ice Cream Sandwiches"
description = "Upper management has been screaming non-stop for ice cream. Please send some."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_count = 3
wanted_types = list(/obj/item/food/icecreamsandwich)
/datum/bounty/item/chef/strawberryicecreamsandwich
name = " Strawberry Ice Cream Sandwiches"
description = "Upper management has been screaming non-stop for more flavourful ice cream. Please send some."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/food/strawberryicecreamsandwich)
/datum/bounty/item/chef/bread
name = "Bread"
description = "Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
wanted_types = list(/obj/item/food/bread, /obj/item/food/breadslice, /obj/item/food/bun, /obj/item/food/pizzabread, /obj/item/food/rawpastrybase)
/datum/bounty/item/chef/pie
name = "Pie"
description = "3.14159? No! CentCom management wants edible pie! Ship a whole one."
reward = 3142
reward = 3142 //Screw it I'll do this one by hand
wanted_types = list(/obj/item/food/pie)
/datum/bounty/item/chef/salad
name = "Salad or Rice Bowls"
description = "CentCom management is going on a health binge. Your order is to ship salad or rice bowls."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 3
wanted_types = list(/obj/item/food/salad)
/datum/bounty/item/chef/carrotfries
name = "Carrot Fries"
description = "Night sight can mean life or death! A shipment of carrot fries is the order."
reward = 3500
reward = CARGO_CRATE_VALUE * 7
required_count = 3
wanted_types = list(/obj/item/food/carrotfries)
/datum/bounty/item/chef/superbite
name = "Super Bite Burger"
description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him."
reward = 12000
reward = CARGO_CRATE_VALUE * 24
wanted_types = list(/obj/item/food/burger/superbite)
/datum/bounty/item/chef/poppypretzel
name = "Poppy Pretzel"
description = "Central Command needs a reason to fire their HR head. Send over a poppy pretzel to force a failed drug test."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/item/food/poppypretzel)
/datum/bounty/item/chef/cubancarp
name = "Cuban Carp"
description = "To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom."
reward = 8000
reward = CARGO_CRATE_VALUE * 16
wanted_types = list(/obj/item/food/cubancarp)
/datum/bounty/item/chef/hotdog
name = "Hot Dog"
description = "Nanotrasen is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate."
reward = 8000
reward = CARGO_CRATE_VALUE * 16
wanted_types = list(/obj/item/food/hotdog)
/datum/bounty/item/chef/eggplantparm
name = "Eggplant Parmigianas"
description = "A famous singer will be arriving at CentCom, and their contract demands that they only be served Eggplant Parmigiana. Ship some, please!"
reward = 3500
reward = CARGO_CRATE_VALUE * 7
required_count = 3
wanted_types = list(/obj/item/food/eggplantparm)
/datum/bounty/item/chef/muffin
name = "Muffins"
description = "The Muffin Man is visiting CentCom, but he's forgotten his muffins! Your order is to rectify this."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 3
wanted_types = list(/obj/item/food/muffin)
/datum/bounty/item/chef/chawanmushi
name = "Chawanmushi"
description = "Nanotrasen wants to improve relations with its sister company, Japanotrasen. Ship Chawanmushi immediately."
reward = 8000
reward = CARGO_CRATE_VALUE * 16
wanted_types = list(/obj/item/food/chawanmushi)
/datum/bounty/item/chef/kebab
name = "Kebabs"
description = "Remove all kebab from station you are best food. Ship to CentCom to remove from the premises."
reward = 3500
reward = CARGO_CRATE_VALUE * 7
required_count = 3
wanted_types = list(/obj/item/food/kebab)
/datum/bounty/item/chef/soylentgreen
name = "Soylent Green"
description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you endulge them, expect a pleasant bonus."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
wanted_types = list(/obj/item/food/soylentgreen)
/datum/bounty/item/chef/pancakes
name = "Pancakes"
description = "Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 13
wanted_types = list(/obj/item/food/pancakes)
/datum/bounty/item/chef/nuggies
name = "Chicken Nuggets"
description = "The vice president's son won't shut up about chicken nuggies. Would you mind shipping some?"
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_count = 6
wanted_types = list(/obj/item/food/nugget)
/datum/bounty/item/chef/corgifarming //Butchering is a chef's job.
name = "Corgi Hides"
description = "Admiral Weinstein's space yacht needs new upholstery. A dozen Corgi furs should do just fine."
reward = 30000 //that's a lot of dead dogs
reward = CARGO_CRATE_VALUE * 60 //that's a lot of dead dogs
required_count = 12
wanted_types = list(/obj/item/stack/sheet/animalhide/corgi)
code/modules/cargo/bounties/engineering.dm
+4 -4
View File
@@ -1,7 +1,7 @@
/datum/bounty/item/engineering/gas
name = "Full Tank of Pluoxium"
description = "CentCom RnD is researching extra compact internals. Ship us a tank full of Pluoxium and you'll be compensated."
reward = 7500
reward = CARGO_CRATE_VALUE * 15
wanted_types = list(/obj/item/tank)
var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact.
var/gas_type = /datum/gas/pluoxium
@@ -37,17 +37,17 @@
/datum/bounty/item/engineering/gas/zauker_tank
name = "Full Tank of Zauker"
description = "The main planet of \[REDACTED] has been chosen as testing grounds for the new weapon that uses Zauker gas. Ship us a tank full of it. (20 Moles)"
reward = 10000
reward = CARGO_CRATE_VALUE * 20
gas_type = /datum/gas/zauker
/datum/bounty/item/engineering/emitter
name = "Emitter"
description = "We think there may be a defect in your station's emitter designs, based on the sheer number of delaminations your sector seems to see. Ship us one of yours."
reward = 2500
reward = CARGO_CRATE_VALUE * 5
wanted_types = list(/obj/machinery/power/emitter)
/datum/bounty/item/engineering/hydro_tray
name = "Hydroponics Tray"
description = "The lab technicians are trying to figure out how to lower the power drain of hydroponics trays, but we fried our last one. Mind building one for us?"
reward = 2000
reward = CARGO_CRATE_VALUE * 4
wanted_types = list(/obj/machinery/hydroponics/constructable)
code/modules/cargo/bounties/mech.dm
+5 -5
View File
@@ -15,25 +15,25 @@
/datum/bounty/item/mech/ripleymk2
name = "APLU MK-II \"Ripley\""
reward = 13000
reward = CARGO_CRATE_VALUE * 26
wanted_types = list(/obj/vehicle/sealed/mecha/working/ripley/mk2)
/datum/bounty/item/mech/clarke
name = "Clarke"
reward = 16000
reward = CARGO_CRATE_VALUE * 32
wanted_types = list(/obj/vehicle/sealed/mecha/working/clarke)
/datum/bounty/item/mech/odysseus
name = "Odysseus"
reward = 11000
reward = CARGO_CRATE_VALUE * 22
wanted_types = list(/obj/vehicle/sealed/mecha/medical/odysseus)
/datum/bounty/item/mech/gygax
name = "Gygax"
reward = 28000
reward = CARGO_CRATE_VALUE * 56
wanted_types = list(/obj/vehicle/sealed/mecha/combat/gygax)
/datum/bounty/item/mech/durand
name = "Durand"
reward = 20000
reward = CARGO_CRATE_VALUE * 40
wanted_types = list(/obj/vehicle/sealed/mecha/combat/durand)
code/modules/cargo/bounties/medical.dm
+13 -13
View File
@@ -1,7 +1,7 @@
/datum/bounty/item/medical/heart
name = "Heart"
description = "Commander Johnson is in critical condition after suffering yet another heart attack. Doctors say he needs a new heart fast. Ship one, pronto! We'll take a better cybernetic one, if need be."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/item/organ/heart)
exclude_types = list(/obj/item/organ/heart/cybernetic)//Excluding tier 1s, no cheesing.
special_include_types = list(/obj/item/organ/heart/cybernetic/tier2, /obj/item/organ/heart/cybernetic/tier3)
@@ -9,7 +9,7 @@
/datum/bounty/item/medical/lung
name = "Lungs"
description = "A recent explosion at Central Command has left multiple staff with punctured lungs. Ship spare lungs to be rewarded. We'll take a better cybernetic one, if need be."
reward = 10000
reward = CARGO_CRATE_VALUE * 20
required_count = 3
wanted_types = list(/obj/item/organ/lungs)
exclude_types = list(/obj/item/organ/lungs/cybernetic)//As above, for all printable organs.
@@ -18,13 +18,13 @@
/datum/bounty/item/medical/appendix
name = "Appendix"
description = "Chef Gibb of Central Command wants to prepare a meal using a very special delicacy: an appendix. If you ship one, he'll pay. We'll take a better cybernetic one, if need be."
reward = 5000 //there are no synthetic appendixes
reward = CARGO_CRATE_VALUE * 10 //there are no synthetic appendixes
wanted_types = list(/obj/item/organ/appendix)
/datum/bounty/item/medical/ears
name = "Ears"
description = "Multiple staff at Station 12 have been left deaf due to unauthorized clowning. Ship them new ears. "
reward = 10000
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/organ/ears)
exclude_types = list(/obj/item/organ/ears/cybernetic)
@@ -33,7 +33,7 @@
/datum/bounty/item/medical/liver
name = "Livers"
description = "Multiple high-ranking CentCom diplomats have been hospitalized with liver failure after a recent meeting with Third Soviet Union ambassadors. Help us out, will you? We'll take better cybernetic ones, if need be."
reward = 10000
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/organ/liver)
exclude_types = list(/obj/item/organ/liver/cybernetic)
@@ -42,7 +42,7 @@
/datum/bounty/item/medical/eye
name = "Organic Eyes"
description = "Station 5's Research Director Willem is requesting a few pairs of non-robotic eyes. Don't ask questions, just ship them."
reward = 10000
reward = CARGO_CRATE_VALUE * 20
required_count = 3
wanted_types = list(/obj/item/organ/eyes)
exclude_types = list(/obj/item/organ/eyes/robotic)
@@ -50,42 +50,42 @@
/datum/bounty/item/medical/tongue
name = "Tongues"
description = "A recent attack by Mime extremists has left staff at Station 23 speechless. Ship some spare tongues."
reward = 10000
reward = CARGO_CRATE_VALUE * 20
required_count = 3
wanted_types = list(/obj/item/organ/tongue)
/datum/bounty/item/medical/lizard_tail
name = "Lizard Tail"
description = "The Wizard Federation has made off with Nanotrasen's supply of lizard tails. While CentCom is dealing with the wizards, can the station spare a tail of their own?"
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/item/organ/tail/lizard)
/datum/bounty/item/medical/cat_tail
name = "Cat Tail"
description = "Central Command has run out of heavy duty pipe cleaners. Can you ship over a cat tail to help us out?"
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/item/organ/tail/cat)
/datum/bounty/item/medical/chainsaw
name = "Chainsaw"
description = "A CMO at CentCom is having trouble operating on golems. She requests one chainsaw, please."
reward = 2500
reward = CARGO_CRATE_VALUE * 5
wanted_types = list(/obj/item/chainsaw)
/datum/bounty/item/medical/tail_whip //Like the cat tail bounties, with more processing.
name = "Nine Tails whip"
description = "Commander Jackson is looking for a fine addition to her exotic weapons collection. She will reward you handsomely for either a Cat or Liz o' Nine Tails."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/melee/chainofcommand/tailwhip)
/datum/bounty/item/medical/surgerycomp
name = "Surgery Computer"
description = "After another freak bombing incident at our annual cheesefest at centcom, we have a massive stack of injured crew on our end. Please send us a fresh surgery computer, if at all possible."
reward = 6000
reward = CARGO_CRATE_VALUE * 12
wanted_types = list(/obj/machinery/computer/operating)
/datum/bounty/item/medical/surgerytable
name = "Operating Table"
description = "After a recent influx of infected crew members recently, we've seen that masks just aren't cutting it alone. Silver Operating tables might just do the trick though, send us one to use."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
wanted_types = list(/obj/structure/table/optable)
code/modules/cargo/bounties/mining.dm
+11 -11
View File
@@ -1,71 +1,71 @@
/datum/bounty/item/mining/goliath_steaks
name = "Lava-Cooked Goliath Steaks"
description = "Admiral Pavlov has gone on hunger strike ever since the canteen started serving only monkey and monkey byproducts. She is demanding lava-cooked Goliath steaks."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/food/meat/steak/goliath)
/datum/bounty/item/mining/goliath_boat
name = "Goliath Hide Boat"
description = "Commander Menkov wants to participate in the annual Lavaland Regatta. He is asking your shipwrights to build the swiftest boat known to man."
reward = 10000
reward = CARGO_CRATE_VALUE * 20
wanted_types = list(/obj/vehicle/ridden/lavaboat)
/datum/bounty/item/mining/bone_oar
name = "Bone Oars"
description = "Commander Menkov requires oars to participate in the annual Lavaland Regatta. Ship a pair over."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_count = 2
wanted_types = list(/obj/item/oar)
/datum/bounty/item/mining/bone_axe
name = "Bone Axe"
description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
reward = 7500
reward = CARGO_CRATE_VALUE * 15
wanted_types = list(/obj/item/fireaxe/boneaxe)
/datum/bounty/item/mining/bone_armor
name = "Bone Armor"
description = "Station 14 has volunteered their lizard crew for ballistic armor testing. Ship over some bone armor."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
wanted_types = list(/obj/item/clothing/suit/armor/bone)
/datum/bounty/item/mining/skull_helmet
name = "Skull Helmet"
description = "Station 42's Head of Security has her birthday tomorrow! We want to suprise her with a fashionable skull helmet."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/clothing/head/helmet/skull)
/datum/bounty/item/mining/bone_talisman
name = "Bone Talismans"
description = "Station 14's Research Director claims that pagan bone talismans protect their wearer. Ship them a few so they can start testing."
reward = 7500
reward = CARGO_CRATE_VALUE * 15
required_count = 3
wanted_types = list(/obj/item/clothing/accessory/talisman)
/datum/bounty/item/mining/bone_dagger
name = "Bone Daggers"
description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our Chef can keep working."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/kitchen/knife/combat/bone)
/datum/bounty/item/mining/polypore_mushroom
name = "Mushroom Bowl"
description = "Lieutenant Jeb dropped his favorite mushroom bowl. Cheer him up by shipping a new one, will you?"
reward = 7500 //5x mushroom shavings
reward = CARGO_CRATE_VALUE * 15 //5x mushroom shavings
wanted_types = list(/obj/item/reagent_containers/glass/bowl/mushroom_bowl)
/datum/bounty/item/mining/inocybe_mushroom
name = "Mushroom Caps"
description = "Our botanist claims that he can distill tasty liquor from absolutely any plant. Let's see what he'll do with Inocybe mushroom caps."
reward = 4500
reward = CARGO_CRATE_VALUE * 9
required_count = 3
wanted_types = list(/obj/item/food/grown/ash_flora/mushroom_cap)
/datum/bounty/item/mining/porcini_mushroom
name = "Mushroom Leaves"
description = "Porcini mushroom leaves are rumored to have healing properties. Our researchers want to put that claim to the test."
reward = 4500
reward = CARGO_CRATE_VALUE * 9
required_count = 3
wanted_types = list(/obj/item/food/grown/ash_flora/mushroom_leaf)
code/modules/cargo/bounties/reagent.dm
+6 -6
View File
@@ -33,7 +33,7 @@
/datum/bounty/reagent/simple_drink
name = "Simple Drink"
reward = 1500
reward = CARGO_CRATE_VALUE * 3
/datum/bounty/reagent/simple_drink/New()
// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
@@ -89,7 +89,7 @@
/datum/bounty/reagent/complex_drink
name = "Complex Drink"
reward = 4000
reward = CARGO_CRATE_VALUE * 8
/datum/bounty/reagent/complex_drink/New()
// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
@@ -122,7 +122,7 @@
/datum/bounty/reagent/chemical_simple
name = "Simple Chemical"
reward = 4000
reward = CARGO_CRATE_VALUE * 8
required_volume = 30
/datum/bounty/reagent/chemical_simple/New()
@@ -160,7 +160,7 @@
/datum/bounty/reagent/chemical_complex
name = "Rare Chemical"
reward = 6000
reward = CARGO_CRATE_VALUE * 12
required_volume = 20
/datum/bounty/reagent/chemical_complex/New()
@@ -227,7 +227,7 @@
/datum/bounty/pill/simple_pill
name = "Simple Pill"
reward = 10000
reward = CARGO_CRATE_VALUE * 20
/datum/bounty/pill/simple_pill/New()
//reagent that are possible to be chem factory'd
@@ -255,4 +255,4 @@
required_ammount += rand(1,60)
wanted_vol += rand(1,20)
description = "CentCom requires [required_ammount] of [name] containing at least [wanted_vol] each. Ship a container of it to be rewarded."
reward += rand(1, 5) * 3000
reward += rand(1, 5) * (CARGO_CRATE_VALUE * 6)
code/modules/cargo/bounties/science.dm
+7 -7
View File
@@ -2,7 +2,7 @@
/datum/bounty/item/science/relic
name = "E.X.P.E.R.I-MENTORially Discovered Devices"
description = "Psst, hey. Don't tell the assistants, but we're undercutting them on the value of those 'strange objects' they've been finding. Fish one up and send us a discovered one by using the E.X.P.E.R.I-MENTOR."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/relic)
/datum/bounty/item/science/relic/applies_to(obj/O)
@@ -16,13 +16,13 @@
/datum/bounty/item/science/bepis_disc
name = "Reformatted Tech Disk"
description = "It turns out the diskettes the BEPIS prints experimental nodes on are extremely space-efficient. Send us one of your spares when you're done with it."
reward = 4000
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/disk/tech_disk/major, /obj/item/disk/tech_disk/spaceloot)
/datum/bounty/item/science/genetics
name = "Genetics Disability Mutator"
description = "Understanding the humanoid genome is the first step to curing many spaceborn genetic defects, and exceeding our basest limits."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
wanted_types = list(/obj/item/dnainjector)
///What's the instability
var/desired_instability = 0
@@ -30,7 +30,7 @@
/datum/bounty/item/science/genetics/New()
. = ..()
desired_instability = rand(10,40)
reward += desired_instability * 100
reward += desired_instability * (CARGO_CRATE_VALUE * 0.2)
description += " We want a DNA injector whose total instability is higher than [desired_instability] points."
/datum/bounty/item/science/genetics/applies_to(obj/O)
@@ -53,21 +53,21 @@
/datum/bounty/item/science/NTNet
name = "Modular Tablets"
description = "Turns out that NTNet wasn't actually a fad afterall, who knew. Ship us some fully constructed tablets and send it turned on."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 4
wanted_types = list(/obj/item/modular_computer/tablet)
/datum/bounty/item/science/NTNet/laptops
name = "Modular Laptops"
description = "Central command brass need something more powerful than a tablet, but more portable than a console. Help these old fogeys out by shipping us some working laptops. Send it turned on."
reward = 1500
reward = CARGO_CRATE_VALUE * 3
required_count = 2
wanted_types = list(/obj/item/modular_computer/laptop)
/datum/bounty/item/science/NTNet/console
name = "Modular Computer Console"
description = "Our big data devision needs more powerful hardware to play 'Outbomb Cuban Pe-', err, to closely monitor threats in your sector. Send us a working modular computer console."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 1
wanted_types = list(/obj/machinery/modular_computer/console)
code/modules/cargo/bounties/security.dm
+7 -7
View File
@@ -1,47 +1,47 @@
/datum/bounty/item/security/riotshotgun
name = "Riot Shotguns"
description = "Hooligans have boarded CentCom! Ship riot shotguns quick, or things are going to get dirty."
reward = 5000
reward = CARGO_CRATE_VALUE * 10
required_count = 2
wanted_types = list(/obj/item/gun/ballistic/shotgun/riot)
/datum/bounty/item/security/recharger
name = "Rechargers"
description = "Nanotrasen military academy is conducting marksmanship exercises. They request that rechargers be shipped."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 3
wanted_types = list(/obj/machinery/recharger)
/datum/bounty/item/security/pepperspray
name = "Pepperspray"
description = "We've been having a bad run of riots on Space Station 76. We could use some new pepperspray cans."
reward = 3000
reward = CARGO_CRATE_VALUE * 6
required_count = 4
wanted_types = list(/obj/item/reagent_containers/spray/pepper)
/datum/bounty/item/security/prison_clothes
name = "Prison Uniforms"
description = "Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands."
reward = 2000
reward = CARGO_CRATE_VALUE * 4
required_count = 4
wanted_types = list(/obj/item/clothing/under/rank/prisoner)
/datum/bounty/item/security/plates
name = "License Plates"
description = "As a result of a bad clown car crash, we could use an advance on some of your prisoner's license plates."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
required_count = 10
wanted_types = list(/obj/item/stack/license_plates/filled)
/datum/bounty/item/security/earmuffs
name = "Earmuffs"
description = "Central Command is getting tired of your station's messages. They've ordered that you ship some earmuffs to lessen the annoyance."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
wanted_types = list(/obj/item/clothing/ears/earmuffs)
/datum/bounty/item/security/handcuffs
name = "Handcuffs"
description = "A large influx of escaped convicts have arrived at Central Command. Now is the perfect time to ship out spare handcuffs (or restraints)."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
required_count = 5
wanted_types = list(/obj/item/restraints/handcuffs)
code/modules/cargo/bounties/slime.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/bounty/item/slime
reward = 3000
reward = CARGO_CRATE_VALUE * 6
/datum/bounty/item/slime/New()
..()
code/modules/cargo/bounties/special.dm
+4 -4
View File
@@ -1,14 +1,14 @@
/datum/bounty/item/alien_organs
name = "Alien Organs"
description = "Nanotrasen is interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated."
reward = 25000
reward = CARGO_CRATE_VALUE * 50
required_count = 3
wanted_types = list(/obj/item/organ/brain/alien, /obj/item/organ/alien, /obj/item/organ/body_egg/alien_embryo, /obj/item/organ/liver/alien, /obj/item/organ/tongue/alien, /obj/item/organ/eyes/night_vision/alien)
/datum/bounty/item/syndicate_documents
name = "Syndicate Documents"
description = "Intel regarding the syndicate is highly prized at CentCom. If you find syndicate documents, ship them. You could save lives."
reward = 15000
reward = CARGO_CRATE_VALUE * 30
wanted_types = list(/obj/item/documents/syndicate, /obj/item/documents/photocopy)
/datum/bounty/item/syndicate_documents/applies_to(obj/O)
@@ -22,14 +22,14 @@
/datum/bounty/item/adamantine
name = "Adamantine"
description = "Nanotrasen's anomalous materials division is in desparate need for Adamantine. Send them a large shipment and we'll make it worth your while."
reward = 35000
reward = CARGO_CRATE_VALUE * 70
required_count = 10
wanted_types = list(/obj/item/stack/sheet/mineral/adamantine)
/datum/bounty/item/trash
name = "Trash"
description = "Recently a group of janitors have run out of trash to clean up, without any trash CentCom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation."
reward = 1000
reward = CARGO_CRATE_VALUE * 2
required_count = 10
wanted_types = list(/obj/item/trash)
code/modules/cargo/bounties/virus.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/bounty/virus
reward = 5000
reward = CARGO_CRATE_VALUE * 10
var/shipped = FALSE
var/stat_value = 0
var/stat_name = ""
@@ -11,7 +11,7 @@
stat_value *= -1
name = "Virus ([stat_name] of [stat_value])"
description = "Nanotrasen is interested in a virus with a [stat_name] stat of exactly [stat_value]. Central Command will pay handsomely for such a virus."
reward += rand(0, 4) * 500
reward += rand(0, 4) * CARGO_CRATE_VALUE
/datum/bounty/virus/completion_string()
return shipped ? "Shipped" : "Not Shipped"
code/modules/cargo/exports/gear.dm
+19 -19
View File
@@ -1,105 +1,105 @@
/datum/export/gear
/datum/export/gear/sec_helmet
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "helmet"
export_types = list(/obj/item/clothing/head/helmet/sec)
/datum/export/gear/sec_armor
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "armor vest"
export_types = list(/obj/item/clothing/suit/armor/vest)
/datum/export/gear/riot_shield
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "riot shield"
export_types = list(/obj/item/shield/riot)
/datum/export/gear/mask/breath
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "breath mask"
export_types = list(/obj/item/clothing/mask/breath)
/datum/export/gear/mask/gas
cost = 10
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "gas mask"
export_types = list(/obj/item/clothing/mask/gas)
include_subtypes = FALSE
/datum/export/gear/space/helmet
cost = 75
cost = CARGO_CRATE_VALUE * 0.15
unit_name = "space helmet"
export_types = list(/obj/item/clothing/head/helmet/space, /obj/item/clothing/head/helmet/space/eva, /obj/item/clothing/head/helmet/space/nasavoid)
include_subtypes = FALSE
/datum/export/gear/space/suit
cost = 150
cost = CARGO_CRATE_VALUE * 0.3
unit_name = "space suit"
export_types = list(/obj/item/clothing/suit/space, /obj/item/clothing/suit/space/eva, /obj/item/clothing/suit/space/nasavoid)
include_subtypes = FALSE
/datum/export/gear/space/syndiehelmet
cost = 150
cost = CARGO_CRATE_VALUE * 0.3
unit_name = "Syndicate space helmet"
export_types = list(/obj/item/clothing/head/helmet/space/syndicate)
/datum/export/gear/space/syndiesuit
cost = 300
cost = CARGO_CRATE_VALUE * 0.6
unit_name = "Syndicate space suit"
export_types = list(/obj/item/clothing/suit/space/syndicate)
/datum/export/gear/radhelmet
cost = 50
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "radsuit hood"
export_types = list(/obj/item/clothing/head/radiation)
/datum/export/gear/radsuit
cost = 100
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "radsuit"
export_types = list(/obj/item/clothing/suit/radiation)
/datum/export/gear/biohood
cost = 50
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "biosuit hood"
export_types = list(/obj/item/clothing/head/bio_hood)
/datum/export/gear/biosuit
cost = 100
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "biosuit"
export_types = list(/obj/item/clothing/suit/bio_suit)
/datum/export/gear/bombhelmet
cost = 50
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "bomb suit hood"
export_types = list(/obj/item/clothing/head/bomb_hood)
/datum/export/gear/bombsuit
cost = 100
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "bomb suit"
export_types = list(/obj/item/clothing/suit/bomb_suit)
/datum/export/gear/lizardboots
cost = 350
cost = CARGO_CRATE_VALUE * 0.7
unit_name = "lizard skin boots"
export_types = list(/obj/item/clothing/shoes/cowboy/lizard)
include_subtypes = FALSE
/datum/export/gear/lizardmasterwork
cost = 1000
cost = CARGO_CRATE_VALUE * 2
unit_name = "Hugs-the-Feet lizard boots"
export_types = list(/obj/item/clothing/shoes/cowboy/lizard/masterwork)
/datum/export/gear/bilton
cost = 2500
cost = CARGO_CRATE_VALUE * 5
unit_name = "bilton wrangler boots"
export_types = list(/obj/item/clothing/shoes/cowboy/fancy)
/datum/export/gear/ebonydie
cost = 500
cost = CARGO_CRATE_VALUE
unit_name = "ebony die"
export_types = list(/obj/item/dice/d6/ebony)
code/modules/cargo/exports/large_objects.dm
+17 -17
View File
@@ -1,5 +1,5 @@
/datum/export/large/crate
cost = 500
cost = CARGO_CRATE_VALUE
k_elasticity = 0
unit_name = "crate"
export_types = list(/obj/structure/closet/crate)
@@ -11,7 +11,7 @@
. += " Thanks for participating in Nanotrasen Crates Recycling Program."
/datum/export/large/crate/wooden
cost = 100
cost = CARGO_CRATE_VALUE/5
unit_name = "large wooden crate"
export_types = list(/obj/structure/closet/crate/large)
exclude_types = list()
@@ -21,18 +21,18 @@
export_types = list(/obj/structure/ore_box)
/datum/export/large/crate/wood
cost = 240
cost = CARGO_CRATE_VALUE * 0.48
unit_name = "wooden crate"
export_types = list(/obj/structure/closet/crate/wooden)
exclude_types = list()
/datum/export/large/crate/coffin
cost = 250//50 wooden crates cost 2000 points, and you can make 10 coffins in seconds with those planks. Each coffin selling for 250 means you can make a net gain of 500 points for wasting your time making coffins.
cost = CARGO_CRATE_VALUE/2 //50 wooden crates cost 2000 points, and you can make 10 coffins in seconds with those planks. Each coffin selling for 250 means you can make a net gain of 500 points for wasting your time making coffins.
unit_name = "coffin"
export_types = list(/obj/structure/closet/crate/coffin)
/datum/export/large/reagent_dispenser
cost = 100 // +0-400 depending on amount of reagents left
cost = CARGO_CRATE_VALUE * 0.5 // +0-400 depending on amount of reagents left
var/contents_cost = 400
/datum/export/large/reagent_dispenser/get_cost(obj/O)
@@ -52,57 +52,57 @@
/datum/export/large/reagent_dispenser/beer
unit_name = "beer keg"
contents_cost = 700
contents_cost = CARGO_CRATE_VALUE * 3.5
export_types = list(/obj/structure/reagent_dispensers/beerkeg)
/datum/export/large/pipedispenser
cost = 500
cost = CARGO_CRATE_VALUE * 2.5
unit_name = "pipe dispenser"
export_types = list(/obj/machinery/pipedispenser)
/datum/export/large/emitter
cost = 550
cost = CARGO_CRATE_VALUE * 2.75
unit_name = "emitter"
export_types = list(/obj/machinery/power/emitter)
/datum/export/large/field_generator
cost = 550
cost = CARGO_CRATE_VALUE * 2.75
unit_name = "field generator"
export_types = list(/obj/machinery/field/generator)
/datum/export/large/collector
cost = 400
cost = CARGO_CRATE_VALUE * 2
unit_name = "radiation collector"
export_types = list(/obj/machinery/power/rad_collector)
/datum/export/large/tesla_coil
cost = 450
cost = CARGO_CRATE_VALUE * 2.25
unit_name = "tesla coil"
export_types = list(/obj/machinery/power/tesla_coil)
/datum/export/large/supermatter
cost = 8000
cost = CARGO_CRATE_VALUE * 16
unit_name = "supermatter shard"
export_types = list(/obj/machinery/power/supermatter_crystal/shard)
/datum/export/large/grounding_rod
cost = 350
cost = CARGO_CRATE_VALUE * 1.2
unit_name = "grounding rod"
export_types = list(/obj/machinery/power/grounding_rod)
/datum/export/large/iv
cost = 50
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "iv drip"
export_types = list(/obj/machinery/iv_drip)
/datum/export/large/barrier
cost = 25
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "security barrier"
export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security)
/datum/export/large/gas_canister
cost = 10 //Base cost of canister. You get more for nice gases inside.
cost = CARGO_CRATE_VALUE * 0.05 //Base cost of canister. You get more for nice gases inside.
unit_name = "Gas Canister"
export_types = list(/obj/machinery/portable_atmospherics/canister)
k_elasticity = 0.00033
@@ -127,7 +127,7 @@
/datum/gas/halon
)
var/list/gas_prices = list(/datum/gas/bz = 4,
var/list/gas_prices = list(/datum/gas/bz = 2,
/datum/gas/stimulum = 100,
/datum/gas/hypernoblium = 5,
/datum/gas/miasma = 2,
code/modules/cargo/exports/lavaland.dm
+5 -5
View File
@@ -2,7 +2,7 @@
//Consumable or one-use items like the magic D20 and gluttony's blessing are omitted
/datum/export/lavaland/minor
cost = 10000
cost = CARGO_CRATE_VALUE * 20
unit_name = "minor lava planet artifact"
export_types = list(/obj/item/immortality_talisman,
/obj/item/book_of_babel,
@@ -28,7 +28,7 @@
/obj/item/veilrender/vealrender)
/datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
cost = 20000
cost = CARGO_CRATE_VALUE * 40
unit_name = "lava planet artifact"
export_types = list(/obj/item/guardiancreator,
/obj/item/rod_of_asclepius,
@@ -39,7 +39,7 @@
//Megafauna loot, except for ash drakes and legion
/datum/export/lavaland/megafauna
cost = 40000
cost = CARGO_CRATE_VALUE * 80
unit_name = "major lava planet artifact"
export_types = list(/obj/item/hierophant_club,
/obj/item/melee/transforming/cleaving_saw,
@@ -54,11 +54,11 @@
. += " On behalf of the Nanotrasen RnD division: Thank you for your hard work."
/datum/export/lavaland/megafauna/hev/suit
cost = 30000
cost = CARGO_CRATE_VALUE * 60
unit_name = "H.E.C.K. suit"
export_types = list(/obj/item/clothing/suit/space/hostile_environment)
/datum/export/lavaland/megafauna/hev/helmet
cost = 10000
cost = CARGO_CRATE_VALUE * 20
unit_name = "H.E.C.K. helmet"
export_types = list(/obj/item/clothing/head/helmet/space/hostile_environment)
code/modules/cargo/exports/manifest.dm
+4 -4
View File
@@ -1,7 +1,7 @@
// Approved manifest.
// +200 credits flat.
// +80 credits flat.
/datum/export/manifest_correct
cost = 200
cost = CARGO_CRATE_VALUE * 0.4
k_elasticity = 0
unit_name = "approved manifest"
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
@@ -18,7 +18,7 @@
// Correctly denied manifest.
// Refunds the package cost minus the cost of crate.
/datum/export/manifest_error_denied
cost = -500
cost = -CARGO_CRATE_VALUE
k_elasticity = 0
unit_name = "correctly denied manifest"
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
@@ -60,7 +60,7 @@
// Erroneously denied manifest.
// Substracts the package cost minus the cost of crate.
/datum/export/manifest_correct_denied
cost = 500
cost = CARGO_CRATE_VALUE
unit_name = "erroneously denied manifest"
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
code/modules/cargo/exports/materials.dm
+16 -16
View File
@@ -28,68 +28,68 @@
// Materials. Nothing but plasma is really worth selling. Better leave it all to RnD and sell some plasma instead.
/datum/export/material/bananium
cost = 1000
cost = CARGO_CRATE_VALUE * 2
material_id = /datum/material/bananium
message = "cm3 of bananium"
/datum/export/material/diamond
cost = 500
cost = CARGO_CRATE_VALUE
material_id = /datum/material/diamond
message = "cm3 of diamonds"
/datum/export/material/plasma
cost = 200
cost = CARGO_CRATE_VALUE * 0.4
k_elasticity = 0
material_id = /datum/material/plasma
message = "cm3 of plasma"
/datum/export/material/uranium
cost = 100
cost = CARGO_CRATE_VALUE * 0.2
material_id = /datum/material/uranium
message = "cm3 of uranium"
/datum/export/material/gold
cost = 125
cost = CARGO_CRATE_VALUE * 0.25
material_id = /datum/material/gold
message = "cm3 of gold"
/datum/export/material/silver
cost = 50
cost = CARGO_CRATE_VALUE * 0.1
material_id = /datum/material/silver
message = "cm3 of silver"
/datum/export/material/titanium
cost = 125
cost = CARGO_CRATE_VALUE * 0.25
material_id = /datum/material/titanium
message = "cm3 of titanium"
/datum/export/material/adamantine
cost = 500
cost = CARGO_CRATE_VALUE
material_id = /datum/material/adamantine
message = "cm3 of adamantine"
/datum/export/material/mythril
cost = 1500
cost = CARGO_CRATE_VALUE * 3
material_id = /datum/material/mythril
message = "cm3 of mythril"
/datum/export/material/bscrystal
cost = 300
cost = CARGO_CRATE_VALUE * 0.6
message = "of bluespace crystals"
material_id = /datum/material/bluespace
/datum/export/material/plastic
cost = 25
cost = CARGO_CRATE_VALUE * 0.05
message = "cm3 of plastic"
material_id = /datum/material/plastic
/datum/export/material/runite
cost = 600
cost = CARGO_CRATE_VALUE * 1.2
message = "cm3 of runite"
material_id = /datum/material/runite
/datum/export/material/metal
cost = 5
cost = CARGO_CRATE_VALUE * 0.01
message = "cm3 of metal"
material_id = /datum/material/iron
export_types = list(
@@ -97,20 +97,20 @@
/obj/item/stack/rods, /obj/item/stack/ore, /obj/item/coin)
/datum/export/material/glass
cost = 5
cost = CARGO_CRATE_VALUE * 0.01
message = "cm3 of glass"
material_id = /datum/material/glass
export_types = list(/obj/item/stack/sheet/glass, /obj/item/stack/ore,
/obj/item/shard)
/datum/export/material/hot_ice
cost = 400
cost = CARGO_CRATE_VALUE * 0.8
message = "cm3 of Hot Ice"
material_id = /datum/material/hot_ice
export_types = /obj/item/stack/sheet/hot_ice
/datum/export/material/metal_hydrogen
cost = 550
cost = CARGO_CRATE_VALUE * 1.05
unit_name = "of metallic hydrogen"
material_id = /datum/material/metalhydrogen
export_types = /obj/item/stack/sheet/mineral/metal_hydrogen
code/modules/cargo/exports/organs.dm
+10 -10
View File
@@ -3,53 +3,53 @@
export_category = EXPORT_CONTRABAND
/datum/export/organ/heart
cost = 10 //For the man who has everything and nothing.
cost = CARGO_CRATE_VALUE * 0.2 //For the man who has everything and nothing.
unit_name = "humanoid heart"
export_types = list(/obj/item/organ/heart)
/datum/export/organ/eyes
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid eyes"
export_types = list(/obj/item/organ/eyes)
/datum/export/organ/ears
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid ears"
export_types = list(/obj/item/organ/ears)
/datum/export/organ/liver
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid liver"
export_types = list(/obj/item/organ/liver)
/datum/export/organ/lungs
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid lungs"
export_types = list(/obj/item/organ/lungs)
/datum/export/organ/stomach
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid stomach"
export_types = list(/obj/item/organ/stomach)
/datum/export/organ/tongue
cost = 5
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "humanoid tounge"
export_types = list(/obj/item/organ/tongue)
/datum/export/organ/tail/lizard
cost = 250
cost = CARGO_CRATE_VALUE * 1.25
unit_name = "lizard tail"
export_types = list(/obj/item/organ/tail/lizard)
/datum/export/organ/tail/cat
cost = 300
cost = CARGO_CRATE_VALUE * 1.5
unit_name = "cat tail"
export_types = list(/obj/item/organ/tail/cat)
/datum/export/organ/ears/cat
cost = 200
cost = CARGO_CRATE_VALUE
unit_name = "cat ears"
export_types = list(/obj/item/organ/ears/cat)
code/modules/cargo/exports/parts.dm
+15 -15
View File
@@ -1,23 +1,23 @@
// Circuit boards, spare parts, etc.
/datum/export/solar/assembly
cost = 50
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "solar panel assembly"
export_types = list(/obj/item/solar_assembly)
/datum/export/solar/tracker_board
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "solar tracker board"
export_types = list(/obj/item/electronics/tracker)
/datum/export/solar/control_board
cost = 150
cost = CARGO_CRATE_VALUE * 0.75
unit_name = "solar panel control board"
export_types = list(/obj/item/circuitboard/computer/solar_control)
//Computer Tablets and Parts
/datum/export/modular_part
cost = 15
cost = CARGO_CRATE_VALUE * 0.075
unit_name = "miscellaneous computer part"
export_types = list(/obj/item/computer_hardware)
include_subtypes = TRUE
@@ -25,13 +25,13 @@
//Processors.
/datum/export/modular_part/processor
cost = 40
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "computer processor"
export_types = list(/obj/item/computer_hardware/processor_unit)
include_subtypes = FALSE
/datum/export/modular_part/processor/photoic
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "advanced computer processor"
export_types = list(/obj/item/computer_hardware/processor_unit)
include_subtypes = FALSE
@@ -39,21 +39,21 @@
//Batteries.
/datum/export/modular_part/battery
cost = 40
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "computer power cell"
export_types = list(/obj/item/stock_parts/cell/computer/nano)
include_subtypes = FALSE
/datum/export/modular_part/battery/upgraded
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "upgraded computer power cell"
export_types = list(/obj/item/stock_parts/cell/computer/micro)
include_subtypes = FALSE
/datum/export/modular_part/battery/advanced
cost = 150
cost = CARGO_CRATE_VALUE * 0.75
unit_name = "advanced computer power cell"
export_types = list(/obj/item/stock_parts/cell/computer)
include_subtypes = FALSE
@@ -61,38 +61,38 @@
//Hard Drives.
/datum/export/modular_part/harddrive
cost = 10
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "tiny computer harddrive"
export_types = list(/obj/item/computer_hardware/hard_drive/micro)
include_subtypes = TRUE
/datum/export/modular_part/harddrive/small
cost = 50
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "small computer harddrive"
export_types = list(/obj/item/computer_hardware/hard_drive/small)
include_subtypes = FALSE
/datum/export/modular_part/harddrive/normal
cost = 80
cost = CARGO_CRATE_VALUE * 0.4
unit_name = "computer harddrive"
export_types = list(/obj/item/computer_hardware/hard_drive)
include_subtypes = FALSE
//Networking/Card Parts
/datum/export/modular_part/networkcard
cost = 50
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "computer network card"
export_types = list(/obj/item/computer_hardware/network_card)
include_subtypes = TRUE
/datum/export/modular_part/idcard
cost = 20
cost = CARGO_CRATE_VALUE * 0.1
unit_name = "computer ID card slot"
export_types = list(/obj/item/computer_hardware/card_slot)
include_subtypes = TRUE
/datum/export/modular_part/intellicard
cost = 40
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "computer intellicard slot"
export_types = list(/obj/item/computer_hardware/ai_slot)
include_subtypes = TRUE
code/modules/cargo/exports/seeds.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/export/seed
cost = 50 // Gets multiplied by potency
cost = CARGO_CRATE_VALUE * 0.25 // Gets multiplied by potency
k_elasticity = 1 //price inelastic/quantity elastic, only need to export a few samples
unit_name = "new plant species sample"
export_types = list(/obj/item/seeds)
@@ -22,7 +22,7 @@
/datum/export/seed/potency
cost = 2.5 // Gets multiplied by potency and rarity.
cost = CARGO_CRATE_VALUE * 0.0125 // Gets multiplied by potency and rarity.
unit_name = "improved plant sample"
export_types = list(/obj/item/seeds)
needs_discovery = TRUE // Only for already discovered species
code/modules/cargo/exports/sheets.dm
+22 -22
View File
@@ -10,51 +10,51 @@
// Hides
/datum/export/stack/skin/monkey
cost = 50
cost = CARGO_CRATE_VALUE * 0.25
unit_name = "monkey hide"
export_types = list(/obj/item/stack/sheet/animalhide/monkey)
/datum/export/stack/skin/human
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
export_category = EXPORT_CONTRABAND
unit_name = "piece"
message = "of human skin"
export_types = list(/obj/item/stack/sheet/animalhide/human)
/datum/export/stack/skin/goliath_hide
cost = 200
cost = CARGO_CRATE_VALUE
unit_name = "goliath hide"
export_types = list(/obj/item/stack/sheet/animalhide/goliath_hide)
/datum/export/stack/skin/cat
cost = 150
cost = CARGO_CRATE_VALUE * 0.75
export_category = EXPORT_CONTRABAND
unit_name = "cat hide"
export_types = list(/obj/item/stack/sheet/animalhide/cat)
/datum/export/stack/skin/corgi
cost = 200
cost = CARGO_CRATE_VALUE
export_category = EXPORT_CONTRABAND
unit_name = "corgi hide"
export_types = list(/obj/item/stack/sheet/animalhide/corgi)
/datum/export/stack/skin/lizard
cost = 150
cost = CARGO_CRATE_VALUE * 0.75
unit_name = "lizard hide"
export_types = list(/obj/item/stack/sheet/animalhide/lizard)
/datum/export/stack/skin/gondola
cost = 5000
cost = CARGO_CRATE_VALUE * 10
unit_name = "gondola hide"
export_types = list(/obj/item/stack/sheet/animalhide/gondola)
/datum/export/stack/skin/xeno
cost = 500
cost = CARGO_CRATE_VALUE * 2.5
unit_name = "alien hide"
export_types = list(/obj/item/stack/sheet/animalhide/xeno)
/datum/export/stack/licenseplate
cost = 25
cost = CARGO_CRATE_VALUE * 0.125
unit_name = "license plate"
export_types = list(/obj/item/stack/license_plates/filled)
@@ -63,65 +63,65 @@
// For base materials, see materials.dm
/datum/export/stack/plasteel
cost = 155 // 2000u of plasma + 2000u of metal.
cost = CARGO_CRATE_VALUE * 0.41 // 2000u of plasma + 2000u of metal.
message = "of plasteel"
export_types = list(/obj/item/stack/sheet/plasteel)
// 1 glass + 0.5 metal, cost is rounded up.
/datum/export/stack/rglass
cost = 8
cost = CARGO_CRATE_VALUE * 0.02
message = "of reinforced glass"
export_types = list(/obj/item/stack/sheet/rglass)
/datum/export/stack/plastitanium
cost = 325 // plasma + titanium costs
cost = CARGO_CRATE_VALUE * 0.65 // plasma + titanium costs
message = "of plastitanium"
export_types = list(/obj/item/stack/sheet/mineral/plastitanium)
/datum/export/stack/wood
cost = 30
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "wood plank"
export_types = list(/obj/item/stack/sheet/mineral/wood)
/datum/export/stack/cloth
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
message = "rolls of cloth"
export_types = list(/obj/item/stack/sheet/cloth)
/datum/export/stack/durathread
cost = 70
cost = CARGO_CRATE_VALUE * 0.35
message = "rolls of durathread"
export_types = list(/obj/item/stack/sheet/durathread)
/datum/export/stack/cardboard
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
message = "of cardboard"
export_types = list(/obj/item/stack/sheet/cardboard)
/datum/export/stack/sandstone
cost = 1
cost = CARGO_CRATE_VALUE * 0.005
unit_name = "block"
message = "of sandstone"
export_types = list(/obj/item/stack/sheet/mineral/sandstone)
/datum/export/stack/cable
cost = 0.2
cost = CARGO_CRATE_VALUE * 0.001
unit_name = "cable piece"
export_types = list(/obj/item/stack/cable_coil)
/datum/export/stack/ammonia_crystals
cost = 25
cost = CARGO_CRATE_VALUE * 0.125
unit_name = "of ammonia crystal"
export_types = list(/obj/item/stack/ammonia_crystals)
/datum/export/stack/pizza
cost = 12
cost = CARGO_CRATE_VALUE * 0.06
unit_name = "of sheetza"
export_types = list(/obj/item/stack/sheet/pizza)
/datum/export/stack/meat
cost = 8
cost = CARGO_CRATE_VALUE * 0.04
unit_name = "of meat"
export_types = list(/obj/item/stack/sheet/meat)
@@ -129,6 +129,6 @@
// Weird Stuff
/datum/export/stack/abductor
cost = 1000
cost = CARGO_CRATE_VALUE * 2
message = "of alien alloy"
export_types = list(/obj/item/stack/sheet/mineral/abductor)
code/modules/cargo/exports/tools.dm
+28 -28
View File
@@ -1,5 +1,5 @@
/datum/export/toolbox
cost = 4
cost = CARGO_CRATE_VALUE * 0.02
unit_name = "toolbox"
export_types = list(/obj/item/storage/toolbox)
@@ -10,149 +10,149 @@
// Basic tools
/datum/export/screwdriver
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "screwdriver"
export_types = list(/obj/item/screwdriver)
include_subtypes = FALSE
/datum/export/wrench
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "wrench"
export_types = list(/obj/item/wrench)
/datum/export/crowbar
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "crowbar"
export_types = list(/obj/item/crowbar)
/datum/export/wirecutters
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "pair"
message = "of wirecutters"
export_types = list(/obj/item/wirecutters)
/datum/export/weldingtool
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "welding tool"
export_types = list(/obj/item/weldingtool)
include_subtypes = FALSE
/datum/export/weldingtool/emergency
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "emergency welding tool"
export_types = list(/obj/item/weldingtool/mini)
/datum/export/weldingtool/industrial
cost = 10
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "industrial welding tool"
export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
/datum/export/extinguisher
cost = 15
cost = CARGO_CRATE_VALUE * 0.075
unit_name = "fire extinguisher"
export_types = list(/obj/item/extinguisher)
include_subtypes = FALSE
/datum/export/extinguisher/mini
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "pocket fire extinguisher"
export_types = list(/obj/item/extinguisher/mini)
/datum/export/flashlight
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "flashlight"
export_types = list(/obj/item/flashlight)
include_subtypes = FALSE
/datum/export/flashlight/flare
cost = 2
cost = CARGO_CRATE_VALUE * 0.01
unit_name = "flare"
export_types = list(/obj/item/flashlight/flare)
/datum/export/flashlight/seclite
cost = 10
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "seclite"
export_types = list(/obj/item/flashlight/seclite)
/datum/export/analyzer
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "analyzer"
export_types = list(/obj/item/analyzer)
/datum/export/analyzer/t_scanner
cost = 10
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "t-ray scanner"
export_types = list(/obj/item/t_scanner)
/datum/export/radio
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "radio"
export_types = list(/obj/item/radio)
exclude_types = list(/obj/item/radio/mech)
//Advanced/Power Tools.
/datum/export/weldingtool/experimental
cost = 90
cost = CARGO_CRATE_VALUE * 0.45
unit_name = "experimental welding tool"
export_types = list(/obj/item/weldingtool/experimental)
/datum/export/jawsoflife
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "jaws of life"
export_types = list(/obj/item/crowbar/power)
/datum/export/handdrill
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "hand drill"
export_types = list(/obj/item/screwdriver/power)
/datum/export/rld_mini
cost = 150
cost = CARGO_CRATE_VALUE * 0.75
unit_name = "mini rapid lighting device"
export_types = list(/obj/item/construction/rld/mini)
/datum/export/rsf
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "rapid service fabricator"
export_types = list(/obj/item/rsf)
/datum/export/rcd
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "rapid construction device"
export_types = list(/obj/item/construction/rcd)
/datum/export/rcd_ammo
cost = 60
cost = CARGO_CRATE_VALUE * 0.3
unit_name = "compressed matter cardridge"
export_types = list(/obj/item/rcd_ammo)
/datum/export/rpd
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "rapid pipe dispenser"
export_types = list(/obj/item/pipe_dispenser)
//artisanal exports for the mom and pops
/datum/export/soap
cost = 75
cost = CARGO_CRATE_VALUE * 0.375
unit_name = "soap"
export_types = list(/obj/item/soap)
/datum/export/soap/homemade
cost = 30
cost = CARGO_CRATE_VALUE * 0.15
unit_name = "artisanal soap"
export_types = list(/obj/item/soap/homemade)
/datum/export/soap/omega
cost = 7000
cost = CARGO_CRATE_VALUE * 14
unit_name = "omega soap"
export_types = list(/obj/item/soap/omega)
/datum/export/candle
cost = 25
cost = CARGO_CRATE_VALUE * 0.125
unit_name = "candle"
export_types = list(/obj/item/candle)
code/modules/cargo/exports/weapons.dm
+12 -12
View File
@@ -4,68 +4,68 @@
include_subtypes = FALSE
/datum/export/weapon/baton
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "stun baton"
export_types = list(/obj/item/melee/baton)
exclude_types = list(/obj/item/melee/baton/cattleprod)
include_subtypes = TRUE
/datum/export/weapon/knife
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "combat knife"
export_types = list(/obj/item/kitchen/knife/combat)
/datum/export/weapon/taser
cost = 200
cost = CARGO_CRATE_VALUE
unit_name = "advanced taser"
export_types = list(/obj/item/gun/energy/e_gun/advtaser)
/datum/export/weapon/laser
cost = 200
cost = CARGO_CRATE_VALUE
unit_name = "laser gun"
export_types = list(/obj/item/gun/energy/laser)
/datum/export/weapon/disabler
cost = 100
cost = CARGO_CRATE_VALUE * 0.5
unit_name = "disabler"
export_types = list(/obj/item/gun/energy/disabler)
/datum/export/weapon/energy_gun
cost = 300
cost = CARGO_CRATE_VALUE * 1.5
unit_name = "energy gun"
export_types = list(/obj/item/gun/energy/e_gun)
/datum/export/weapon/wt550
cost = 300
cost = CARGO_CRATE_VALUE * 1.5
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/gun/ballistic/automatic/wt550)
/datum/export/weapon/shotgun
cost = 300
cost = CARGO_CRATE_VALUE * 1.5
unit_name = "combat shotgun"
export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat)
/datum/export/weapon/flashbang
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "flashbang grenade"
export_types = list(/obj/item/grenade/flashbang)
/datum/export/weapon/teargas
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "tear gas grenade"
export_types = list(/obj/item/grenade/chem_grenade/teargas)
/datum/export/weapon/flash
cost = 5
cost = CARGO_CRATE_VALUE * 0.025
unit_name = "handheld flash"
export_types = list(/obj/item/assembly/flash)
include_subtypes = TRUE
/datum/export/weapon/handcuffs
cost = 3
cost = CARGO_CRATE_VALUE * 0.015
unit_name = "pair"
message = "of handcuffs"
export_types = list(/obj/item/restraints/handcuffs)
code/modules/cargo/exports/xenobio.dm
+7 -7
View File
@@ -1,37 +1,37 @@
/datum/export/slime
/datum/export/slime/grey
cost = 25
cost = CARGO_CRATE_VALUE * 0.05
unit_name = "grey slime core"
export_types = list(/obj/item/slime_extract/grey)
/datum/export/slime/common
cost = 60
cost = CARGO_CRATE_VALUE * 0.12
unit_name = "common slime core"
export_types = list(/obj/item/slime_extract/metal,/obj/item/slime_extract/orange,/obj/item/slime_extract/purple,/obj/item/slime_extract/blue)
/datum/export/slime/uncommon
cost = 100
cost = CARGO_CRATE_VALUE * 0.2
unit_name = "uncommon slime core"
export_types = list(/obj/item/slime_extract/gold,/obj/item/slime_extract/green,/obj/item/slime_extract/red,/obj/item/slime_extract/pink)
/datum/export/slime/rare
cost = 140
cost = CARGO_CRATE_VALUE * 0.28
unit_name = "rare slime core"
export_types = list(/obj/item/slime_extract/silver,/obj/item/slime_extract/darkblue,/obj/item/slime_extract/darkpurple,/obj/item/slime_extract/yellow)
/datum/export/slime/hypercharged
cost = 600
cost = CARGO_CRATE_VALUE * 1.2
unit_name = "hypercharged slime core"
export_types = list(/obj/item/stock_parts/cell/high/slime_hypercharged)
/datum/export/slime/epic //EPIIIIIIC
cost = 220
cost = CARGO_CRATE_VALUE * 0.44
unit_name = "epic slime core"
export_types = list(/obj/item/slime_extract/black,/obj/item/slime_extract/cerulean,/obj/item/slime_extract/oil,/obj/item/slime_extract/sepia,/obj/item/slime_extract/pyrite,/obj/item/slime_extract/adamantine,/obj/item/slime_extract/lightpink,/obj/item/slime_extract/bluespace)
/datum/export/slime/rainbow
cost = 500
cost = CARGO_CRATE_VALUE
unit_name = "rainbow slime core"
export_types = list(/obj/item/slime_extract/rainbow)
code/modules/cargo/goodies.dm
+22 -22
View File
@@ -7,140 +7,140 @@
/datum/supply_pack/goody/dumdum38
name = ".38 DumDum Speedloader"
desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets."
cost = 350
cost = PAYCHECK_MEDIUM * 2
access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/dumdum)
/datum/supply_pack/goody/match38
name = ".38 Match Grade Speedloader"
desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots."
cost = 350
cost = PAYCHECK_MEDIUM * 2
access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/match)
/datum/supply_pack/goody/rubber
name = ".38 Rubber Speedloader"
desc = "Contains one speedloader of bouncy rubber .38 ammunition, for when you want to bounce your shots off anything and everything."
cost = 350
cost = PAYCHECK_MEDIUM * 1.5
access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/match/bouncy)
/datum/supply_pack/goody/stingbang
name = "Stingbang Single-Pack"
desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks."
cost = 700
cost = PAYCHECK_HARD * 2.5
access_view = ACCESS_BRIG
contains = list(/obj/item/grenade/stingbang)
/datum/supply_pack/goody/combatknives_single
name = "Combat Knife Single-Pack"
desc = "Contains one sharpened combat knive. Guaranteed to fit snugly inside any Nanotrasen-standard boot."
cost = 1250
cost = PAYCHECK_HARD * 1.75
contains = list(/obj/item/kitchen/knife/combat)
/datum/supply_pack/goody/ballistic_single
name = "Combat Shotgun Single-Pack"
desc = "For when the enemy absolutely needs to be replaced with lead. Contains one Aussec-designed Combat Shotgun, and one Shotgun Bandolier."
cost = 4000
cost = PAYCHECK_HARD * 15
access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/storage/belt/bandolier)
/datum/supply_pack/goody/energy_single
name = "Energy Gun Single-Pack"
desc = "Contains one energy gun, capable of firing both nonlethal and lethal blasts of light."
cost = 1500
cost = PAYCHECK_HARD * 12
access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/e_gun)
/datum/supply_pack/goody/hell_single
name = "Hellgun Single-Pack"
desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
cost = 2250
cost = PAYCHECK_HARD * 18
access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/laser/hellgun)
/datum/supply_pack/goody/wt550_single
name = "WT-550 Auto Rifle Single-Pack"
desc = "Contains one high-powered, semiautomatic rifles chambered in 4.6x30mm." // "high-powered" lol yea right
cost = 2000
cost = PAYCHECK_HARD * 20
access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/ballistic/automatic/wt550)
/datum/supply_pack/goody/wt550ammo_single
name = "WT-550 Auto Rifle Ammo Single-Pack"
desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
cost = 900
cost = PAYCHECK_HARD * 6
access_view = ACCESS_ARMORY
contains = list(/obj/item/ammo_box/magazine/wt550m9)
/datum/supply_pack/goody/sologamermitts
name = "Insulated Gloves Single-Pack"
desc = "The backbone of modern society. Barely ever ordered for actual engineering."
cost = 800
cost = PAYCHECK_MEDIUM * 8
contains = list(/obj/item/clothing/gloves/color/yellow)
/datum/supply_pack/goody/gripper_single
name = "Gripper Gloves Single-Pack"
desc = "A spare pair of gripper gloves. Perfect for when the security vendor is empty (or when you're not actually a security officer)."
cost = 600
cost = PAYCHECK_HARD * 6
contains = list(/obj/item/clothing/gloves/tackler)
/datum/supply_pack/goody/firstaidbruises_single
name = "Bruise Treatment Kit Single-Pack"
desc = "A single brute first-aid kit, perfect for recovering from being crushed in an airlock. Did you know people get crushed in airlocks all the time? Interesting..."
cost = 330
cost = PAYCHECK_MEDIUM * 4
contains = list(/obj/item/storage/firstaid/brute)
/datum/supply_pack/goody/firstaidburns_single
name = "Burn Treatment Kit Single-Pack"
desc = "A single burn first-aid kit. The advertisement displays a winking atmospheric technician giving a thumbs up, saying \"Mistakes happen!\""
cost = 330
cost = PAYCHECK_MEDIUM * 4
contains = list(/obj/item/storage/firstaid/fire)
/datum/supply_pack/goody/firstaid_single
name = "First Aid Kit Single-Pack"
desc = "A single first-aid kit, fit for healing most types of bodily harm."
cost = 250
cost = PAYCHECK_MEDIUM * 3
contains = list(/obj/item/storage/firstaid/regular)
/datum/supply_pack/goody/firstaidoxygen_single
name = "Oxygen Deprivation Kit Single-Pack"
desc = "A single oxygen deprivation first-aid kit, marketed heavily to those with crippling fears of asphyxiation."
cost = 330
cost = PAYCHECK_MEDIUM * 4
contains = list(/obj/item/storage/firstaid/o2)
/datum/supply_pack/goody/firstaidtoxins_single
name = "Toxin Treatment Kit Single-Pack"
desc = "A single first aid kit focused on healing damage dealt by heavy toxins."
cost = 330
cost = PAYCHECK_MEDIUM * 4
contains = list(/obj/item/storage/firstaid/toxin)
/datum/supply_pack/goody/toolbox // mostly just to water down coupon probability
name = "Mechanical Toolbox"
desc = "A fully stocked mechanical toolbox, for when you're too lazy to just print them out."
cost = 300
cost = PAYCHECK_MEDIUM * 3
contains = list(/obj/item/storage/toolbox/mechanical)
/datum/supply_pack/goody/valentine
name = "Valentine Card"
desc = "Make an impression on that special someone! Comes with one valentine card and a free candy heart!"
cost = 150
cost = PAYCHECK_ASSISTANT * 2
contains = list(/obj/item/valentine, /obj/item/food/candyheart)
/datum/supply_pack/goody/beeplush
name = "Bee Plushie"
desc = "The most important thing you could possibly spend your hard-earned money on."
cost = 1500
cost = PAYCHECK_EASY * 4
contains = list(/obj/item/toy/plush/beeplushie)
/datum/supply_pack/goody/beach_ball
name = "Beach Ball"
desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"
cost = 200
cost = PAYCHECK_MEDIUM
contains = list(/obj/item/toy/beach_ball)
/datum/supply_pack/goody/medipen_twopak
name = "Medipen Two-Pak"
desc = "Contains one standard epinephrine medipen and one standard emergency first-aid kit medipen. For when you want to prepare for the worst."
cost = 500
cost = PAYCHECK_MEDIUM * 2
contains = list(/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/hypospray/medipen/ekit)
code/modules/cargo/packs.dm
+210 -213
View File
File diff suppressed because it is too large Load Diff
code/modules/power/cell.dm
+4
View File
@@ -372,6 +372,10 @@
if(!A.lightswitch || !A.light_power)
charge = 0 //For naturally depowered areas, we start with no power
/obj/item/stock_parts/cell/inducer_supply
maxcharge = 5000
charge = 5000
#undef CELL_DRAIN_TIME
#undef CELL_POWER_GAIN
#undef CELL_POWER_DRAIN