cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts credit value to be more consistent (#20913)

Browse Source 
- Reworked prices, wages and balances of (almost) everything ingame.
- Added coinage and decimal support to cash, ruthlessly sanitized to
avoid floating-point errors. Reflected in cash-related things like ATMs.
- Tweaked how cash bundles are made and distributed to support
decimalization.
- Adjusted the starting money individuals and departments receive in
their accounts.
- Adjusted the funding Tajara, Unathi, Diona, Vaurca, and IPCs receive
in their accounts. Should earn more on average than they used to.

Credit values are now roughly 1/10th what they were before, across the
board.

Coins were added too! These have names:
- Unie: 0.01 credits
- Quin: 0.05 credits
- Dece: 0.10 credits
- Quarter: 0.25 credits

These can be seen cameo'd in the screenshots below.

Values, wages, etc, are based on the wiki page
https://wiki.aurorastation.org/index.php?title=Guide_to_Wages_and_Pay .

Values are not anchored to any singular real-world currency.

Example price differences:

| Example Item | Old Price | New Price |
| --- | --- | --- |
| Comet Cola | 15.00 | 1.50 |
| Cup Ramen | 20.00 | 2.00 |
| Jyalara | 38.00 | 3.00 |
| Trans-Stellar Cigarettes | 76.00 | 9.00 |
| Zo'ra Soda | 29.00 | 2.50 |
| Gumball | 5.00 | 0.25 |
| 50x plasteel sheets | 700.00 | 120.00 |
| 5x meat (cargo) | 160.00 | 55.00 |
| 50x phoron crystals (cargo) | 2200.00 | 400.00 |

Wages and account balances have also been tweaked:
| Type | Old Amount | New Amount |
| --- | --- | --- |
| Ship Account | 75,000.00 | 35,000.00 |
| Departmental Accounts | 10,000.00 | 15,000.00 |
| Personal Account (avg) | 200.00 - 20,000.00 | 20.00 - 2,000.00 |

Might break the economy; prices will likely need some adjusting
depending on gameplay constraints. Can be adjusted in TMs.
A little testing never hurt anyone.


![image](https://github.com/user-attachments/assets/006e78bf-bfe6-4003-a88d-7b26d6cf2e80)

![image](https://github.com/user-attachments/assets/ac365c3d-bd55-4de5-bd9f-95c7c629462a)

---------

Signed-off-by: naut <55491249+nauticall@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
naut
2025-07-28 18:11:58 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 5431480234
commit 14b3228582
55 changed files with 2402 additions and 2273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/bounties/assistant.dm
+35 -35
View File
@@ -1,8 +1,8 @@
/datum/bounty/item/assistant/briefcase
name = "Briefcase"
description = "%BOSSNAME will be holding a business convention this year. Ship a few briefcases in support."
reward_low = 2000
reward_high = 3000
reward_low = 20
reward_high = 30
required_count = 4
random_count = 1
wanted_types = list(/obj/item/storage/briefcase)
@@ -11,29 +11,29 @@
/datum/bounty/item/assistant/lung
name = "Lungs"
description = "A recent explosion at %BOSSNAME has left multiple staff with punctured lungs. Ship spare lungs to be rewarded- and save some lives."
reward_low = 2500
reward_high = 3500
reward_low = 520
reward_high = 635
wanted_types = list(/obj/item/organ/internal/lungs)
/datum/bounty/item/assistant/appendix
name = "Appendix"
description = "%PERSONNAME wants our chefs to prepare a strange meal using a very special delicacy: an appendix. If you ship one, they'll pay."
reward_low = 2500
reward_high = 3500
reward_low = 425
reward_high = 535
wanted_types = list(/obj/item/organ/internal/appendix)
/datum/bounty/item/assistant/hand_tele
name = "Hand Tele"
description = "%BOSSNAME has come up with a genius idea: Why not teleport cargo rather than ship it? Send over a hand tele, receive payment, then wait 6-8 years while they deliberate."
reward_low = 3000
reward_high = 5500
reward_low = 300
reward_high = 550
wanted_types = list(/obj/item/hand_tele)
/datum/bounty/item/assistant/monkey_cubes
name = "Monkey Cubes"
description = "Due to a recent genetics accident, %BOSSNAME is in serious need of monkeys. Your mission is to ship monkey cubes."
reward_low = 1800
reward_high = 2400
reward_low = 180
reward_high = 240
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube)
@@ -41,8 +41,8 @@
/datum/bounty/item/assistant/curtains
name = "Curtain"
description = "Send us some curtains to help redecorate our offices!"
reward_low = 2200
reward_high = 3200
reward_low = 250
reward_high = 270
required_count = 5
random_count = 2
wanted_types = list(/obj/structure/curtain)
@@ -50,8 +50,8 @@
/datum/bounty/item/assistant/action_figures
name = "Action Figures"
description = "%PERSONNAME wants a few action figures for their collection, and is willing to pay any station who provides."
reward_low = 2000
reward_high = 3000
reward_low = 120
reward_high = 130
required_count = 5
random_count = 3
wanted_types = list(/obj/item/toy/figure)
@@ -59,8 +59,8 @@
/datum/bounty/item/assistant/water_tank
name = "Water Tank"
description = "Send us some water tanks that will be used for botany research, and definitely not for creating a slip 'n slide in %PERSONNAME's office."
reward_low = 1500
reward_high = 2500
reward_low = 115
reward_high = 135
required_count = 3
random_count = 1
wanted_types = list(/obj/structure/reagent_dispensers/watertank)
@@ -77,16 +77,16 @@
/datum/bounty/item/assistant/wheelchair
name = "Wheelchairs"
description = "The medical bay at the %DOCKSHORT has been busier than usual; we're requesting some spare wheelchairs for patient transport."
reward_low = 2300
reward_high = 4000
reward_low = 123
reward_high = 140
required_count = 2
wanted_types = list(/obj/structure/bed/stool/chair/office/wheelchair, /obj/item/material/stool/chair/wheelchair)
/datum/bounty/item/assistant/film
name = "Camera Film"
description = "We received a gift from a delegate on Adhomai- a group of some sort of small, fat xenofauna. Everyone thinks they're cute and we're low on film from all the pictures!"
reward_low = 1200
reward_high = 1800
reward_low = 55
reward_high = 80
required_count = 3
random_count = 1
wanted_types = list(/obj/item/device/camera_film)
@@ -94,8 +94,8 @@
/datum/bounty/item/assistant/trash
name = "Trash"
description = "It's time for the %COMPNAME cleanup initiative! Clean stations will receive a bonus; pick up the litter from around your station and send it to us as proof!"
reward_low = 1000
reward_high = 2000
reward_low = 100
reward_high = 150
required_count = 15
random_count = 5
wanted_types = list(/obj/item/trash)
@@ -103,15 +103,15 @@
/datum/bounty/item/assistant/heart
name = "Heart"
description = "%PERSONNAME is in critical condition after suffering a heart attack. Doctors say they need a new heart, fast. Ship one, pronto! Organic or mechanical, just hurry up!"
reward_low = 2500
reward_high = 4000
reward_low = 825
reward_high = 840
wanted_types = list(/obj/item/organ/internal/heart)
/datum/bounty/item/assistant/statue
name = "Statue"
description = "%BOSSNAME would like to commision an artsy statue for the lobby. Ship one out, when possible."
reward_low = 2200
reward_high = 2800
reward_low = 750
reward_high = 1250
wanted_types = list(/obj/structure/sculpting_block)
/datum/bounty/item/assistant/statue/applies_to(var/obj/structure/sculpting_block/O)
@@ -126,16 +126,16 @@
/datum/bounty/item/assistant/tajcard
name = "Collectable Card"
description = "%PERSONNAME is offering a bonus to any station that can help them expand their collection of collectable tajaran cards."
reward_low = 1800
reward_high = 2400
reward_low = 180
reward_high = 220
required_count = 2
wanted_types = list(/obj/item/tajcard)
/datum/bounty/item/assistant/jetpack
name = "Jetpacks"
description = "We're engaging in an EVA training initiative for new miners. Ship us a few jetpacks for a station bonus."
reward_low = 3000
reward_high = 4000
reward_low = 300
reward_high = 400
required_count = 3
random_count = 1
wanted_types = list(/obj/item/tank/jetpack)
@@ -143,8 +143,8 @@
/datum/bounty/item/assistant/cleaner
name = "Space Cleaner"
description = "The janitorial division of the ERT is requesting some actual supplies, to insist they aren't a joke. They're putting up for a bounty, so humor them if you want."
reward_low = 1000
reward_high = 1500
reward_low = 55
reward_high = 85
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/spray)
@@ -154,7 +154,7 @@
return FALSE
if(!istype(O))
return FALSE
if(REAGENT_VOLUME(O.reagents, /singleton/reagent/spacecleaner) >= 200)
if(REAGENT_VOLUME(O.reagents, /singleton/reagent/spacecleaner) >= 20)
return TRUE
return FALSE
@@ -162,8 +162,8 @@
/datum/bounty/item/assistant/photograph
name = "Photographs"
description = "The %DOCKNAME is holding a morale project, and part of that is to display photographs from the various stations. Send us some for a participation bonus!"
reward_low = 1500
reward_high = 2500
reward_low = 75
reward_high = 250
required_count = 8
random_count = 2
wanted_types = list(/obj/item/photo)
code/modules/cargo/bounties/bot.dm
+6 -6
View File
@@ -1,16 +1,16 @@
/datum/bounty/item/bot/cleanbot
name = "Cleanbot"
description = "There has been a incident out our crusher which resulted in the tragic death of multiple cleanbots. Ship a few replacements."
reward_low = 2700
reward_high = 3700
reward_low = 270
reward_high = 370
required_count = 3
wanted_types = list(/mob/living/bot/cleanbot)
/datum/bounty/item/bot/farmbot
name = "Farmbot"
description = "After a k'ois incident multiple botanists were hospitalized. Provide a few farmbots to handle their duties while they recover."
reward_low = 3700
reward_high = 4300
reward_low = 370
reward_high = 430
required_count = 3
random_count = 1
wanted_types = list(/mob/living/bot/farmbot)
@@ -18,7 +18,7 @@
/datum/bounty/item/bot/medbot
name = "Medibot"
description = "We were unable to recruit a sufficient number of qualified medical professionals this month. Ship us a few medibots to fill the void."
reward_low = 5500
reward_high = 6000
reward_low = 550
reward_high = 600
required_count = 2
wanted_types = list(/mob/living/bot/medbot)
code/modules/cargo/bounties/chef.dm
+59 -59
View File
@@ -11,8 +11,8 @@
/datum/bounty/item/chef/birthday_cake
name = "Birthday Cake"
description = "A birthday party for %PERSONNAME is coming up! Ship a complete birthday cake to celebrate!"
reward_low = 3000
reward_high = 4000
reward_low = 75
reward_high = 100
wanted_types = list(
/obj/item/reagent_containers/food/snacks/variable/cake,
/obj/item/reagent_containers/food/snacks/sliceable/cake)
@@ -20,8 +20,8 @@
/datum/bounty/item/chef/soup
name = "Soup"
description = "%COMPNAME will be serving soup to the homeless for a PR initiative. Ship any type of soup. And make sure it's soup- not just hot water."
reward_low = 2700
reward_high = 3500
reward_low = 55
reward_high = 125
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/soup)
@@ -30,8 +30,8 @@
/datum/bounty/item/chef/popcorn
name = "Popcorn Bags"
description = "%PERSONNAME wants to host a movie night. Ship bags of popcorn for the occasion."
reward_low = 2300
reward_high = 3000
reward_low = 45
reward_high = 90
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/popcorn)
@@ -39,8 +39,8 @@
/datum/bounty/item/chef/icecream
name = "Ice Cream"
description = "The air conditioning system of some offices on %DOCKSHORT has failed. Ship some ice cream before we melt."
reward_low = 4000
reward_high = 4500
reward_low = 40
reward_high = 60
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich,
@@ -62,7 +62,7 @@
/datum/bounty/item/chef/pie
name = "Pie"
description = "%BOSSSHORT management wants a pie! Ship one pie."
reward = 3142
reward = 75
wanted_types = list(/obj/item/reagent_containers/food/snacks/pie,
/obj/item/reagent_containers/food/snacks/meatpie,
/obj/item/reagent_containers/food/snacks/tofupie,
@@ -81,8 +81,8 @@
/datum/bounty/item/chef/salad
name = "Salad"
description = "%BOSSSHORT management is going on a health binge. Ship some tasty salads to help keep them on track."
reward_low = 2800
reward_high = 3800
reward_low = 45
reward_high = 55
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/salad)
@@ -90,8 +90,8 @@
/datum/bounty/item/chef/fries
name = "Fries"
description = "Sometimes the whole office just gets a craving for a certain food. Today, it's fries. Ship some!"
reward_low = 2800
reward_high = 3800
reward_low = 35
reward_high = 45
required_count = 3
wanted_types = list(/obj/item/reagent_containers/food/snacks/carrotfries,
/obj/item/reagent_containers/food/snacks/fries,
@@ -102,8 +102,8 @@
/datum/bounty/item/chef/superbite
name = "Super Bite Burger"
description = "%PERSONNAME thinks they can set a competitive eating world record. All they need is a super bite burger shipped to them."
reward_low = 11500
reward_high = 13500
reward_low = 90
reward_high = 120
wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite)
/datum/bounty/item/chef/superbite/compatible_with(var/datum/other_bounty)
@@ -114,8 +114,8 @@
/datum/bounty/item/chef/poppypretzel
name = "Poppy Pretzel"
description = "%BOSSNAME needs a few poppy pretzels for the drug-training of their security department."
reward_low = 2600
reward_high = 3200
reward_low = 45
reward_high = 65
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/poppypretzel)
@@ -123,30 +123,30 @@
/datum/bounty/item/chef/cubancarp
name = "Cuban Carp"
description = "A diplomat is visiting %BOSSSHORT. Ship one cuban carp for the business luncheon."
reward_low = 8200
reward_high = 9200
reward_low = 100
reward_high = 150
wanted_types = list(/obj/item/reagent_containers/food/snacks/cubancarp)
/datum/bounty/item/chef/hotdog
name = "Hot Dog"
description = "%COMPNAME is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate."
reward_low = 4000
reward_high = 4800
reward_low = 40
reward_high = 60
wanted_types = list(/obj/item/reagent_containers/food/snacks/hotdog)
/datum/bounty/item/chef/eggplantparm
name = "Eggplant Parmigianas"
description = "A famous singer will be arriving at %BOSSSHORT, and their contract demands that they only be served Eggplant Parmigiana. Ship some, please!"
reward_low = 4000
reward_high = 4800
reward_low = 40
reward_high = 60
required_count = 3
wanted_types = list(/obj/item/reagent_containers/food/snacks/eggplantparm)
/datum/bounty/item/chef/muffin
name = "Muffins"
description = "%BOSSSHORT needs muffins for a morning meeting! Your station will get a bonus if you ship some."
reward_low = 3500
reward_high = 4200
reward_low = 35
reward_high = 42
required_count = 8
random_count = 3
wanted_types = list(/obj/item/reagent_containers/food/snacks/muffin,
@@ -156,16 +156,16 @@
/datum/bounty/item/chef/chawanmush
name = "Chawanmushi"
description = "Someone from middle-management mentioned Chawanmushi. We never tried them so we need you to ship some immediately."
reward_low = 6500
reward_high = 7500
reward_low = 65
reward_high = 75
required_count = 2
wanted_types = list(/obj/item/reagent_containers/food/snacks/chawanmushi)
/datum/bounty/item/chef/kebab
name = "Kebabs"
description = "%BOSSNAME is requesting a special order; please ship some kebabs."
reward_low = 3500
reward_high = 4200
reward_low = 40
reward_high = 60
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/variable/kebab,
@@ -180,8 +180,8 @@
/datum/bounty/item/chef/poppers
name = "Jalapeno Poppers"
description = "%PERSONNAME is trying to set a system record for most jalapeno poppers held in their mouth at once. Don't ask questions, just send them."
reward_low = 4500
reward_high = 5200
reward_low = 45
reward_high = 52
required_count = 8
random_count = 3
wanted_types = list(/obj/item/reagent_containers/food/snacks/jalapeno_poppers)
@@ -189,8 +189,8 @@
/datum/bounty/item/chef/burger
name = "Burger"
description = "%PERSONNAME is this month's food critic for a local newsletter and they're on a deadline. Give them some burgers to review."
reward_low = 1200
reward_high = 2000
reward_low = 52
reward_high = 70
required_count = 2
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/burger)
@@ -203,8 +203,8 @@
/datum/bounty/item/chef/fortune
name = "Fortune Cookies"
description = "%PERSONNAME claims they can do divination based on fortune cookies. Send a batch so we can find out if it's true."
reward_low = 2000
reward_high = 3000
reward_low = 20
reward_high = 30
required_count = 7
random_count = 2
wanted_types = list(/obj/item/reagent_containers/food/snacks/fortunecookie)
@@ -212,8 +212,8 @@
/datum/bounty/item/chef/spaghetti
name = "Spaghetti"
description = "We're hosting a luncheon for some %COMPSHORT Academy computer programming students. We heard that they really enjoy spaghetti, so ship some!"
reward_low = 2200
reward_high = 3200
reward_low = 55
reward_high = 80
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/boiledspaghetti,
@@ -224,8 +224,8 @@
/datum/bounty/item/chef/dumplings
name = "Meat Buns or Momo"
description = "We're sick of eating vendor food; send us some meat buns or momo."
reward_low = 3200
reward_high = 4100
reward_low = 40
reward_high = 60
required_count = 4
random_count = 2
wanted_types = list(/obj/item/reagent_containers/food/snacks/meatbun,
@@ -235,8 +235,8 @@
/datum/bounty/item/chef/unathi
name = "Unathi Delicacies"
description = "We're holding a luncheon with some Hegemony representatives; send some traditional Unathi dishes!"
reward_low = 3300
reward_high = 5300
reward_low = 150
reward_high = 250
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/aghrasshcake,
@@ -264,8 +264,8 @@
/datum/bounty/item/chef/tajara
name = "Adhomai Delicacies"
description = "We're holding a luncheon with some representatives from Adhomai; send some traditional Tajaran dishes!"
reward_low = 3500
reward_high = 5500
reward_low = 150
reward_high = 250
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/adhomian_porridge,
@@ -314,8 +314,8 @@
/datum/bounty/item/chef/skrell
name = "Federation Delicacies"
description = "We're holding a luncheon with some Nralakk Federation representatives; send some Skrellian dishes!"
reward_low = 3700
reward_high = 5700
reward_low = 150
reward_high = 250
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy,
@@ -335,8 +335,8 @@
/datum/bounty/item/chef/curry
name = "Curry"
description = "I forgot that I was supposed to host lunch for an upcoming meeting. Ship me some curry and I'll make sure your station gets a bonus. - %PERSONNAME"
reward_low = 3000
reward_high = 3900
reward_low = 40
reward_high = 60
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/redcurry,
@@ -347,8 +347,8 @@
/datum/bounty/item/chef/dip
name = "Dip"
description = "It's time for an office party, but %PERSONNAME forgot the dip! Send us some and we'll transfer part of their upcoming bonus to your station's account."
reward_low = 2500
reward_high = 3000
reward_low = 50
reward_high = 80
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/dip)
@@ -356,15 +356,15 @@
/datum/bounty/item/chef/reuben
name = "Reuben Sandwich"
description = "%PERSONNAME had their lunch stolen from the company fridge. Send us a replacement reuben!"
reward_low = 3700
reward_high = 4600
reward_low = 45
reward_high = 60
wanted_types = list(/obj/item/reagent_containers/food/snacks/reubensandwich)
/datum/bounty/item/chef/ravioli
name = "Ravioli"
description = "Somehow, %PERSONNAME has never had Ravioli before, so we've decided to do a themed office lunch. Send us some, please."
reward_low = 2800
reward_high = 3800
reward_low = 80
reward_high = 120
required_count = 4
random_count = 1
wanted_types = list(
@@ -374,8 +374,8 @@
/datum/bounty/item/chef/ramen
name = "Ramen Bowl"
description = "%PERSONNAME thinks that Ramen is the instant, pre-packaged kind you get from machines and has never had the 'real' kind. We've allocated some morale funds to educate them, please send some good examples."
reward_low = 3000
reward_high = 3900
reward_low = 80
reward_high = 120
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/ramenbowl, /obj/item/reagent_containers/food/snacks/aoyama_ramen)
@@ -383,8 +383,8 @@
/datum/bounty/item/chef/matsuul
name = "Matsuul"
description = "After some incidents, we're running a workshop on collaborating in a multi-species workplace. We need a meal that represents collaboration between different species and cultures."
reward_low = 3000
reward_high = 3900
reward_low = 80
reward_high = 120
required_count = 3
random_count = 1
wanted_types = list(
@@ -393,8 +393,8 @@
/datum/bounty/item/chef/roulades
name = "Roulades"
description = "%PERSONNAME is retiring after many beloved years in the company and we need some tasty treats for the retirement party we're throwing them."
reward_low = 2600
reward_high = 3500
reward_low = 90
reward_high = 150
required_count = 2
random_count = 1
wanted_types = list(
code/modules/cargo/bounties/engineer.dm
+33 -33
View File
@@ -1,8 +1,8 @@
/datum/bounty/item/engineer/comfy_chair
name = "Padded Chairs"
description = "%PERSONNAME is unhappy with their chair. They claim it hurts their back. Have engineers craft some alternatives and ship them out to humor them."
reward_low = 2400
reward_high = 3900
reward_low = 240
reward_high = 390
required_count = 4
random_count = 2
wanted_types = list(/obj/structure/bed/stool/chair)
@@ -19,15 +19,15 @@
/datum/bounty/item/engineer/smes_coil
name = "Superconductive magnetic coil"
description = "A xenobotanist from the NSS Upsilon sent us a gigantic lemon. We're turning it into a battery; send us an SMES coil so we can contain its power."
reward_low = 4000
reward_high = 4500
reward_low = 400
reward_high = 450
wanted_types = list(/obj/item/smes_coil)
/datum/bounty/item/engineer/solar
name = "Solar Assemblies or Trackers"
description = "A meteor shower ruined some backup solar arrays on the %DOCKNAME; ship us some assemblies or tracker electronics so we can expedite repairs."
reward_low = 6500
reward_high = 8700
reward_low = 650
reward_high = 870
required_count = 6
random_count = 2
wanted_types = list(/obj/item/solar_assembly, /obj/item/tracker_electronics)
@@ -35,16 +35,16 @@
/datum/bounty/item/engineer/eshield
name = "Emergency Shields"
description = "Another station is requesting emergency energy shields. Apparently there was a baby carp migration and they want to set up a safe play area for them. Treat this as urgent."
reward_low = 7500
reward_high = 9000
reward_low = 750
reward_high = 900
required_count = 2
wanted_types = list(/obj/machinery/shield)
/datum/bounty/item/engineer/firesuit
name = "Firesuits"
description = "I'm about to drop my mixtape in our next meeting. Send some suits to protect management from this straight FIRE. - %PERSONNAME"
reward_low = 2000
reward_high = 3200
reward_low = 200
reward_high = 320
required_count = 2
random_count = 1
wanted_types = list(/obj/item/clothing/suit/fire)
@@ -52,8 +52,8 @@
/datum/bounty/item/engineer/fuel_tank
name = "Fuel Tank"
description = "After observing your engineering staff, we think it's best if you send us a few of those fuel tanks so nobody hurts themselves."
reward_low = 2500
reward_high = 3500
reward_low = 250
reward_high = 350
required_count = 4
random_count = 2
wanted_types = list(/obj/structure/reagent_dispensers/fueltank)
@@ -71,7 +71,7 @@
name = "Full Tank of Phoron"
description = "Another station has requested supplies to test a new engine. In particular, they request a full tank of phoron. Please don't send a whole canister; they'll get... ideas."
reward_low = 2200
reward_high = 3200
reward_high = 2800
wanted_types = list(/obj/item/tank)
var/moles_required = 20 // A full tank is 28 moles, but we give some leeway.
@@ -88,8 +88,8 @@
/datum/bounty/item/engineer/vending
name = "Vending Machines"
description = "We're researching the cause of the widespread brand intelligence virus. Send us some vending machines of any kind from your station so we can examine them. Just get permission, first."
reward_low = 3500
reward_high = 5000
reward_low = 1350
reward_high = 1500
required_count = 4
random_count = 1
wanted_types = list(/obj/machinery/vending)
@@ -97,17 +97,17 @@
/datum/bounty/item/engineer/coffin
name = "Coffins"
description = "%PERSONNAME is holding a funeral service for some brave maintenance drones. Kind of weird, but they're a nice person and willing to put up for a bounty. Ship us some urns or wooden coffins to humor them."
reward_low = 2500
reward_high = 3000
reward_low = 250
reward_high = 300
required_count = 3
random_count = 1
wanted_types = list(/obj/structure/closet/crate/coffin, /obj/item/material/urn)
/datum/bounty/item/engineer/pap
name = "Portable Air Pumps"
description = "After a breach, some employees have been opening emergency shutters with no regard for their safety. Send us some pumps with at least 5,000kpa of air mix to get this taken care of quickly."
reward_low = 7200
reward_high = 8800
description = "After a breach, some employees have been opening emergency shutters with no regard for their safety. Send us some pumps with at least 5,00kpa of air mix to get this taken care of quickly."
reward_low = 720
reward_high = 880
required_count = 3
wanted_types = list(/obj/machinery/portable_atmospherics/powered/pump)
@@ -116,15 +116,15 @@
return FALSE
if(!istype(O))
return FALSE
if(O.air_contents.return_pressure() >= 5000)
if(O.air_contents.return_pressure() >= 500)
return TRUE
return FALSE
/datum/bounty/item/engineer/spaceac
name = "Space A/C"
description = "The A/C is out in our offices, and everyone's talking about ice cream. I'm authorizing a bounty for some actual A/C units, since that will actually solve the issue. - %PERSONNAME"
reward_low = 5000
reward_high = 6500
reward_low = 500
reward_high = 650
required_count = 3
random_count = 1
wanted_types = list(/obj/machinery/space_heater)
@@ -132,23 +132,23 @@
/datum/bounty/item/engineer/pipe
name = "Atmospheric Pipe Dispenser"
description = "We need another pipe dispenser to help expedite an atmospherics project. The station will get a bonus if you send us a pipe dispenser."
reward_low = 5000
reward_high = 5700
reward_low = 500
reward_high = 570
wanted_types = list(/obj/machinery/pipedispenser)
exclude_types = list(/obj/machinery/pipedispenser/disposal)
/datum/bounty/item/engineer/disposal
name = "Disposal Pipe Dispenser"
description = "The %DOCKSHORT is undergoing an overhaul of its mail delivery chutes. Lend us a dispenser to help expedite it for a bonus."
reward_low = 5000
reward_high = 5700
reward_low = 500
reward_high = 570
wanted_types = list(/obj/machinery/pipedispenser/disposal)
/datum/bounty/item/engineer/bookcase
name = "Bookcases"
description = "We're showing some love to one of the libraries on the %DOCKSHORT. A bonus will be paid to any station who has some skilled engineers build some for us."
reward_low = 6000
reward_high = 7000
reward_low = 600
reward_high = 700
required_count = 4
random_count = 1
wanted_types = list(/obj/structure/bookcase)
@@ -156,8 +156,8 @@
/datum/bounty/item/engineer/generator
name = "Portable Generators"
description = "Another station reported some engine troubles, and needs a few portable generators to maintain critical operations. Ship any type of portable generators to receive a bonus."
reward_low = 5000
reward_high = 6200
reward_low = 500
reward_high = 620
required_count = 2
random_count = 1
wanted_types = list(/obj/machinery/power/portgen/basic)
@@ -165,7 +165,7 @@
/datum/bounty/item/engineer/crossbow
name = "Powered Crossbow"
description = "Mictlanian Democratic Forces require weaponry to assist the TCFL in quelling the unrest following peaceful takeover, please ship us some powered crossbows."
reward_low = 5000
reward_high = 7500
reward_low = 500
reward_high = 750
required_count = 2
wanted_types = list(/obj/item/gun/launcher/crossbow)
code/modules/cargo/bounties/hydroponics.dm
+18 -18
View File
@@ -2,8 +2,8 @@
/datum/bounty/item/hydroponicist/potato_cells
name = "Potato Batteries"
description = "%BOSSNAME is researching an environmentally-friendly power source on another station. Send us some potato batteries."
reward_low = 2000
reward_high = 3000
reward_low = 200
reward_high = 300
required_count = 6
random_count = 3
wanted_types = list(/obj/item/cell/potato)
@@ -11,8 +11,8 @@
/datum/bounty/item/hydroponicist/ert
name = "Rations"
description = "%BOSSSHORT is sending ERT out on a long mission. We need some long-lasting rations for them to eat!"
reward_low = 2200
reward_high = 2800
reward_low = 220
reward_high = 280
required_count = 6
random_count = 2
wanted_types = list(/obj/item/reagent_containers/food/snacks/liquidfood, /obj/item/pen/crayon)
@@ -20,8 +20,8 @@
/datum/bounty/item/hydroponicist/towels
name = "Towels"
description = "%BOSSSHORT is having the sickest pool party ever. Send us some towels for a reward, and maybe an invitation!"
reward_low = 3000
reward_high = 3500
reward_low = 300
reward_high = 350
required_count = 8
random_count = 3
wanted_types = list(/obj/item/towel, /obj/item/towel_flat)
@@ -29,8 +29,8 @@
/datum/bounty/item/hydroponicist/gloves
name = "Botanical Gloves"
description = "%BOSSNAME is participating in a massive tree-planting initiative on Biesel. Help us help the company's image by sending our volunteers some gardening gloves!"
reward_low = 2200
reward_high = 3000
reward_low = 50
reward_high = 80
required_count = 4
random_count = 1
wanted_types = list(/obj/item/clothing/gloves/botanic_leather)
@@ -38,8 +38,8 @@
/datum/bounty/item/hydroponicist/flower_crown
name = "Flower Crowns"
description = "It's time for the monthly %COMPNAME company dance. This month's theme is floral in nature, so send us some flower crowns to give to attendees."
reward_low = 3600
reward_high = 4400
reward_low = 360
reward_high = 440
required_count = 6
random_count = 2
wanted_types = list(/obj/item/clothing/head/sunflower_crown, /obj/item/clothing/head/lavender_crown, /obj/item/clothing/head/poppy_crown)
@@ -47,8 +47,8 @@
/datum/bounty/item/assistant/animal_cubes
name = "Xeno Cubes"
description = "Monkeys are very limiting for xenostudies research. Please ship some alternative cubes (wrapped) to alleviate a shortage experienced by our other labs."
reward_low = 2000
reward_high = 2600
reward_low = 200
reward_high = 260
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube,
@@ -59,8 +59,8 @@
/datum/bounty/item/hydroponicist/produce
name = "Produce - Any"
description = "%BOSSNAME is in need of a bundle of fresh produce. Send your best!"
reward_low = 3000
reward_high = 3500
reward_low = 250
reward_high = 500
required_count = 18
random_count = 5
wanted_types = list(/obj/item/reagent_containers/food/snacks/grown)
@@ -117,8 +117,8 @@
/datum/bounty/item/hydroponicist/goldstars
name = "Stickers - Gold Stars"
description = "We're getting ready for the quarterly %COMPNAME employee evaluation. Send us some gold stars so we can really let our employees know how valuable they are."
reward_low = 2600
reward_high = 3400
reward_low = 55
reward_high = 75
required_count = 6
random_count = 2
wanted_types = list(/obj/item/storage/stickersheet/goldstar)
@@ -126,8 +126,8 @@
/datum/bounty/item/hydroponicist/stuffedanimals
name = "Toys - Stuffed Animals"
description = "We had to recall some products recently for being highly carcinogenic. To help with optics, we're hosting a toy drive for the handful of children's cancer hospitals in Mendell. Get us some stuffed animals for it."
reward_low = 2800
reward_high = 3800
reward_low = 180
reward_high = 280
required_count = 8
random_count = 2
wanted_types = list(
code/modules/cargo/bounties/reagent.dm
+9 -9
View File
@@ -37,8 +37,8 @@
/datum/bounty/reagent/simple_drink
name = "Simple Drink"
reward_low = 1000
reward_high = 1800
reward_low = 50
reward_high = 150
/datum/bounty/reagent/simple_drink/New()
..()
@@ -91,13 +91,13 @@
name = wanted_reagent.name
description = "[pick(possible_descriptions)] Send a shipment of [name]." //punctuation is already in pick()
required_volume = rand(2, 12) * 10
reward += required_volume * 20 //range from +400(20u) to +2400(120u)
reward += required_volume * 20 //range from +40(20u) to +240(120u)
//Complex drinks. Requires coordination with other departments for ingredients
/datum/bounty/reagent/complex_drink
name = "Complex Drink"
reward_low = 2000
reward_high = 3200
reward_low = 150
reward_high = 250
/datum/bounty/reagent/complex_drink/New()
..()
@@ -128,13 +128,13 @@
name = wanted_reagent.name
description = "[pick(possible_descriptions)] Send a shipment of [name]." //punctuation is already in pick()
required_volume = rand(2, 12) * 10
reward += required_volume * 30 //range from +600(20u) to +3600(120u)
reward += required_volume * 30 //range from +60(20u) to +360(120u)
//Medicines, toxins, and drugs
/datum/bounty/reagent/chemical
name = "Chemical"
reward_low = 2000
reward_high = 3200
reward_low = 150
reward_high = 350
/datum/bounty/reagent/chemical/New()
..()
@@ -175,4 +175,4 @@
name = wanted_reagent.name
description = "One of our labs is in desperate need of [name]. Ship a container of it to be rewarded."
required_volume = rand(2, 12) * 10
reward += required_volume * 40 //range from +800(20u) to +4800(120u)
reward += required_volume * 40 //range from +80(20u) to +480(120u)
code/modules/cargo/bounties/science.dm
+20 -20
View File
@@ -1,8 +1,8 @@
/datum/bounty/item/science/experimental_welding_tool
name = "Experimental Welding Tool"
description = "A recent accident has left most of %BOSSSHORT's welding tools exploded. Ship replacements to be rewarded."
reward_low = 5200
reward_high = 6000
reward_low = 520
reward_high = 600
required_count = 3
random_count = 1
wanted_types = list(/obj/item/weldingtool/experimental)
@@ -10,8 +10,8 @@
/datum/bounty/item/science/cryostasis_beaker
name = "Cryostasis Beaker"
description = "Chemists at %BOSSNAME have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive a station bonus."
reward_low = 5200
reward_high = 6000
reward_low = 520
reward_high = 600
required_count = 3
random_count = 1
wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact)
@@ -19,8 +19,8 @@
/datum/bounty/item/science/borgbody
name = "Robot Endoskeleton"
description = "The %DOCKSHORT has decided to rely more on cyborgs for dangerous tasks. Ship us a fully assembled robot endoskeletons without a mmi/posibrain inside of it."
reward_low = 5000
reward_high = 6500
reward_low = 500
reward_high = 650
required_count = 1
wanted_types = list(/obj/item/robot_parts/robot_suit)
@@ -36,15 +36,15 @@
/datum/bounty/item/science/forcegloves
name = "Force Gloves"
description = "%PERSONNAME has been challenged to a sparring duel in the holodeck. Ship them a pair of forcegloves so there can be a fair fight."
reward_low = 2500
reward_high = 3500
reward_low = 250
reward_high = 350
wanted_types = list(/obj/item/clothing/gloves/force)
/datum/bounty/item/science/fossil
name = "Fossil"
description = "We want to set up a display in one of the libraries on the %DOCKSHORT. Ship us a unique discovery when you are done displaying it on-station."
reward_low = 7500
reward_high = 8500
reward_low = 750
reward_high = 850
required_count = 1
random_count = 1 //wants one or two
wanted_types = list(/obj/item/fossil, /obj/skeleton)
@@ -52,8 +52,8 @@
/datum/bounty/item/science/circuitboard
name = "Telecomms Monitor Circuitboard"
description = "Due to a hardware failure, %COMPNAME requires a new circuit board to replace the spare that was used to fix the problem."
reward_low = 3500
reward_high = 4500
reward_low = 350
reward_high = 450
required_count = 1
wanted_types = list(/obj/item/circuitboard/comm_monitor)
@@ -84,8 +84,8 @@
/datum/bounty/item/science/battery
name = "Heavy-Duty Power Cell"
description = "%COMPNAME has requested some power cells to fill their supply closet. Please fully charge them first."
reward_low = 3500
reward_high = 4500
reward_low = 350
reward_high = 450
required_count = 4
random_count = 1
wanted_types = list(/obj/item/cell/apc)
@@ -101,20 +101,20 @@
/datum/bounty/item/science/battery/high
name = "High-Capacity power Cell"
reward_low = 4500
reward_high = 5000
reward_low = 450
reward_high = 500
wanted_types = list(/obj/item/cell/high)
/datum/bounty/item/science/battery/super
name = "Super-Capacity power Cell"
reward_low = 4500
reward_high = 5000
reward_low = 450
reward_high = 500
required_count = 3
wanted_types = list(/obj/item/cell/super)
/datum/bounty/item/science/battery/hyper
name = "Hyper-Capacity power Cell"
reward_low = 5000
reward_high = 6000
reward_low = 500
reward_high = 600
required_count = 3
wanted_types = list(/obj/item/cell/hyper)
code/modules/cargo/bounties/security.dm
+18 -18
View File
@@ -1,31 +1,31 @@
/datum/bounty/item/security/headset
name = "Security Headset"
description = "%COMPNAME wants to ensure that their encryption is working correctly. Ship them a security headset so that they can check."
reward_low = 700
reward_high = 1200
reward_low = 170
reward_high = 220
random_count = 1
wanted_types = list(/obj/item/device/radio/headset/headset_sec , /obj/item/device/radio/headset/heads/hos)
/datum/bounty/item/security/securitybelt
name = "Security Belt"
description = "%BOSSNAME is having difficulties with their security belts. Ship one from the station to receive compensation."
reward_low = 700
reward_high = 1200
reward_low = 170
reward_high = 220
random_count = 1
wanted_types = list(/obj/item/storage/belt/security)
/datum/bounty/item/security/sechuds
name = "Security HUDSunglasses"
description = "%BOSSNAME screwed up and ordered the wrong type of security sunglasses. They request the station ship some of theirs."
reward_low = 700
reward_high = 1200
reward_low = 270
reward_high = 320
wanted_types = list(/obj/item/clothing/glasses/sunglasses/sechud)
/datum/bounty/item/security/voidsuit
name = "Security Voidsuit"
description = "The %DOCKSHORT has misplaced one of its security voidsuits, and a training exercise is about to begin. Ship a spare for a station bonus. Don't forget the helmet."
reward_low = 2500
reward_high = 4500
reward_low = 1250
reward_high = 1450
wanted_types = list(/obj/item/clothing/suit/space/void/security)
/datum/bounty/item/security/voidsuit/applies_to(var/obj/item/clothing/suit/space/void/security/O)
@@ -40,8 +40,8 @@
/datum/bounty/item/security/maglight
name = "Maglights"
description = "Some civil protection agents lost their flashlights, and think the plastic ones are too lame. Send some maglights to appease their picky tastes."
reward_low = 2200
reward_high = 3000
reward_low = 220
reward_high = 300
required_count = 2
random_count = 1
wanted_types = list(/obj/item/device/flashlight/maglight)
@@ -49,8 +49,8 @@
/datum/bounty/item/security/handcuffs
name = "Handcuffs"
description = "A large influx of criminals have arrived at %BOSSNAME for processing and transfer. Now is the perfect time to ship out spare handcuffs."
reward_low = 1200
reward_high = 1900
reward_low = 120
reward_high = 190
required_count = 4
random_count = 2
wanted_types = list(/obj/item/handcuffs)
@@ -58,8 +58,8 @@
/datum/bounty/item/security/teargas
name = "Teargas Grenades"
description = "We're training some new civil protection officers, but our order for tear gas is running behind. Ship some for a bonus to your station's account."
reward_low = 2000
reward_high = 3000
reward_low = 400
reward_high = 700
required_count = 3
random_count = 1
wanted_types = list(/obj/item/grenade/chem_grenade/teargas)
@@ -67,8 +67,8 @@
/datum/bounty/item/security/pepper
name = "Pepper Spray"
description = "Time to help some civil protection troopers toughen their response to being pepper sprayed. Any station that helps will be compensated. I love this job. -%PERSONNAME"
reward_low = 1200
reward_high = 2200
reward_low = 220
reward_high = 320
required_count = 4
random_count = 1
wanted_types = list(/obj/item/reagent_containers/spray/pepper)
@@ -85,8 +85,8 @@
/datum/bounty/item/security/flash
name = "Flashes"
description = "The %DOCKSHORT has a few more new recruits than expected; we'll compensate any station that helps us provide some basic equipment. Right now, we need flashes."
reward_low = 1200
reward_high = 2200
reward_low = 120
reward_high = 220
required_count = 4
random_count = 1
wanted_types = list(/obj/item/device/flash)
code/modules/cargo/bounties/slime.dm
+3 -3
View File
@@ -1,11 +1,11 @@
/datum/bounty/item/slime
reward_low = 4000
reward_high = 6000
reward_low = 400
reward_high = 1000
/datum/bounty/item/slime/New()
..()
description = "One of our science leads is hunting for a sample of [name]. A bounty has been offered for finding it."
reward += rand(0, 4) * 500
reward += rand(0, 4) * 50
/datum/bounty/item/slime/green
name = "Green Slime Extract"
code/modules/cargo/bounties/special.dm
+4 -4
View File
@@ -24,8 +24,8 @@
/datum/bounty/item/phoron_sheet
name = "Phoron Sheets"
description = "Shipment of Phoron is considered to be a key part of the SCCV Horizon's operations. This bounty should always be prioritized."
reward_low = 2600
reward_high = 3750
reward_low = 2000
reward_high = 4000
required_count = 40
random_count = 10
wanted_types = list(/obj/item/stack/material/phoron)
@@ -45,8 +45,8 @@
/datum/bounty/item/solar_array
name = "Assembled Solar Panels"
description = "Owing to the phoron shortage continuing for over a year, longer than projected, we have decided to use solar arrays to power various facilities across our region of influence."
reward_low = 8000
reward_high = 10000
reward_low = 280
reward_high = 400
required_count = 6
random_count = 2 // 4 to 8
wanted_types = list(/obj/machinery/power/solar)
code/modules/cargo/cargo_suppliers.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/shuttle_time = 100
/// The additional price an order incurs for ordering a shuttle from this supplier.
var/shuttle_price = 100
var/shuttle_price = 20
/// Whether or not this supplier is available or not.
var/available = TRUE
code/modules/cargo/delivery/package.dm
+2 -2
View File
@@ -51,9 +51,9 @@
/obj/item/cargo_package/Initialize(mapload, obj/structure/cargo_receptacle/delivery_point)
. = ..()
pay_amount = rand(4, 7) * 1000
pay_amount = rand(4, 7) * 100
if(prob(3))
pay_amount = rand(12, 17) * 1000
pay_amount = rand(12, 17) * 100
if(delivery_point)
setup_delivery_point(delivery_point)
accent_color = pick(COLOR_RED, COLOR_AMBER, COLOR_PINK, COLOR_YELLOW, COLOR_LIME)
code/modules/cargo/items/atmos.dm
+21 -21
View File
@@ -3,7 +3,7 @@
name = "oxygen tank"
supplier = "hephaestus"
description = "A man-portable tank containing oxygen, the precious gas of life. Unless you're Vaurca, in which case it's pure poison."
price = 85
price = 80
items = list(
/obj/item/tank/oxygen
)
@@ -17,7 +17,7 @@
name = "phoron tank"
supplier = "nanotrasen"
description = "A man-portable tank containing phoron, pure poison. Unless you're Vaurca, in which case it's the precious gas of life."
price = 750
price = 1200
items = list(
/obj/item/tank/phoron
)
@@ -31,7 +31,7 @@
name = "hydrogen tank"
supplier = "hephaestus"
description = "A man-portable tank containing hydrogen. Do not inhale. Warning: extremely flammable."
price = 150
price = 45
items = list(
/obj/item/tank/hydrogen
)
@@ -45,7 +45,7 @@
name = "portable air pump"
supplier = "hephaestus"
description = "Used to fill or drain rooms without differentiating between gasses. NOTE: Does not come pre-filled. Air sold separately."
price = 750
price = 130
items = list(
/obj/machinery/portable_atmospherics/powered/pump
)
@@ -59,7 +59,7 @@
name = "portable air scrubber"
supplier = "hephaestus"
description = "Scrubs contaminants from the local atmosphere or the connected portable tank."
price = 850
price = 150
items = list(
/obj/machinery/portable_atmospherics/powered/scrubber
)
@@ -73,7 +73,7 @@
name = "Canister (Air)"
supplier = "hephaestus"
description = "Holds nitrogen-oxygen breatheable air. Has a built-in valve to allow for filling portable tanks."
price = 1100
price = 180
items = list(
/obj/machinery/portable_atmospherics/canister/air
)
@@ -87,7 +87,7 @@
name = "Canister (Boron)"
supplier = "hephaestus"
description = "Holds boron gas. Has a built-in valve to allow for filling portable tanks."
price = 1500
price = 380
items = list(
/obj/machinery/portable_atmospherics/canister/boron
)
@@ -101,7 +101,7 @@
name = "Canister (CO2)"
supplier = "hephaestus"
description = "Holds heavy CO2 gas. Has a built-in valve to allow for filling portable tanks."
price = 800
price = 300
items = list(
/obj/machinery/portable_atmospherics/canister/carbon_dioxide
)
@@ -115,7 +115,7 @@
name = "Canister (Hydrogen)"
supplier = "hephaestus"
description = "Holds flammable hydrogen. Has a built-in valve to allow for filling portable tanks."
price = 800
price = 350
items = list(
/obj/machinery/portable_atmospherics/canister/hydrogen
)
@@ -129,7 +129,7 @@
name = "Canister (Helium)"
supplier = "hephaestus"
description = "Holds voice-changing helium. Has a built-in valve to allow for filling portable tanks."
price = 800
price = 320
items = list(
/obj/machinery/portable_atmospherics/canister/helium
)
@@ -143,7 +143,7 @@
name = "Canister (Nitrogen)"
supplier = "hephaestus"
description = "Holds inert nitrogen. Has a built-in valve to allow for filling portable tanks."
price = 1000
price = 320
items = list(
/obj/machinery/portable_atmospherics/canister/nitrogen
)
@@ -157,7 +157,7 @@
name = "Canister (Nitrous Oxide)"
supplier = "hephaestus"
description = "Holds sleepy nitrous oxide. Has a built-in valve to allow for filling portable tanks."
price = 1500
price = 650
items = list(
/obj/machinery/portable_atmospherics/canister/sleeping_agent
)
@@ -171,7 +171,7 @@
name = "Canister (Oxygen)"
supplier = "hephaestus"
description = "Holds precious oxygen. Has a built-in valve to allow for filling portable tanks."
price = 1500
price = 450
items = list(
/obj/machinery/portable_atmospherics/canister/oxygen
)
@@ -185,7 +185,7 @@
name = "Canister (Phoron)"
supplier = "nanotrasen"
description = "Holds valuable phoron gas. Has a built-in valve to allow for filling portable tanks."
price = 5000
price = 5500
items = list(
/obj/machinery/portable_atmospherics/canister/phoron
)
@@ -199,7 +199,7 @@
name = "pipe dispenser"
supplier = "hephaestus"
description = "It dispenses pipes, no idea how though."
price = 500
price = 90
items = list(
/obj/machinery/pipedispenser/orderable
)
@@ -213,7 +213,7 @@
name = "pipe painter"
supplier = "hephaestus"
description = "Its said that green pipes are safe to travel through."
price = 135
price = 25
items = list(
/obj/item/device/pipe_painter
)
@@ -227,7 +227,7 @@
name = "Rapid Fabrication Device P-Class"
supplier = "hephaestus"
description = "A heavily modified RFD, modified to construct pipes and piping accessories."
price = 255
price = 45
items = list(
/obj/item/rfd/piping
)
@@ -240,8 +240,8 @@
category = "atmos"
name = "atmospherics voidsuit"
supplier = "hephaestus"
description = "A special suit that protects against hazardous, low pressure environments. Has unmatched thermal protection and minor radiation."
price = 1200
description = "A special suit that protects against hazardous, low pressure environments. Has unmatched thermal protection and minor radiation protection."
price = 800
items = list(
/obj/item/clothing/suit/space/void/atmos
)
@@ -254,8 +254,8 @@
category = "atmos"
name = "atmospherics voidsuit helmet"
supplier = "hephaestus"
description = "A special helmet designed for work in a hazardous, low pressure environments. Has unmatched thermal and minor radiation protect."
price = 850
description = "A special helmet designed for work in a hazardous, low pressure environments. Has unmatched thermal and minor radiation protection."
price = 500
items = list(
/obj/item/clothing/head/helmet/space/void/atmos
)
code/modules/cargo/items/cartridges.dm
+53 -53
View File
@@ -3,7 +3,7 @@
name = "empty chemical cartridge"
supplier = "zeng_hu"
description = "A metal canister containing absolutely nothing. Fill to your heart's desire."
price = 10
price = 5
items = list(
/obj/item/reagent_containers/chem_disp_cartridge
)
@@ -17,7 +17,7 @@
name = "drink cartridge - ale"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 22
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/ale
)
@@ -31,7 +31,7 @@
name = "chemical cartridge - beer"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 22
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/beer
)
@@ -45,7 +45,7 @@
name = "drink cartridge - champagne"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 55
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/champagne
)
@@ -59,7 +59,7 @@
name = "drink cartridge - coffee"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 24
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/coffee
)
@@ -73,7 +73,7 @@
name = "drink cartridge - cognac"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 55
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/cognac
)
@@ -87,7 +87,7 @@
name = "drink cartridge - cola"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/cola
)
@@ -101,7 +101,7 @@
name = "drink cartridge - cream"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/cream
)
@@ -115,7 +115,7 @@
name = "drink cartridge - dr gibb"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/dr_gibb
)
@@ -129,7 +129,7 @@
name = "drink cartridge - gin"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/gin
)
@@ -143,7 +143,7 @@
name = "drink cartridge - ice"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/ice
)
@@ -157,7 +157,7 @@
name = "drink cartridge - iced tea"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 21
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/icetea
)
@@ -171,7 +171,7 @@
name = "drink cartridge - kahlua"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 35
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/kahlua
)
@@ -185,7 +185,7 @@
name = "drink cartridge - lemon lime"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/lemon_lime
)
@@ -199,7 +199,7 @@
name = "drink cartridge - lime juice"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/lime
)
@@ -213,7 +213,7 @@
name = "drink cartridge - mead"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 30
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/mead
)
@@ -227,7 +227,7 @@
name = "drink cartridge - orange juice"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/orange
)
@@ -241,7 +241,7 @@
name = "drink cartridge - rum"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/rum
)
@@ -255,7 +255,7 @@
name = "drink cartridge - Stellar Jolt"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/smw
)
@@ -269,7 +269,7 @@
name = "drink cartridge - soda water"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/sodawater
)
@@ -283,7 +283,7 @@
name = "drink cartridge - Vacuum Fizz"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/spaceup
)
@@ -297,7 +297,7 @@
name = "drink cartridge - tea"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/tea
)
@@ -311,7 +311,7 @@
name = "drink cartridge - tequila"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/tequila
)
@@ -325,7 +325,7 @@
name = "drink cartridge - tonic"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/tonic
)
@@ -339,7 +339,7 @@
name = "drink cartridge - vermouth"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/vermouth
)
@@ -353,7 +353,7 @@
name = "drink cartridge - vodka"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/vodka
)
@@ -367,7 +367,7 @@
name = "drink cartridge - watermelon"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 18
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/watermelon
)
@@ -381,7 +381,7 @@
name = "drink cartridge - whiskey"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 45
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/whiskey
)
@@ -395,7 +395,7 @@
name = "drink cartridge - wine"
supplier = "getmore"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 80
price = 55
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/wine
)
@@ -411,7 +411,7 @@
name = "chemical cartridge - acetone"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 48
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/acetone
)
@@ -425,7 +425,7 @@
name = "chemical cartridge - aluminum"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 42
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/aluminum
)
@@ -439,7 +439,7 @@
name = "chemical cartridge - ammonia"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 36
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/ammonia
)
@@ -453,7 +453,7 @@
name = "chemical cartridge - carbon"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 35
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/carbon
)
@@ -467,7 +467,7 @@
name = "chemical cartridge - copper"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 40
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/copper
)
@@ -495,7 +495,7 @@
name = "chemical cartridge - hydrazine"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 1200
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/hydrazine
)
@@ -509,7 +509,7 @@
name = "chemical cartridge - hydrochloric acid"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 55
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/hclacid
)
@@ -523,7 +523,7 @@
name = "chemical cartridge - iron"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 40
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/iron
)
@@ -537,7 +537,7 @@
name = "chemical cartridge - lithium"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 450
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/lithium
)
@@ -551,7 +551,7 @@
name = "chemical cartridge - mercury"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 65
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/mercury
)
@@ -565,7 +565,7 @@
name = "chemical cartridge - phosphorus"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 350
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/phosphorus
)
@@ -579,7 +579,7 @@
name = "chemical cartridge - potassium"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 55
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/potassium
)
@@ -593,7 +593,7 @@
name = "chemical cartridge - radium"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 3000
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/radium
)
@@ -607,7 +607,7 @@
name = "chemical cartridge - silicon"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 40
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/silicon
)
@@ -621,7 +621,7 @@
name = "chemical cartridge - sodium"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 70
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/sodium
)
@@ -635,7 +635,7 @@
name = "chemical cartridge - sugar"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 3.50
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/sugar
)
@@ -649,7 +649,7 @@
name = "chemical cartridge - sulfur"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 7.50
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/sulfur
)
@@ -663,7 +663,7 @@
name = "chemical cartridge - sulfuric acid"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 40
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/sacid
)
@@ -677,7 +677,7 @@
name = "chemical cartridge - tungsten"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 70
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/tungsten
)
@@ -691,7 +691,7 @@
name = "chemical cartridge - water"
supplier = "zeng_hu"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 150
price = 1.50
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/water
)
@@ -707,7 +707,7 @@
name = "chemical cartridge - dylovene"
supplier = "iac"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 350
price = 1400
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/dylovene
)
@@ -721,7 +721,7 @@
name = "chemical cartridge - inaprovaline"
supplier = "iac"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 350
price = 1600
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
)
@@ -735,7 +735,7 @@
name = "chemical cartridge - thetamycin"
supplier = "iac"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 350
price = 2500
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/thetamycin
)
@@ -749,7 +749,7 @@
name = "chemical cartridge - perconol"
supplier = "iac"
description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can."
price = 350
price = 1800
items = list(
/obj/item/reagent_containers/chem_disp_cartridge/perconol
)
code/modules/cargo/items/custodial.dm
+11 -11
View File
@@ -3,7 +3,7 @@
name = "space cleaner"
supplier = "blam"
description = "BLAM!-brand non-foaming space cleaner! Perfect for those pesky stains."
price = 50
price = 12
items = list(
/obj/item/reagent_containers/spray/cleaner
)
@@ -17,7 +17,7 @@
name = "basic soap"
supplier = "blam"
description = "A basic bar of soap. It cleans, and does absolutely nothing else."
price = 8
price = 2
items = list(
/obj/item/soap
)
@@ -31,7 +31,7 @@
name = "random premium soaps (x3)"
supplier = "blam"
description = "A selection of premium random soaps, as part of a variety pack."
price = 70
price = 18
items = list(
/obj/random/soap
)
@@ -45,7 +45,7 @@
name = "trash bag (x3)"
supplier = "blam"
description = "Heavy duty polymer trash bags."
price = 20
price = 5
items = list(
/obj/item/storage/bag/trash
)
@@ -59,7 +59,7 @@
name = "light replacer"
supplier = "blam"
description = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass."
price = 135
price = 30
items = list(
/obj/item/device/lightreplacer
)
@@ -73,7 +73,7 @@
name = "box of replacement lights"
supplier = "blam"
description = "This box is shaped on the inside so that only light tubes and bulbs fit."
price = 100
price = 22
items = list(
/obj/item/storage/box/lights/mixed
)
@@ -87,7 +87,7 @@
name = "wet floor sign (x5)"
supplier = "blam"
description = "A resupply pack of wet floor signs."
price = 20
price = 6
items = list(
/obj/item/clothing/suit/caution
)
@@ -101,7 +101,7 @@
name = "mop"
supplier = "blam"
description = "A cleaning utensil consisting of a fabric head attached to a stick."
price = 40
price = 12
items = list(
/obj/item/mop
)
@@ -115,7 +115,7 @@
name = "mop bucket"
supplier = "blam"
description = "Fits onto a standard janitorial cart. Fill it with water, but don't forget a mop!"
price = 40
price = 8
items = list(
/obj/structure/mopbucket
)
@@ -129,7 +129,7 @@
name = "cleaner grenade"
supplier = "blam"
description = "Space cleaner packaged into a wide area dispersal system for rapid and efficient cleaning of surfaces. Slippery."
price = 225
price = 50
items = list(
/obj/item/grenade/chem_grenade/cleaner
)
@@ -143,7 +143,7 @@
name = "custodial cart"
supplier = "blam"
description = "The ultimate in custodial carts. Has space for water, mops, signs, trash bags, and more."
price = 850
price = 190
items = list(
/obj/structure/janitorialcart
)
code/modules/cargo/items/engineering.dm
+65 -65
View File
@@ -3,7 +3,7 @@
name = "glass sheets"
supplier = "hephaestus"
description = "50 sheets of glass."
price = 275
price = 55
items = list(
/obj/item/stack/material/glass/full
)
@@ -16,7 +16,7 @@
name = "plasteel sheets"
supplier = "hephaestus"
description = "50 sheets of plasteel."
price = 700
price = 120
items = list(
/obj/item/stack/material/plasteel/full
)
@@ -30,7 +30,7 @@
name = "plastic sheets"
supplier = "hephaestus"
description = "50 sheets of plastic."
price = 250
price = 45
items = list(
/obj/item/stack/material/plastic/full
)
@@ -44,7 +44,7 @@
name = "steel sheets"
supplier = "hephaestus"
description = "50 sheets of steel."
price = 400
price = 75
items = list(
/obj/item/stack/material/steel/full
)
@@ -58,7 +58,7 @@
name = "wood planks"
supplier = "hephaestus"
description = "50 planks of wood."
price = 350
price = 65
items = list(
/obj/item/stack/material/wood/full
)
@@ -72,7 +72,7 @@
name = "phoron crystals"
supplier = "hephaestus"
description = "A bunch of 50 phoron crystals. Highly valuable."
price = 2200
price = 2250
items = list(
/obj/item/stack/material/phoron/full
)
@@ -85,7 +85,7 @@
name = "cardboard sheets"
supplier = "orion"
description = "50 sheets of cardboard."
price = 50
price = 10
items = list(
/obj/item/stack/material/cardboard/full
)
@@ -99,7 +99,7 @@
name = "carpet (x10)"
supplier = "hephaestus"
description = "Ten carpet sheets. It is the same size as a normal floor tile!"
price = 350
price = 60
items = list(
/obj/item/stack/tile/carpet
)
@@ -113,7 +113,7 @@
name = "antifuel grenade"
supplier = "hephaestus"
description = "This grenade is loaded with a foaming antifuel compound -- the twenty-fifth century standard for eliminating industrial spills."
price = 250
price = 45
items = list(
/obj/item/grenade/chem_grenade/antifuel
)
@@ -127,7 +127,7 @@
name = "brown webbing vest"
supplier = "hephaestus"
description = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
price = 83
price = 15
items = list(
/obj/item/clothing/accessory/storage/brown_vest
)
@@ -141,7 +141,7 @@
name = "circuit board (bubble shield generator)"
supplier = "hephaestus"
description = "Looks like a circuit. Probably is."
price = 1500
price = 250
items = list(
/obj/item/circuitboard/shield_gen
)
@@ -155,7 +155,7 @@
name = "circuit board (hull shield generator)"
supplier = "hephaestus"
description = "Looks like a circuit. Probably is."
price = 1500
price = 250
items = list(
/obj/item/circuitboard/shield_gen_ex
)
@@ -169,7 +169,7 @@
name = "circuit board (shield capacitor)"
supplier = "hephaestus"
description = "Looks like a circuit. Probably is."
price = 1500
price = 250
items = list(
/obj/item/circuitboard/shield_cap
)
@@ -183,7 +183,7 @@
name = "circuit board (solar control console)"
supplier = "hephaestus"
description = "Looks like a circuit. Probably is."
price = 1500
price = 250
items = list(
/obj/item/circuitboard/solar_control
)
@@ -197,7 +197,7 @@
name = "coolant tank"
supplier = "hephaestus"
description = "A tank of industrial coolant."
price = 45
price = 10
items = list(
/obj/structure/reagent_dispensers/coolanttank
)
@@ -211,7 +211,7 @@
name = "Disposal Pipe Dispenser"
supplier = "hephaestus"
description = "It dispenses bigger pipes for things to travel through. No, the pipes aren't green."
price = 150
price = 30
items = list(
/obj/machinery/pipedispenser/disposal/orderable
)
@@ -225,7 +225,7 @@
name = "mechanical toolbox"
supplier = "hephaestus"
description = "Danger. Very robust."
price = 200
price = 45
items = list(
/obj/item/storage/toolbox/mechanical
)
@@ -239,7 +239,7 @@
name = "electrical toolbox"
supplier = "hephaestus"
description = "Danger. Very robust."
price = 200
price = 45
items = list(
/obj/item/storage/toolbox/electrical
)
@@ -253,7 +253,7 @@
name = "emergency toolbox"
supplier = "hephaestus"
description = "Danger. Very robust."
price = 120
price = 42
items = list(
/obj/item/storage/toolbox/emergency
)
@@ -267,7 +267,7 @@
name = "EM Acceleration Chamber"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1550
items = list(
/obj/structure/particle_accelerator/fuel_chamber
)
@@ -281,7 +281,7 @@
name = "EM Containment Grid Center"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1550
items = list(
/obj/structure/particle_accelerator/particle_emitter/center
)
@@ -295,7 +295,7 @@
name = "EM Containment Grid Left"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1550
items = list(
/obj/structure/particle_accelerator/particle_emitter/left
)
@@ -309,7 +309,7 @@
name = "EM Containment Grid Right"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1550
items = list(
/obj/structure/particle_accelerator/particle_emitter/right
)
@@ -323,7 +323,7 @@
name = "emergency bluespace relay circuit"
supplier = "hephaestus"
description = "Looks like a circuit. Probably is."
price = 3000
price = 620
items = list(
/obj/item/circuitboard/bluespacerelay
)
@@ -337,7 +337,7 @@
name = "emitter"
supplier = "hephaestus"
description = "It is a heavy duty industrial laser."
price = 1500
price = 1850
items = list(
/obj/machinery/power/emitter
)
@@ -348,10 +348,10 @@
/singleton/cargo_item/doorlock_engineering
category = "engineering"
name = "engineering magnetic door lock - engineering"
name = "magnetic door lock - engineering"
supplier = "hephaestus"
description = "A large, ID locked device used for completely locking down airlocks. It is painted with Engineering colors."
price = 135
price = 48
items = list(
/obj/item/device/magnetic_lock/engineering
)
@@ -365,7 +365,7 @@
name = "engineering voidsuit"
supplier = "hephaestus"
description = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
price = 1200
price = 800
items = list(
/obj/item/clothing/suit/space/void/engineering
)
@@ -379,7 +379,7 @@
name = "engineering voidsuit helmet"
supplier = "hephaestus"
description = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
price = 850
price = 500
items = list(
/obj/item/clothing/head/helmet/space/void/engineering
)
@@ -393,7 +393,7 @@
name = "Field Generator"
supplier = "hephaestus"
description = "A large thermal battery that projects a high amount of energy when powered."
price = 1500
price = 250
items = list(
/obj/machinery/field_generator
)
@@ -407,7 +407,7 @@
name = "fireaxe"
supplier = "hephaestus"
description = "The fire axe is a wooden handled axe with a heavy steel head intended for firefighting use."
price = 1500
price = 25
items = list(
/obj/item/material/twohanded/fireaxe
)
@@ -421,7 +421,7 @@
name = "fuel tank"
supplier = "hephaestus"
description = "A tank filled with welding fuel."
price = 45
price = 10
items = list(
/obj/structure/reagent_dispensers/fueltank
)
@@ -435,7 +435,7 @@
name = "gas mask"
supplier = "hephaestus"
description = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air."
price = 75
price = 15
items = list(
/obj/item/clothing/mask/gas
)
@@ -451,7 +451,7 @@
name = "hard hat"
supplier = "hephaestus"
description = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
price = 35
price = 7
items = list(
/obj/item/clothing/head/hardhat
)
@@ -465,7 +465,7 @@
name = "hazard vest"
supplier = "hephaestus"
description = "A high-visibility vest used in work zones."
price = 90
price = 5
items = list(
/obj/item/clothing/suit/storage/hazardvest
)
@@ -479,7 +479,7 @@
name = "full toolbelt"
supplier = "hephaestus"
description = "A toolbelt, filled with basic mechanics' tools."
price = 500
price = 80
items = list(
/obj/item/storage/belt/utility/full
)
@@ -493,7 +493,7 @@
name = "high-capacity power cell"
supplier = "hephaestus"
description = "A high-capacity rechargable electrochemical power cell."
price = 240
price = 45
items = list(
/obj/item/cell/high
)
@@ -507,7 +507,7 @@
name = "power cell"
supplier = "hephaestus"
description = "A rechargable electrochemical power cell."
price = 90
price = 20
items = list(
/obj/item/cell
)
@@ -521,7 +521,7 @@
name = "hoist kit"
supplier = "hephaestus"
description = "A setup kit for a hoist that can be used to lift things. The hoist will deploy in the direction you're facing."
price = 225
price = 40
items = list(
/obj/item/hoist_kit
)
@@ -535,7 +535,7 @@
name = "inflatable barrier box"
supplier = "hephaestus"
description = "Contains inflatable walls and doors."
price = 360
price = 65
items = list(
/obj/item/storage/bag/inflatable
)
@@ -549,7 +549,7 @@
name = "insulated gloves"
supplier = "hephaestus"
description = "These gloves will protect the wearer from electric shock."
price = 450
price = 72
items = list(
/obj/item/clothing/gloves/yellow
)
@@ -563,7 +563,7 @@
name = "tajaran electrical gloves"
supplier = "hephaestus"
description = "These gloves will protect the wearer from electric shock. Made special for Tajaran use."
price = 450
price = 74
items = list(
/obj/item/clothing/gloves/yellow/specialt
)
@@ -577,7 +577,7 @@
name = "unathi electrical gloves"
supplier = "hephaestus"
description = "These gloves will protect the wearer from electric shock. Made special for Unathi use."
price = 450
price = 74
items = list(
/obj/item/clothing/gloves/yellow/specialu
)
@@ -591,7 +591,7 @@
name = "packaged antimatter reactor section"
supplier = "eckharts"
description = "A section of antimatter reactor shielding. Do not eat."
price = 1000
price = 220
items = list(
/obj/item/device/am_shielding_container
)
@@ -605,7 +605,7 @@
name = "debugger"
supplier = "hephaestus"
description = "Used to debug electronic equipment."
price = 50
price = 12
items = list(
/obj/item/device/debugger
)
@@ -619,7 +619,7 @@
name = "impact wrench"
supplier = "hephaestus"
description = "Wrenches and screws things. Faster."
price = 50
price = 12
items = list(
/obj/item/powerdrill
)
@@ -633,7 +633,7 @@
name = "paint gun"
supplier = "hephaestus"
description = "Useful for designating areas and pissing off coworkers."
price = 135
price = 25
items = list(
/obj/item/device/paint_sprayer
)
@@ -647,7 +647,7 @@
name = "Particle Accelerator Control Computer"
supplier = "hephaestus"
description = "This controls the density of the particles."
price = 1500
price = 2250
items = list(
/obj/machinery/particle_accelerator/control_box
)
@@ -661,7 +661,7 @@
name = "Particle Focusing EM Lens"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1250
items = list(
/obj/structure/particle_accelerator/power_box
)
@@ -675,7 +675,7 @@
name = "portable ladder"
supplier = "hephaestus"
description = "A lightweight deployable ladder, which you can use to move up or down. Or alternatively, you can bash some faces in."
price = 200
price = 40
items = list(
/obj/item/ladder_mobile
)
@@ -689,7 +689,7 @@
name = "radiation Hood"
supplier = "hephaestus"
description = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation."
price = 375
price = 70
items = list(
/obj/item/clothing/head/radiation
)
@@ -703,7 +703,7 @@
name = "radiation suit"
supplier = "hephaestus"
description = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
price = 675
price = 120
items = list(
/obj/item/clothing/suit/radiation
)
@@ -717,7 +717,7 @@
name = "research shuttle console board"
supplier = "hephaestus"
description = "A replacement board for the research shuttle console, in case the original console is destroyed."
price = 500
price = 125
items = list(
/obj/item/circuitboard/research_shuttle
)
@@ -731,7 +731,7 @@
name = "singularity generator"
supplier = "hephaestus"
description = "Used to generate a Singularity. It is not adviced to use this on the asteroid."
price = 20000
price = 17000
items = list(
/obj/machinery/the_singularitygen
)
@@ -745,7 +745,7 @@
name = "superconductive magnetic coil"
supplier = "hephaestus"
description = "Standard superconductive magnetic coil with average capacity and I/O rating."
price = 1800
price = 800
items = list(
/obj/item/smes_coil
)
@@ -759,7 +759,7 @@
name = "supermatter crystal"
supplier = "hephaestus"
description = "An unstable, radioactive crystal that forms the power source of several experimental ships and stations. Extremely dangerous."
price = 30000
price = 18500
items = list(
/obj/machinery/power/supermatter
)
@@ -773,7 +773,7 @@
name = "thermoelectric generator kit"
supplier = "hephaestus"
description = "A kit that comes with a thermoelectric generator and two circulators that attach to it. For usage in high-power energy generation."
price = 7500
price = 1200
items = list(
/obj/machinery/power/generator,
/obj/machinery/atmospherics/binary/circulator,
@@ -789,7 +789,7 @@
name = "solar panel assembly"
supplier = "hephaestus"
description = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker."
price = 1020
price = 350
items = list(
/obj/item/solar_assembly
)
@@ -803,7 +803,7 @@
name = "tracker electronics"
supplier = "hephaestus"
description = "Electronic guidance systems for a solar array."
price = 225
price = 100
items = list(
/obj/item/tracker_electronics
)
@@ -817,7 +817,7 @@
name = "watertank"
supplier = "hephaestus"
description = "A tank filled with water."
price = 45
price = 10
items = list(
/obj/structure/reagent_dispensers/watertank
)
@@ -831,7 +831,7 @@
name = "welding helmet"
supplier = "hephaestus"
description = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
price = 225
price = 20
items = list(
/obj/item/clothing/head/welding
)
@@ -845,7 +845,7 @@
name = "antimatter containment jar"
supplier = "eckharts"
description = "Holds antimatter. Warranty void if exposed to matter."
price = 1000
price = 280
items = list(
/obj/item/am_containment
)
@@ -859,7 +859,7 @@
name = "antimatter control unit"
supplier = "eckharts"
description = "The control unit for an antimatter reactor. Probably safe."
price = 5500
price = 1950
items = list(
/obj/machinery/power/am_control_unit
)
@@ -873,7 +873,7 @@
name = "Alpha Particle Generation Array"
supplier = "hephaestus"
description = "Part of a Particle Accelerator."
price = 3000
price = 1550
items = list(
/obj/structure/particle_accelerator/end_cap
)
@@ -887,7 +887,7 @@
name = "radiation collector array"
supplier = "hephaestus"
description = "A radiation collector array. Used to augment the power generation of a generator that emits ionising radiation."
price = 2000
price = 650
items = list(
/obj/machinery/power/rad_collector
)
code/modules/cargo/items/hospitality.dm
+136 -201
View File
File diff suppressed because it is too large Load Diff
code/modules/cargo/items/hydroponics.dm
+30 -30
View File
@@ -3,7 +3,7 @@
name = "ammonia bottle"
supplier = "getmore"
description = "A small bottle."
price = 90
price = 15
items = list(
/obj/item/reagent_containers/glass/bottle/ammonia
)
@@ -17,7 +17,7 @@
name = "apron"
supplier = "getmore"
description = "A basic blue apron."
price = 25
price = 20
items = list(
/obj/item/clothing/accessory/apron/blue
)
@@ -31,7 +31,7 @@
name = "bee net"
supplier = "vysoka"
description = "A needed tool to maintain bee imprisonment."
price = 55
price = 24
items = list(
/obj/item/bee_net
)
@@ -45,7 +45,7 @@
name = "bee smoker"
supplier = "vysoka"
description = "For when you need to show those bees whos boss."
price = 120
price = 60
items = list(
/obj/item/bee_smoker
)
@@ -59,7 +59,7 @@
name = "beehive assembly"
supplier = "vysoka"
description = "Beehive frame, some assembly required."
price = 75
price = 40
items = list(
/obj/item/beehive_assembly
)
@@ -73,7 +73,7 @@
name = "cat"
supplier = "molinaris"
description = "A domesticated, feline pet. Has a tendency to adopt crewmembers."
price = 300
price = 150
items = list(
/mob/living/simple_animal/cat
)
@@ -87,7 +87,7 @@
name = "chicken"
supplier = "molinaris"
description = "Adorable! They make such a racket though."
price = 150
price = 30
items = list(
/mob/living/simple_animal/chick
)
@@ -101,7 +101,7 @@
name = "corgi"
supplier = "molinaris"
description = "Studies have shown corgis are the most well adapted canines in space, for some reason."
price = 400
price = 600
items = list(
/obj/structure/largecrate/animal/corgi
)
@@ -115,7 +115,7 @@
name = "cow"
supplier = "molinaris"
description = "Known for their milk, just don't tip them over."
price = 500
price = 1200
items = list(
/mob/living/simple_animal/cow
)
@@ -129,7 +129,7 @@
name = "schlorrgo egg"
supplier = "zharkov"
description = "A large egg that will eventually grow into a Schlorrgo."
price = 700
price = 300
items = list(
/obj/item/reagent_containers/food/snacks/egg/schlorrgo
)
@@ -143,7 +143,7 @@
name = "fatshouter"
supplier = "zharkov"
description = "A crate containing a fatshouter, an Adhomian animal."
price = 500
price = 1500
items = list(
/obj/structure/largecrate/animal/adhomai/fatshouter
)
@@ -157,7 +157,7 @@
name = "flora disk box"
supplier = "nanotrasen"
description = "A box of flora data disks, apparently."
price = 660
price = 120
items = list(
/obj/item/storage/box/botanydisk
)
@@ -171,7 +171,7 @@
name = "goat"
supplier = "molinaris"
description = "Not known for their pleasant disposition."
price = 400
price = 250
items = list(
/mob/living/simple_animal/hostile/retaliate/goat
)
@@ -185,7 +185,7 @@
name = "hakhma"
supplier = "molinaris"
description = "An oversized insect breed by Scarab colony ships, known for their milk."
price = 600
price = 300
items = list(
/mob/living/simple_animal/hakhma
)
@@ -199,7 +199,7 @@
name = "honey extractor"
supplier = "vysoka"
description = "Needed equipment to extract sweet liquid gold."
price = 300
price = 80
items = list(
/obj/machinery/honey_extractor
)
@@ -213,7 +213,7 @@
name = "hydroponics tray"
supplier = "nanotrasen"
description = "A safe space to raise your plants."
price = 45
price = 50
items = list(
/obj/machinery/portable_atmospherics/hydroponics
)
@@ -241,7 +241,7 @@
name = "leather gloves"
supplier = "getmore"
description = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
price = 9
price = 12
items = list(
/obj/item/clothing/gloves/botanic_leather
)
@@ -255,7 +255,7 @@
name = "packet of diona nodes"
supplier = "nanotrasen"
description = "It has a picture of diona pods on the front."
price = 15
price = 25
items = list(
/obj/item/seeds/replicapod
)
@@ -269,7 +269,7 @@
name = "packet of kudzu seeds"
supplier = "vysoka"
description = "It has a picture of kudzu vines on the front."
price = 15
price = 12
items = list(
/obj/item/seeds/kudzuseed
)
@@ -283,7 +283,7 @@
name = "packet of strange plant nodes"
supplier = "zeng_hu"
description = "It has a picture of strange plants on the front."
price = 15
price = 12
items = list(
/obj/item/seeds/random
)
@@ -297,7 +297,7 @@
name = "plant analyzer"
supplier = "getmore"
description = "A hand-held environmental scanner which reports current gas levels."
price = 135
price = 70
items = list(
/obj/item/device/analyzer/plant_analyzer
)
@@ -311,7 +311,7 @@
name = "Plant-B-Gone"
supplier = "blam"
description = "Kills those pesky weeds!"
price = 200
price = 35
items = list(
/obj/item/reagent_containers/spray/plantbgone
)
@@ -325,7 +325,7 @@
name = "queen bee pack"
supplier = "vysoka"
description = "Contains one queen bee, bee kingdom not included."
price = 150
price = 40
items = list(
/obj/item/bee_pack
)
@@ -339,7 +339,7 @@
name = "sample of liberty cap spores"
supplier = "vysoka"
description = "It's labelled as coming from liberty cap mushrooms."
price = 15
price = 25
items = list(
/obj/item/seeds/libertymycelium
)
@@ -353,7 +353,7 @@
name = "sample of reishi spores"
supplier = "vysoka"
description = "It's labelled as coming from reishi."
price = 15
price = 35
items = list(
/obj/item/seeds/reishimycelium
)
@@ -367,7 +367,7 @@
name = "wulumunusha seed"
supplier = "zeng_hu"
description = "A Skrellian plant used in religious ceremonies and drinks."
price = 100
price = 45
items = list(
/obj/item/seeds/wulumunushaseed
)
@@ -381,7 +381,7 @@
name = "chainsaw"
supplier = "nanotrasen"
description = "A portable mechanical saw commonly used to fell trees."
price = 600
price = 400
items = list(
/obj/item/material/twohanded/chainsaw
)
@@ -395,7 +395,7 @@
name = "steel hatchet"
supplier = "nanotrasen"
description = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
price = 36
price = 25
items = list(
/obj/item/material/hatchet
)
@@ -409,7 +409,7 @@
name = "steel mini hoe"
supplier = "nanotrasen"
description = "It's used for removing weeds or scratching your back."
price = 15
price = 12
items = list(
/obj/item/material/minihoe
)
@@ -423,7 +423,7 @@
name = "weedkiller grenade"
supplier = "blam"
description = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
price = 225
price = 100
items = list(
/obj/item/grenade/chem_grenade/antiweed
)
code/modules/cargo/items/medical.dm
+49 -49
View File
@@ -21,7 +21,7 @@
name = "first-aid kit"
supplier = "nanotrasen"
description = "A basic medical kit for those boo-boos."
price = 250
price = 60
items = list(
/obj/item/storage/firstaid/regular
)
@@ -35,7 +35,7 @@
name = "advanced first-aid kit"
supplier = "nanotrasen"
description = "An emergency medical kit for general severe injuries."
price = 500
price = 200
items = list(
/obj/item/storage/firstaid/adv
)
@@ -49,7 +49,7 @@
name = "large advanced first-aid kit"
supplier = "nanotrasen"
description = "A large emergency medical kit for many general severe injuries."
price = 900
price = 500
items = list(
/obj/item/storage/firstaid/large/adv
)
@@ -63,7 +63,7 @@
name = "fire first-aid kit"
supplier = "nanotrasen"
description = "An emergency medical kit for serious burns, either chemical or temperature."
price = 450
price = 150
items = list(
/obj/item/storage/firstaid/fire
)
@@ -77,7 +77,7 @@
name = "oxygen deprivation first aid"
supplier = "nanotrasen"
description = "An emergency medical kit for oxygen deprivation, including cardiac arrest."
price = 450
price = 150
items = list(
/obj/item/storage/firstaid/o2
)
@@ -91,7 +91,7 @@
name = "toxin first aid"
supplier = "nanotrasen"
description = "An emergency medical kit for toxin exposure."
price = 450
price = 150
items = list(
/obj/item/storage/firstaid/toxin
)
@@ -105,7 +105,7 @@
name = "radiation first aid"
supplier = "nanotrasen"
description = "An emergency medical kit for severe radiation exposure."
price = 450
price = 150
items = list(
/obj/item/storage/firstaid/radiation
)
@@ -119,7 +119,7 @@
name = "O- blood pack (x1)"
supplier = "zeng_hu"
description = "A blood pack filled with universally-compatible O- Blood."
price = 300
price = 800
items = list(
/obj/item/reagent_containers/blood/OMinus
)
@@ -133,7 +133,7 @@
name = "SBS blood pack (x1)"
supplier = "zeng_hu"
description = "A blood pack filled with Synthetic Blood Substitute. WARNING: Not compatible with organic blood!"
price = 270
price = 675
items = list(
/obj/item/reagent_containers/blood/sbs
)
@@ -161,7 +161,7 @@
name = "dexalin plus autoinjector"
supplier = "nanotrasen"
description = "An autoinjector designed to treat oxygen deprivation."
price = 150
price = 550
items = list(
/obj/item/reagent_containers/hypospray/autoinjector/oxygen
)
@@ -175,7 +175,7 @@
name = "peridaxon autoinjector"
supplier = "nanotrasen"
description = "An autoinjector designed to treat broad-spectrum organ damage."
price = 300
price = 725
items = list(
/obj/item/reagent_containers/hypospray/autoinjector/peridaxon
)
@@ -189,7 +189,7 @@
name = "pneumalin autoinhaler"
supplier = "nanotrasen"
description = "An autoinhaler used to treat lung damage."
price = 200
price = 450
items = list(
/obj/item/reagent_containers/inhaler/pneumalin
)
@@ -203,7 +203,7 @@
name = "body bags boxes (x3)"
supplier = "nanotrasen"
description = "This box contains body bags."
price = 155
price = 35
items = list(
/obj/item/storage/box/bodybags
)
@@ -217,7 +217,7 @@
name = "box of empty autoinjectors"
supplier = "nanotrasen"
description = "Contains empty autoinjectors."
price = 120
price = 85
items = list(
/obj/item/storage/box/autoinjectors
)
@@ -231,7 +231,7 @@
name = "box of sterile gloves"
supplier = "zeng_hu"
description = "Contains sterile gloves."
price = 55
price = 25
items = list(
/obj/item/storage/box/gloves
)
@@ -245,7 +245,7 @@
name = "box of sterile masks"
supplier = "zeng_hu"
description = "This box contains masks of sterility."
price = 55
price = 28
items = list(
/obj/item/storage/box/masks
)
@@ -259,7 +259,7 @@
name = "box of syringes"
supplier = "nanotrasen"
description = "A box full of syringes."
price = 60
price = 27
items = list(
/obj/item/storage/box/syringes
)
@@ -270,10 +270,10 @@
/singleton/cargo_item/butazoline_bottle
category = "medical"
name = "butazoline autoinjector"
name = "butazoline bottle"
supplier = "nanotrasen"
description = "A bottle of butazoline, a medicine used to treat severe trauma."
price = 50
price = 250
items = list(
/obj/item/reagent_containers/glass/bottle/butazoline
)
@@ -284,10 +284,10 @@
/singleton/cargo_item/dermaline_bottle
category = "medical"
name = "dermaline autoinjector"
name = "dermaline bottle"
supplier = "nanotrasen"
description = "A bottle of dermaline, a medicine used to treat severe burns."
price = 50
price = 250
items = list(
/obj/item/reagent_containers/glass/bottle/dermaline
)
@@ -301,7 +301,7 @@
name = "dylovene bottle"
supplier = "nanotrasen"
description = "A small bottle of dylovene, a broad-spectrum antitoxin and liver regenerative."
price = 20
price = 180
items = list(
/obj/item/reagent_containers/glass/bottle/antitoxin
)
@@ -315,7 +315,7 @@
name = "hyronalin bottle"
supplier = "nanotrasen"
description = "A bottle containing hyronalin, used to treat radiation poisoning."
price = 35
price = 375
items = list(
/obj/item/reagent_containers/glass/bottle/hyronalin
)
@@ -329,7 +329,7 @@
name = "inaprovaline bottle"
supplier = "nanotrasen"
description = "A bottle of inaprovaline, a broad-spectrum stimulant and cardiac stabilizer."
price = 25
price = 205
items = list(
/obj/item/reagent_containers/glass/bottle/inaprovaline
)
@@ -343,7 +343,7 @@
name = "soporific bottle"
supplier = "nanotrasen"
description = "A bottle of soporific. Just the fumes make you sleepy."
price = 55
price = 245
items = list(
/obj/item/reagent_containers/glass/bottle/stoxin
)
@@ -357,7 +357,7 @@
name = "mortaphenyl bottle"
supplier = "nanotrasen"
description = "A bottle of mortaphenyl, a strong non-opioid painkiller."
price = 85
price = 455
items = list(
/obj/item/reagent_containers/glass/bottle/mortaphenyl
)
@@ -371,7 +371,7 @@
name = "medical belt"
supplier = "nanotrasen"
description = "Can hold various medical equipment."
price = 75
price = 35
items = list(
/obj/item/storage/belt/medical
)
@@ -385,7 +385,7 @@
name = "medical mask"
supplier = "nanotrasen"
description = "A close-fitting sterile mask that can be connected to an air supply."
price = 35
price = 25
items = list(
/obj/item/clothing/mask/breath/medical
)
@@ -399,7 +399,7 @@
name = "surgical cap"
supplier = "nanotrasen"
description = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
price = 70
price = 22
items = list(
/obj/item/clothing/head/surgery
)
@@ -413,7 +413,7 @@
name = "medical scrubs"
supplier = "nanotrasen"
description = "It's made of a special fiber that provides minor protection against biohazards."
price = 100
price = 45
items = list(
/obj/item/clothing/under/rank/medical/surgeon
)
@@ -427,7 +427,7 @@
name = "medical gown"
supplier = "nanotrasen"
description = "A loose-fitting gown for medical patients."
price = 60
price = 23
items = list(
/obj/item/clothing/under/medical_gown
)
@@ -441,7 +441,7 @@
name = "medical voidsuit"
supplier = "nanotrasen"
description = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
price = 1200
price = 780
items = list(
/obj/item/clothing/suit/space/void/medical
)
@@ -455,7 +455,7 @@
name = "medical voidsuit helmet"
supplier = "nanotrasen"
description = "A special helmet designed for work in a hazardous, low pressure environment. Has minor radiation shielding."
price = 850
price = 480
items = list(
/obj/item/clothing/head/helmet/space/void/medical
)
@@ -469,7 +469,7 @@
name = "nanopaste"
supplier = "zeng_hu"
description = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
price = 2000
price = 750
items = list(
/obj/item/stack/nanopaste
)
@@ -483,7 +483,7 @@
name = "pill bottles"
supplier = "nanotrasen"
description = "A storage box containing pill bottles."
price = 155
price = 55
items = list(
/obj/item/storage/pill_bottle
)
@@ -497,7 +497,7 @@
name = "stasis bag"
supplier = "zeng_hu"
description = "A folded, non-reusable bag designed to keep patients in stasis for transport."
price = 900
price = 2450
items = list(
/obj/item/bodybag/cryobag
)
@@ -511,7 +511,7 @@
name = "stabilizer harness"
supplier = "nanotrasen"
description = "A specialized medical harness that gives regular compressions to the patient's ribcage for cases of urgent heart issues, and functions as an emergency artificial respirator for cases of urgent lung issues."
price = 300
price = 2110
items = list(
/obj/item/auto_cpr
)
@@ -525,7 +525,7 @@
name = "hypospray"
supplier = "zeng_hu"
description = "A sterile, air-needle autoinjector for administration of drugs to patients."
price = 200
price = 800
items = list(
/obj/item/reagent_containers/hypospray
)
@@ -541,7 +541,7 @@
name = "surgery kit"
supplier = "zeng_hu"
description = "A kit containing surgical tools, either for resupply or for use on-the-go."
price = 2000
price = 3200
items = list(
/obj/item/storage/firstaid/surgery
)
@@ -555,7 +555,7 @@
name = "anesthetic tank"
supplier = "nanotrasen"
description = "A tank with an N2O/O2 gas mix."
price = 200
price = 250
items = list(
/obj/item/tank/anesthetic
)
@@ -569,7 +569,7 @@
name = "scalpel"
supplier = "zeng_hu"
description = "Cut, cut, and once more cut."
price = 100
price = 255
items = list(
/obj/item/surgery/scalpel
)
@@ -583,7 +583,7 @@
name = "retractor"
supplier = "zeng_hu"
description = "Retracts stuff."
price = 115
price = 275
items = list(
/obj/item/surgery/retractor
)
@@ -597,7 +597,7 @@
name = "hemostat"
supplier = "zeng_hu"
description = "You think you have seen this before."
price = 135
price = 275
items = list(
/obj/item/surgery/hemostat
)
@@ -611,7 +611,7 @@
name = "circular saw"
supplier = "zeng_hu"
description = "For heavy duty cutting."
price = 195
price = 510
items = list(
/obj/item/surgery/circular_saw
)
@@ -625,7 +625,7 @@
name = "vascular recoupler"
supplier = "zeng_hu"
description = "An advanced automatic surgical instrument that operates with extreme finesse."
price = 495
price = 850
items = list(
/obj/item/surgery/fix_o_vein
)
@@ -639,7 +639,7 @@
name = "cautery"
supplier = "zeng_hu"
description = "This stops bleeding."
price = 165
price = 550
items = list(
/obj/item/surgery/cautery
)
@@ -653,7 +653,7 @@
name = "surgical drill"
supplier = "zeng_hu"
description = "You can drill using this item. You dig?"
price = 195
price = 470
items = list(
/obj/item/surgery/surgicaldrill
)
@@ -667,7 +667,7 @@
name = "bone gel"
supplier = "zeng_hu"
description = "A bottle-and-nozzle applicator containing a specialized gel. When applied to bone tissue, it can reinforce and repair breakages and act as a glue to keep bones in place while they heal."
price = 495
price = 485
items = list(
/obj/item/surgery/bone_gel
)
@@ -681,7 +681,7 @@
name = "bone setter"
supplier = "zeng_hu"
description = "Sets bones into place."
price = 225
price = 255
items = list(
/obj/item/surgery/bonesetter
)
code/modules/cargo/items/mining.dm
+9 -9
View File
@@ -3,7 +3,7 @@
name = "mining voidsuit"
supplier = "nanotrasen"
description = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
price = 1200
price = 800
items = list(
/obj/item/clothing/suit/space/void/mining
)
@@ -17,7 +17,7 @@
name = "mining voidsuit helmet"
supplier = "nanotrasen"
description = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
price = 850
price = 500
items = list(
/obj/item/clothing/head/helmet/space/void/mining
)
@@ -31,7 +31,7 @@
name = "Class A Kinetic Accelerator"
supplier = "hephaestus"
description = "Contains a tactical KA frame, an experimental core KA power converter, a recoil reloading KA cell, and a upgrade chip - damage increase."
price = 7999
price = 3200
items = list(
/obj/item/gun/custom_ka/frame05/prebuilt
)
@@ -45,7 +45,7 @@
name = "Class B Kinetic Accelerator"
supplier = "hephaestus"
description = "Contains a heavy KA frame, a planet core KA power converter, a uranium recharging KA cell, and a upgrade chip - efficiency increase."
price = 5599
price = 2850
items = list(
/obj/item/gun/custom_ka/frame04/prebuilt
)
@@ -59,7 +59,7 @@
name = "Class C Kinetic Accelerator"
supplier = "hephaestus"
description = "Contains a medium KA frame, a meteor core KA power converter, a kinetic KA cell, and a upgrade chip - focusing."
price = 3299
price = 2200
items = list(
/obj/item/gun/custom_ka/frame03/prebuilt
)
@@ -73,7 +73,7 @@
name = "Class D Kinetic Accelerator"
supplier = "hephaestus"
description = "Contains a light KA frame, a professional core KA power converter, an advanced pump recharging KA cell, and a upgrade chip - firedelay increase."
price = 2299
price = 1850
items = list(
/obj/item/gun/custom_ka/frame02/prebuilt
)
@@ -87,7 +87,7 @@
name = "Class E Kinetic Accelerator"
supplier = "hephaestus"
description = "Contains a compact KA frame, a standard core KA power converter, a pump recharging KA cell, and a upgrade chip - focusing."
price = 1499
price = 1400
items = list(
/obj/item/gun/custom_ka/frame01/prebuilt
)
@@ -101,7 +101,7 @@
name = "mining drill"
supplier = "hephaestus"
description = "A large industrial drill. Its bore does not penetrate deep enough to access the sublevels."
price = 4000
price = 5000
items = list(
/obj/machinery/mining/drill,
/obj/machinery/mining/brace,
@@ -117,7 +117,7 @@
name = "ore box"
supplier = "hephaestus"
description = "Contains a box for storing ore."
price = 250
price = 150
items = list(
/obj/structure/ore_box
)
code/modules/cargo/items/miscellaneous.dm
+3 -3
View File
@@ -3,7 +3,7 @@
name = "auto-chisel"
supplier = "nanotrasen"
description = "With an integrated AI chip and hair-trigger precision, this baby makes sculpting almost automatic!"
price = 500
price = 125
items = list(
/obj/item/autochisel
)
@@ -17,7 +17,7 @@
name = "sculpting block"
supplier = "nanotrasen"
description = "A finely chiselled sculpting block, it is ready to be your canvas."
price = 200
price = 750
items = list(
/obj/structure/sculpting_block
)
@@ -31,7 +31,7 @@
name = "space air conditioner"
supplier = "nanotrasen"
description = "Made by Space Amish using traditional space techniques, this A/C unit can heat or cool a room to your liking."
price = 200
price = 150
items = list(
/obj/machinery/space_heater
)
code/modules/cargo/items/operations.dm
+250 -264
View File
@@ -3,7 +3,7 @@
name = "autakh limbs"
supplier = "hephaestus"
description = "A box with various autakh limbs."
price = 3000
price = 1000
items = list(
/obj/item/organ/external/hand/right/autakh/tool,
/obj/item/organ/external/hand/right/autakh/tool/mining,
@@ -14,68 +14,12 @@
groupable = TRUE
spawn_amount = 2
/singleton/cargo_item/battlemonstersresupplycanister
category = "operations"
name = "battlemonsters resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/battlemonsters
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/blackpaint
category = "operations"
name = "black paint"
supplier = "hephaestus"
description = "Black paint, the color of space."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/black
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/bluepaint
category = "operations"
name = "blue paint"
supplier = "hephaestus"
description = "Blue paint, for when you're on a mission from god."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/blue
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/boozeresupplycanister
category = "operations"
name = "booze resupply canister"
supplier = "orion"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/booze
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/camera
category = "operations"
name = "camera"
supplier = "nanotrasen"
description = "A polaroid camera. 10 photos left."
price = 80
price = 45
items = list(
/obj/item/device/camera
)
@@ -89,7 +33,7 @@
name = "cargo train trolley"
supplier = "orion"
description = "A cargo trolley for carrying cargo, NOT people."
price = 1500
price = 800
items = list(
/obj/vehicle/train/cargo/trolley
)
@@ -103,7 +47,7 @@
name = "cargo train tug"
supplier = "orion"
description = "A ridable electric car designed for pulling cargo trolleys."
price = 500
price = 350
items = list(
/obj/vehicle/train/cargo/engine
)
@@ -117,7 +61,7 @@
name = "Coat Hanger"
supplier = "nanotrasen"
description = "To hang your coat."
price = 150
price = 12
items = list(
/obj/structure/coatrack
)
@@ -126,54 +70,12 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/coffeeresupplycanister
category = "operations"
name = "coffee resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/coffee
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/colaresupplycanister
category = "operations"
name = "cola resupply canister"
supplier = "idris"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/cola
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/cutleryresupplycanister
category = "operations"
name = "cutlery resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/cutlery
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/eftposscanner
category = "operations"
name = "EFTPOS scanner"
supplier = "orion"
description = "Swipe your ID card to make purchases electronically."
price = 45
price = 35
items = list(
/obj/item/device/eftpos
)
@@ -187,7 +89,7 @@
name = "empty spray bottle"
supplier = "blam"
description = "A empty spray bottle."
price = 50
price = 5
items = list(
/obj/item/reagent_containers/spray
)
@@ -215,7 +117,7 @@
name = "film cartridge"
supplier = "nanotrasen"
description = "A camera film cartridge. Insert it into a camera to reload it."
price = 15
price = 8
items = list(
/obj/item/device/camera_film
)
@@ -229,7 +131,7 @@
name = "flare"
supplier = "hephaestus"
description = "Good for illuminating dark areas or burning someones face off."
price = 80
price = 8
items = list(
/obj/item/device/flashlight/flare
)
@@ -243,7 +145,7 @@
name = "formal wear crate"
supplier = "nanotrasen"
description = "Formalwear for the best occasions."
price = 800
price = 350
items = list(
/obj/item/clothing/head/bowler,
/obj/item/clothing/head/that,
@@ -276,48 +178,6 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/greenpaint
category = "operations"
name = "green paint"
supplier = "orion"
description = "Green paint, a aesthetic replacement for grass."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/green
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/hmatrrafillet
category = "operations"
name = "Hma'trra fillet"
supplier = "zharkov"
description = "A fillet of glacier worm meat."
price = 45
items = list(
/obj/item/reagent_containers/food/snacks/hmatrrameat
)
access = 0
container_type = "freezer"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/hydroresupplycanister
category = "operations"
name = "hydro resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/hydro
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/janitorialresupplyset
category = "operations"
name = "janitorial resupply set"
@@ -358,20 +218,6 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/medsresupplycanister
category = "operations"
name = "meds resupply canister"
supplier = "zeng_hu"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/meds
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/packagewrapper
category = "operations"
name = "package wrapper"
@@ -428,54 +274,12 @@
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/purplepaint
category = "operations"
name = "purple paint"
supplier = "orion"
description = "Purple paint, it makes you feel like royalty."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/purple
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/redpaint
category = "operations"
name = "red paint"
supplier = "orion"
description = "Red paint, its not blood we promise."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/red
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/robotoolsresupplycanister
category = "operations"
name = "robo-tools resupply canister"
supplier = "blam"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/robo
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/poster19
category = "operations"
name = "rolled-up poster - No. 19"
supplier = "orion"
description = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface."
price = 38
price = 3.50
items = list(
/obj/item/contraband/poster
)
@@ -484,26 +288,12 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/securityresupplycanister
category = "operations"
name = "security resupply canister"
supplier = "blam"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/robust
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/shoulderholster
category = "operations"
name = "shoulder holster"
supplier = "zavodskoi"
description = "A handgun holster."
price = 23
price = 15
items = list(
/obj/item/clothing/accessory/holster
)
@@ -512,40 +302,12 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/smokesresupplycanister
category = "operations"
name = "smokes resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 500
items = list(
/obj/item/device/vending_refill/smokes
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/snacksresupplycanister
category = "operations"
name = "snacks resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 967
items = list(
/obj/item/device/vending_refill/snack
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/space_bike
category = "operations"
name = "space-bike"
supplier = "zharkov"
description = "Space wheelies! Woo!"
price = 1200
price = 800
items = list(
/obj/vehicle/bike
)
@@ -554,28 +316,42 @@
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/toolsresupplycanister
/singleton/cargo_item/webbing
category = "operations"
name = "tools resupply canister"
supplier = "hephaestus"
description = "A vending machine restock cart."
price = 500
name = "webbing"
supplier = "nanotrasen"
description = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
price = 43
items = list(
/obj/item/device/vending_refill/tools
/obj/item/clothing/accessory/storage/webbing
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/webbing
/singleton/cargo_item/blackpaint
category = "operations"
name = "webbing"
supplier = "nanotrasen"
description = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
price = 83
name = "black paint"
supplier = "hephaestus"
description = "Black paint, the color of space."
price = 10
items = list(
/obj/item/clothing/accessory/storage/webbing
/obj/item/reagent_containers/glass/paint/black
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/bluepaint
category = "operations"
name = "blue paint"
supplier = "hephaestus"
description = "Blue paint, for when you're on a mission from god."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/blue
)
access = 0
container_type = "crate"
@@ -610,12 +386,82 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/purplepaint
category = "operations"
name = "purple paint"
supplier = "orion"
description = "Purple paint, it makes you feel like royalty."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/purple
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/redpaint
category = "operations"
name = "red paint"
supplier = "orion"
description = "Red paint, its not blood we promise."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/red
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/greenpaint
category = "operations"
name = "green paint"
supplier = "orion"
description = "Green paint, a aesthetic replacement for grass."
price = 10
items = list(
/obj/item/reagent_containers/glass/paint/green
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/battlemonstersresupplycanister
category = "operations"
name = "battlemonsters resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 2250
items = list(
/obj/item/device/vending_refill/battlemonsters
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/boozeresupplycanister
category = "operations"
name = "booze resupply canister"
supplier = "orion"
description = "A vending machine restock cart."
price = 4500
items = list(
/obj/item/device/vending_refill/booze
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/zorasodaresupplycanister
category = "operations"
name = "zora soda resupply canister"
supplier = "zora"
description = "A vending machine restock cart."
price = 800
price = 1255
items = list(
/obj/item/device/vending_refill/zora
)
@@ -623,3 +469,143 @@
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/toolsresupplycanister
category = "operations"
name = "tools resupply canister"
supplier = "hephaestus"
description = "A vending machine restock cart."
price = 2450
items = list(
/obj/item/device/vending_refill/tools
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/smokesresupplycanister
category = "operations"
name = "smokes resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 2250
items = list(
/obj/item/device/vending_refill/smokes
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/snacksresupplycanister
category = "operations"
name = "snacks resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 1255
items = list(
/obj/item/device/vending_refill/snack
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/robotoolsresupplycanister
category = "operations"
name = "robo-tools resupply canister"
supplier = "blam"
description = "A vending machine restock cart."
price = 2500
items = list(
/obj/item/device/vending_refill/robo
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/securityresupplycanister
category = "operations"
name = "security resupply canister"
supplier = "blam"
description = "A vending machine restock cart."
price = 4500
items = list(
/obj/item/device/vending_refill/robust
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/medsresupplycanister
category = "operations"
name = "meds resupply canister"
supplier = "zeng_hu"
description = "A vending machine restock cart."
price = 5500
items = list(
/obj/item/device/vending_refill/meds
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/hydroresupplycanister
category = "operations"
name = "hydro resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 2500
items = list(
/obj/item/device/vending_refill/hydro
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/coffeeresupplycanister
category = "operations"
name = "coffee resupply canister"
supplier = "getmore"
description = "A vending machine restock cart."
price = 1350
items = list(
/obj/item/device/vending_refill/coffee
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/colaresupplycanister
category = "operations"
name = "cola resupply canister"
supplier = "idris"
description = "A vending machine restock cart."
price = 1250
items = list(
/obj/item/device/vending_refill/cola
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/cutleryresupplycanister
category = "operations"
name = "cutlery resupply canister"
supplier = "nanotrasen"
description = "A vending machine restock cart."
price = 850
items = list(
/obj/item/device/vending_refill/cutlery
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
code/modules/cargo/items/recreation.dm
+13 -13
View File
@@ -188,7 +188,7 @@
name = "water balloons (x10)"
supplier = "nanotrasen"
description = "Ten empty water balloons for water balloon fights."
price = 100
price = 3.25
items = list(
/obj/item/toy/waterballoon
)
@@ -202,7 +202,7 @@
name = "balloons (x10)"
supplier = "nanotrasen"
description = "Ten empty regular balloons. Can be filled using a tank of air or other gas. Warranty void if filled with hydrogen."
price = 80
price = 2.50
items = list(
/obj/item/toy/balloon
)
@@ -216,7 +216,7 @@
name = "toy sword"
supplier = "nanotrasen"
description = "A cheap, plastic replica of a blue energy sword. Realistic sounds and colors! Ages 8 and up."
price = 200
price = 12
items = list(
/obj/item/toy/sword
)
@@ -230,7 +230,7 @@
name = "replica katana"
supplier = "nanotrasen"
description = "A cheap plastic katana. Useful for pretending you're a samurai or for tabletop roleplaying sessions."
price = 200
price = 16
items = list(
/obj/item/toy/katana
)
@@ -244,7 +244,7 @@
name = "foam darts (x5)"
supplier = "nanotrasen"
description = "It's some foam darts, for use in foam weaponry. Ages 8 and up."
price = 20
price = 3.50
items = list(
/obj/item/toy/ammo/crossbow
)
@@ -258,7 +258,7 @@
name = "foam dart crossbow"
supplier = "nanotrasen"
description = "A weapon favored by many overactive children. Ages 8 and up."
price = 200
price = 20
items = list(
/obj/item/toy/crossbow
)
@@ -272,7 +272,7 @@
name = "gravitational singularity toy"
supplier = "getmore"
description = "'Singulo' brand spinning toy. Certified mesmerizing since 2440."
price = 100
price = 8
items = list(
/obj/item/toy/spinningtoy
)
@@ -286,7 +286,7 @@
name = "random plushies (x4)"
supplier = "nanotrasen"
description = "Four random surplus plushies from a local toy store's clearance sale. People grow old, apparently."
price = 250
price = 45
items = list(
/obj/random/plushie
)
@@ -300,7 +300,7 @@
name = "therapy doll"
supplier = "virgo"
description = "A toy for therapeutic and recreational purposes."
price = 120
price = 22
items = list(
/obj/item/toy/plushie/therapy
)
@@ -314,7 +314,7 @@
name = "snap pop (x5)"
supplier = "nanotrasen"
description = "A number of snap pops."
price = 200
price = 12
items = list(
/obj/item/toy/snappop
)
@@ -328,7 +328,7 @@
name = "red laser tag equipment set"
supplier = "nanotrasen"
description = "A two-player set of red-team laser tag equipment consisting of a helmet, armor, and a gun."
price = 200
price = 150
items = list(
/obj/item/clothing/head/helmet/riot/laser_tag,
/obj/item/clothing/suit/armor/riot/laser_tag,
@@ -344,7 +344,7 @@
name = "blue laser tag equipment set"
supplier = "nanotrasen"
description = "A two-player set of blue-team laser blue equipment consisting of a helmet, armor, and a gun."
price = 200
price = 150
items = list(
/obj/item/clothing/head/helmet/riot/laser_tag/blue,
/obj/item/clothing/suit/armor/riot/laser_tag/blue,
@@ -360,7 +360,7 @@
name = "lyodii fatesayer cards"
supplier = "orion"
description = "A lyodii Fatesayer card deck. Exported from Moroz, used to tell your fate."
price = 300 //It's a niche novelty thing made in relatively small export quantities
price = 120 //It's a niche novelty thing made in relatively small export quantities
items = list(
/obj/item/storage/box/lyodii
)
code/modules/cargo/items/robotics.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "positronic brain"
supplier = "hephaestus"
description = "An IPC-grade inactivated positronic brain fresh off the factory line. These sentient, enigmatic computers are the brains of advanced synthetics across the galaxy."
price = 8000
price = 8450
items = list(
/obj/item/device/mmi/digital/posibrain
)
code/modules/cargo/items/science.dm
+134 -134
View File
@@ -3,7 +3,7 @@
name = "stok cube box"
supplier = "nanotrasen"
description = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
price = 60
price = 250
items = list(
/obj/item/storage/box/monkeycubes/stokcubes
)
@@ -17,7 +17,7 @@
name = "vkrexi cube box"
supplier = "nanotrasen"
description = "Drymate brand vkrexi cubes. Just add water!"
price = 60
price = 250
items = list(
/obj/item/storage/box/monkeycubes/vkrexicubes
)
@@ -31,7 +31,7 @@
name = "farwa cube box"
supplier = "nanotrasen"
description = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!"
price = 55
price = 250
items = list(
/obj/item/storage/box/monkeycubes/farwacubes
)
@@ -45,7 +45,7 @@
name = "monkey cube box"
supplier = "nanotrasen"
description = "Drymate brand monkey cubes. Just add water!"
price = 60
price = 250
items = list(
/obj/item/storage/box/monkeycubes
)
@@ -58,8 +58,8 @@
category = "science"
name = "neaera cube box"
supplier = "nanotrasen"
description = "Drymate brand neaera cubes, shipped from Qerrbalak. Just add water!"
price = 65
description = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes/neaeracubes
)
@@ -72,7 +72,7 @@
name = "hazmat hood"
supplier = "nanotrasen"
description = "This hood protects against biological hazards."
price = 105
price = 165
items = list(
/obj/item/clothing/head/hazmat/general
)
@@ -86,7 +86,7 @@
name = "hazmat suit"
supplier = "nanotrasen"
description = "This suit protects against biological hazards."
price = 105
price = 200
items = list(
/obj/item/clothing/suit/hazmat/general
)
@@ -95,6 +95,132 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/mindshieldfiringpin
category = "science"
name = "mindshield firing pin"
supplier = "nanotrasen"
description = "This implant - locked firing pin authorizes the weapon for only mindshield-implanted users."
price = 800
items = list(
/obj/item/device/firing_pin/implant/loyalty
)
access = ACCESS_HEADS
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/protohuman
category = "science"
name = "Proto-Human"
supplier = "zeng_hu"
description = "A human body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 7200
items = list(
/mob/living/carbon/human
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_skrell
category = "science"
name = "Proto-Skrell"
supplier = "zeng_hu"
description = "A Skrell body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 9100
items = list(
/mob/living/carbon/human/skrell
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_tajara
category = "science"
name = "Proto-Tajara"
supplier = "zeng_hu"
description = "A Tajara body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 7450
items = list(
/mob/living/carbon/human/tajaran
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_unathi
category = "science"
name = "Proto-Unathi"
supplier = "zeng_hu"
description = "An Unathi body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 7800
items = list(
/mob/living/carbon/human/unathi
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/blankvaurcadrone
category = "science"
name = "Surplus Vaurca Drone"
supplier = "zora"
description = "A surplus Vaurca drone body with functioning organs but a defective brain. Thousands of these are thrown at the wayside every day. The everyman's relatively-ethical solution to organ harvesting."
price = 500
items = list(
/mob/living/carbon/human/type_a/cargo
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proximitysensor
category = "science"
name = "proximity sensor"
supplier = "nanotrasen"
description = "Used for scanning and alerting when someone enters a certain proximity."
price = 35
items = list(
/obj/item/device/assembly/prox_sensor
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/testrange_firingpin
category = "science"
name = "test - range firing pin"
supplier = "nanotrasen"
description = "This safety firing pin allows weapons to be fired within proximity to a firing range."
price = 200
items = list(
/obj/item/device/firing_pin/test_range
)
access = ACCESS_RESEARCH
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/timer
category = "science"
name = "timer"
supplier = "nanotrasen"
description = "Used to time things. Works well with contraptions which has to count down. Tick tock."
price = 22
items = list(
/obj/item/device/assembly/timer
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/igniter
category = "science"
name = "igniter"
@@ -108,129 +234,3 @@
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/mindshieldfiringpin
category = "science"
name = "mindshield firing pin"
supplier = "nanotrasen"
description = "This implant - locked firing pin authorizes the weapon for only loyalty - implanted users."
price = 2000
items = list(
/obj/item/device/firing_pin/implant/loyalty
)
access = ACCESS_HEADS
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/protohuman
category = "science"
name = "Proto-Human"
supplier = "zeng_hu"
description = "A human body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 2300
items = list(
/mob/living/carbon/human
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_skrell
category = "science"
name = "Proto-Skrell"
supplier = "zeng_hu"
description = "A Skrell body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 4000
items = list(
/mob/living/carbon/human/skrell
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_tajara
category = "science"
name = "Proto-Tajara"
supplier = "zeng_hu"
description = "A Tajara body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 1800
items = list(
/mob/living/carbon/human/tajaran
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proto_unathi
category = "science"
name = "Proto-Unathi"
supplier = "zeng_hu"
description = "An Unathi body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting."
price = 2000
items = list(
/mob/living/carbon/human/unathi
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/blankvaurcadrone
category = "science"
name = "Blank Vaurca Drone"
supplier = "zora"
description = "A surplus Vaurca drone body. Thousands of these are thrown at the wayside every day. The everyman's relatively-ethical solution to organ harvesting."
price = 300
items = list(
/mob/living/carbon/human/type_a/cargo
)
access = ACCESS_RESEARCH
container_type = "bodybag"
groupable = FALSE
spawn_amount = 1
/singleton/cargo_item/proximitysensor
category = "science"
name = "proximity sensor"
supplier = "nanotrasen"
description = "Used for scanning and alerting when someone enters a certain proximity."
price = 75
items = list(
/obj/item/device/assembly/prox_sensor
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/testrange_firingpin
category = "science"
name = "test - range firing pin"
supplier = "nanotrasen"
description = "This safety firing pin allows weapons to be fired within proximity to a firing range."
price = 500
items = list(
/obj/item/device/firing_pin/test_range
)
access = ACCESS_RESEARCH
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/timer
category = "science"
name = "timer"
supplier = "nanotrasen"
description = "Used to time things. Works well with contraptions which has to count down. Tick tock."
price = 75
items = list(
/obj/item/device/assembly/timer
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1
code/modules/cargo/items/security.dm
+10 -10
View File
@@ -61,7 +61,7 @@
name = "maglight"
supplier = "nanotrasen"
description = "A heavy flashlight designed for security personnel."
price = 150
price = 75
items = list(
/obj/item/device/flashlight/maglight
)
@@ -75,7 +75,7 @@
name = "magnetic door lock - security"
supplier = "nanotrasen"
description = "A large, ID locked device used for completely locking down airlocks. It is painted with Security colors."
price = 135
price = 50
items = list(
/obj/item/device/magnetic_lock/security
)
@@ -89,7 +89,7 @@
name = "box of handcuffs"
supplier = "nanotrasen"
description = "A box full of handcuffs."
price = 345
price = 145
items = list(
/obj/item/storage/box/handcuffs
)
@@ -103,7 +103,7 @@
name = "box of zipties"
supplier = "nanotrasen"
description = "A box full of zipties."
price = 145
price = 88
items = list(
/obj/item/storage/box/zipties
)
@@ -117,7 +117,7 @@
name = "Shield Generator"
supplier = "nanotrasen"
description = "A shield generator."
price = 1500
price = 550
items = list(
/obj/machinery/shieldwallgen
)
@@ -131,7 +131,7 @@
name = "box of pepperspray grenades"
supplier = "zavodskoi"
description = "A box containing 7 tear gas grenades. A gas mask is printed on the label. WARNING: Exposure carries risk of serious injuries."
price = 750
price = 450
items = list(
/obj/item/storage/box/teargas
)
@@ -159,7 +159,7 @@
name = "box of EMP grenades"
supplier = "zavodskoi"
description = "A box containing 5 military grade EMP grenades. WARNING: Do not use near unshielded electronics or biomechanical augmentations."
price = 4395
price = 1450
items = list(
/obj/item/storage/box/emps
)
@@ -173,7 +173,7 @@
name = "deployable barrier"
supplier = "zavodskoi"
description = "A deployable barrier. Swipe your ID card to lock/unlock it."
price = 750
price = 440
items = list(
/obj/machinery/deployable/barrier
)
@@ -329,7 +329,7 @@
name = "security voidsuit"
supplier = "zavodskoi"
description = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
price = 1500
price = 900
items = list(
/obj/item/clothing/suit/space/void/security
)
@@ -343,7 +343,7 @@
name = "security voidsuit helmet"
supplier = "zavodskoi"
description = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
price = 900
price = 550
items = list(
/obj/item/clothing/head/helmet/space/void/security
)
code/modules/cargo/items/supply.dm
+18 -18
View File
@@ -3,7 +3,7 @@
name = "boxes (x5)"
supplier = "orion"
description = "Versatile cardboard boxes."
price = 45
price = 15
items = list(
/obj/item/storage/box
)
@@ -17,7 +17,7 @@
name = "bucket"
supplier = "blam"
description = "It's a bucket."
price = 10
price = 8
items = list(
/obj/item/reagent_containers/glass/bucket
)
@@ -45,7 +45,7 @@
name = "clipboard"
supplier = "orion"
description = "The timeless prop for looking like your working."
price = 23
price = 12
items = list(
/obj/item/clipboard
)
@@ -59,7 +59,7 @@
name = "blue folder"
supplier = "orion"
description = "A blue folder."
price = 8
price = 4.50
items = list(
/obj/item/folder/blue
)
@@ -73,7 +73,7 @@
name = "yellow folder"
supplier = "orion"
description = "A yellow folder."
price = 8
price = 4.50
items = list(
/obj/item/folder/yellow
)
@@ -87,7 +87,7 @@
name = "red folder"
supplier = "orion"
description = "A red folder."
price = 8
price = 4.50
items = list(
/obj/item/folder/red
)
@@ -101,7 +101,7 @@
name = "white folder"
supplier = "orion"
description = "A white folder."
price = 8
price = 4.50
items = list(
/obj/item/folder/white
)
@@ -115,7 +115,7 @@
name = "hand labeler"
supplier = "nanotrasen"
description = "Yes, it has your name on it!"
price = 8
price = 12.50
items = list(
/obj/item/device/hand_labeler
)
@@ -129,7 +129,7 @@
name = "inflatable duck"
supplier = "nanotrasen"
description = "No bother to sink or swim when you can just float!"
price = 200
price = 4.50
items = list(
/obj/item/inflatable_duck
)
@@ -142,7 +142,7 @@
category = "supply"
name = "paper bin"
supplier = "nanotrasen"
description = "A bin filled with paper - a paper bin!"
description = "Pre-stocked stationery bin filled with paper."
price = 12
items = list(
/obj/item/paper_bin
@@ -157,7 +157,7 @@
name = "pen"
supplier = "nanotrasen"
description = "A normal black ink ballpen."
price = 8
price = 2.50
items = list(
/obj/item/pen
)
@@ -171,7 +171,7 @@
name = "blue pen"
supplier = "nanotrasen"
description = "A normal blue ink ballpen."
price = 8
price = 2.50
items = list(
/obj/item/pen/blue
)
@@ -185,7 +185,7 @@
name = "red pen"
supplier = "nanotrasen"
description = "A normal red ink ballpen."
price = 8
price = 2.50
items = list(
/obj/item/pen/red
)
@@ -199,7 +199,7 @@
name = "multicolor pen"
supplier = "nanotrasen"
description = "A fancy pen that has several nibs in different colors that you can slide up and down."
price = 20
price = 4.35
items = list(
/obj/item/pen/multi
)
@@ -213,7 +213,7 @@
name = "fountain pen"
supplier = "nanotrasen"
description = "It's an expensive fountain pen."
price = 30
price = 50
items = list(
/obj/item/pen/fountain
)
@@ -241,7 +241,7 @@
name = "toner cartridge (x2)"
supplier = "nanotrasen"
description = "Toner is the back bone of any space based litigation."
price = 135
price = 125
items = list(
/obj/item/device/toner
)
@@ -255,7 +255,7 @@
name = "small potted plant"
supplier = "nanotrasen"
description = "A random small potted plant, for when you want to add some greenery to your desk."
price = 100
price = 35
items = list(
/obj/random/pottedplant_small
)
@@ -269,7 +269,7 @@
name = "large potted plant"
supplier = "nanotrasen"
description = "A random large potted plant, for when you want to add some greenery to your office space."
price = 300
price = 70
items = list(
/obj/random/pottedplant
)
code/modules/cargo/items/weaponry.dm
+60 -46
View File
@@ -18,7 +18,7 @@
name = "taser gun"
supplier = "nanotrasen"
description = "The NT Mk30 NL is a small, low capacity gun used for non-lethal takedowns."
price = 150
price = 310
items = list(
/obj/item/gun/energy/taser
)
@@ -32,7 +32,7 @@
name = ".45 pistol"
supplier = "nanotrasen"
description = "The NanoTrasen Mk58 .45-caliber pistol. Inexpensive, reliable, and ubiquitous among security forces galaxy-wide."
price = 1100
price = 800
items = list(
/obj/item/gun/projectile/sec
)
@@ -46,7 +46,7 @@
name = "machine pistol"
supplier = "zavodskoi"
description = "The ZI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use."
price = 1600
price = 1200
items = list(
/obj/item/gun/projectile/automatic/wt550
)
@@ -60,7 +60,7 @@
name = "ballistic carbine"
supplier = "virgo"
description = "A durable, rugged looking semi-automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds."
price = 2400
price = 1500
items = list(
/obj/item/gun/projectile/automatic/rifle/carbine
)
@@ -74,7 +74,7 @@
name = "Z8 bullpup assault carbine"
supplier = "zavodskoi"
description = "The ZI Bulldog 5.56mm bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle."
price = 2650
price = 1750
items = list(
/obj/item/gun/projectile/automatic/rifle/z8
)
@@ -88,7 +88,7 @@
name = "combat shotgun"
supplier = "hephaestus"
description = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders."
price = 2250
price = 1300
items = list(
/obj/item/gun/projectile/shotgun/pump/combat
)
@@ -102,7 +102,7 @@
name = "energy carbine"
supplier = "nanotrasen"
description = "An energy-based carbine with two settings: Stun and kill."
price = 1800
price = 1200
items = list(
/obj/item/gun/energy/gun
)
@@ -116,7 +116,7 @@
name = "energy pistol"
supplier = "nanotrasen"
description = "A basic energy-based pistol gun with two settings: Stun and kill."
price = 1200
price = 750
items = list(
/obj/item/gun/energy/pistol
)
@@ -130,7 +130,7 @@
name = "ion rifle"
supplier = "nanotrasen"
description = "The NT Mk60 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats."
price = 2500
price = 1200
items = list(
/obj/item/gun/energy/rifle/ionrifle
)
@@ -143,7 +143,7 @@
name = "marksman energy rifle"
supplier = "hephaestus"
description = "The HI L.W.A.P. is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful ionized bolts."
price = 3100
price = 2100
items = list(
/obj/item/gun/energy/sniperrifle
)
@@ -157,7 +157,7 @@
name = "laser rifle"
supplier = "nanotrasen"
description = "A common laser weapon, designed to kill with concentrated energy blasts."
price = 2200
price = 1400
items = list(
/obj/item/gun/energy/rifle/laser
)
@@ -171,7 +171,7 @@
name = "point entry anti-materiel cannon"
supplier = "nanotrasen"
description = "An SCC-designed, man-portable cannon meant to neutralize mechanized threats. Spectacularly effective, though equally spectacularly unwieldy."
price = 3200
price = 2200
items = list(
/obj/item/gun/projectile/peac
)
@@ -185,7 +185,7 @@
name = "adhomian recoilless rifle"
supplier = "zharkov"
description = "Shoulder-fired man-portable anti-tank recoilless rifle with a single shot. Relatively inexpensive and does its job."
price = 1300
price = 1200
items = list(
/obj/item/gun/projectile/recoilless_rifle
)
@@ -199,7 +199,7 @@
name = "bolt action rifle"
supplier = "zharkov"
description = "An Adhomian bolt-action rifle."
price = 850
price = 750
items = list(
/obj/item/gun/projectile/shotgun/pump/rifle
)
@@ -227,7 +227,7 @@
name = "silenced pistol"
supplier = "zharkov"
description = "Internally silenced for stealthy operations."
price = 1950
price = 1350
items = list(
/obj/item/gun/projectile/silenced
)
@@ -257,7 +257,7 @@
name = "shotgun ammunition box (haywire shells)"
supplier = "zavodskoi"
description = "A box of EMP-inducing 'haywire' shotgun shells."
price = 120
price = 90
items = list(
/obj/item/storage/box/haywireshells
)
@@ -285,7 +285,7 @@
name = "shotgun ammunition box (buckshot)"
supplier = "zavodskoi"
description = "A box of shotgun buckshot shells."
price = 85
price = 70
items = list(
/obj/item/storage/box/shotgunshells
)
@@ -299,7 +299,7 @@
name = "shotgun ammunition box (slug)"
supplier = "zavodskoi"
description = "A box of shotgun slugs."
price = 100
price = 80
items = list(
/obj/item/storage/box/shotgunammo
)
@@ -336,28 +336,28 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/apcarbinemagazine_556
/singleton/cargo_item/carbinemagazine_556
category = "weaponry"
name = "C-type armor-piercing carbine magazine (5.56mm)"
name = "C-type carbine magazine (5.56mm)"
supplier = "zavodskoi"
description = "Civilian-issue 5.56mm magazine with reduced capacity. Fits most private-issue 5.56mm weapons."
price = 60
price = 45
items = list(
/obj/item/ammo_magazine/a556/carbine/ap
/obj/item/ammo_magazine/a556/carbine
)
access = ACCESS_SECURITY
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/carbinemagazine_556
/singleton/cargo_item/apcarbinemagazine_556
category = "weaponry"
name = "C-type carbine magazine (5.56mm)"
name = "C-type armor-piercing carbine magazine (5.56mm)"
supplier = "zavodskoi"
description = "Civilian-issue 5.56mm magazine with reduced capacity. Fits most private-issue 5.56mm weapons."
price = 55
items = list(
/obj/item/ammo_magazine/a556/carbine
/obj/item/ammo_magazine/a556/carbine/ap
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -369,7 +369,7 @@
name = "M-type rifle magazine (5.56mm)"
supplier = "zavodskoi"
description = "A 5.56 ammo magazine for military assault rifles. Incompatible with weapons that take C-type magazines."
price = 65
price = 60
items = list(
/obj/item/ammo_magazine/a556
)
@@ -378,12 +378,26 @@
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/magazine_556/ap
category = "weaponry"
name = "M-type armor-piercing rifle magazine (5.56mm)"
supplier = "zavodskoi"
description = "A 5.56 AP ammo magazine for military assault rifles. Incompatible with weapons that take C-type magazines."
price = 70
items = list(
/obj/item/ammo_magazine/a556/ap
)
access = ACCESS_SECURITY
container_type = "crate"
groupable = TRUE
spawn_amount = 1
/singleton/cargo_item/magazine_762
category = "weaponry"
name = "rifle magazine (7.62mm)"
supplier = "zharkov"
description = "A 7.62mm rifle magazine."
price = 70
price = 65
items = list(
/obj/item/ammo_magazine/d762
)
@@ -397,7 +411,7 @@
name = "pistol magazine (9mm)"
supplier = "zharkov"
description = "A 9mm pistol magazine."
price = 40
price = 25
items = list(
/obj/item/ammo_magazine/mc9mm
)
@@ -411,7 +425,7 @@
name = "pistol magazine (.45)"
supplier = "nanotrasen"
description = "A .45-caliber pistol magazine."
price = 50
price = 30
items = list(
/obj/item/ammo_magazine/c45m
)
@@ -425,7 +439,7 @@
name = "pistol magazine (.45 flash)"
supplier = "nanotrasen"
description = "A .45-caliber less-lethal flash magazine."
price = 40
price = 35
items = list(
/obj/item/ammo_magazine/c45m/flash
)
@@ -439,7 +453,7 @@
name = "top mounted magazine (9mm)"
supplier = "zavodskoi"
description = "A top-mounted 9mm magazine designed for the ZI 550 machine pistol. Contains lethal rounds."
price = 60
price = 40
items = list(
/obj/item/ammo_magazine/mc9mmt
)
@@ -453,7 +467,7 @@
name = "top mounted magazine (9mm rubber)"
supplier = "zavodskoi"
description = "A top-mounted 9mm magazine designed for the ZI 550 machine pistol. Contains less-lethal rubber rounds."
price = 50
price = 35
items = list(
/obj/item/ammo_magazine/mc9mmt/rubber
)
@@ -466,8 +480,8 @@
category = "security"
name = "tranquilizer darts (.50 cal PPS)"
supplier = "nanotrasen"
description = "A magazine for some kind of gun."
price = 60
description = "A box of 50-caliber tranquilizer darts."
price = 50
items = list(
/obj/item/storage/box/tranquilizer
)
@@ -478,7 +492,7 @@
/singleton/cargo_item/compacttungstenslug
category = "weaponry"
name = "compact tungsten slug"
name = "compact tungsten gauss slugs"
supplier = "virgo"
description = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
price = 125
@@ -495,7 +509,7 @@
name = "francisca rotary cannon AP ammunition box"
supplier = "zavodskoi"
description = "A box of 40mm AP ammo for the francisca rotary cannon."
price = 1200
price = 850
items = list(
/obj/item/ship_ammunition/grauwolf_bundle/ap
)
@@ -509,7 +523,7 @@
name = "francisca rotary cannon FMJ ammunition box"
supplier = "zavodskoi"
description = "A box of 40mm FMJ ammo for a Francisca-type rotary cannon."
price = 1100
price = 800
items = list(
/obj/item/ship_ammunition/grauwolf_bundle
)
@@ -523,7 +537,7 @@
name = "grauwolf AP flak shells"
supplier = "zavodskoi"
description = "Armor-Piercing shells for a Grauwolf-type flak battery."
price = 2500
price = 1800
items = list(
/obj/item/ship_ammunition/grauwolf_bundle/ap
)
@@ -537,7 +551,7 @@
name = "grauwolf HE flak shells"
supplier = "zavodskoi"
description = "High-explosive shells for a Grauwolf-type flak battery."
price = 2200
price = 1600
items = list(
/obj/item/ship_ammunition/grauwolf_bundle
)
@@ -551,7 +565,7 @@
name = "longbow casing"
supplier = "zavodskoi"
description = "A casing for a 406mm warhead, designed for a Longbow-type cannon."
price = 2000
price = 1000
items = list(
/obj/item/ship_ammunition/longbow
)
@@ -565,7 +579,7 @@
name = "longbow AP warhead"
supplier = "zavodskoi"
description = "An armor-piercing 406mm warhead, designed for a Longbow-type cannon."
price = 3500
price = 1800
items = list(
/obj/item/warhead/longbow/ap
)
@@ -579,7 +593,7 @@
name = "longbow EP warhead"
supplier = "zavodskoi"
description = "A bunker-buster 406mm warhead, designed for a Longbow-type cannon."
price = 3500
price = 2200
items = list(
/obj/item/warhead/longbow/bunker
)
@@ -593,7 +607,7 @@
name = "longbow HE warhead"
supplier = "zavodskoi"
description = "A high-explosive 406mm warhead, designed for a Longbow-type cannon."
price = 3200
price = 1650
items = list(
/obj/item/warhead/longbow
)
@@ -607,7 +621,7 @@
name = "high-power longbow primer"
supplier = "zavodskoi"
description = "A high-power primer for a 406mm warhead, designed for a Longbow-type cannon."
price = 2000
price = 800
items = list(
/obj/item/primer/high
)
@@ -621,7 +635,7 @@
name = "longbow warhead primer"
supplier = "zavodskoi"
description = "A standard primer for a 406mm warhead, designed for a Longbow-type cannon."
price = 1200
price = 500
items = list(
/obj/item/primer
)
@@ -635,7 +649,7 @@
name = "low-power longbow primer"
supplier = "zavodskoi"
description = "A low-power primer for a 406mm warhead, designed for a Longbow-type cannon."
price = 700
price = 350
items = list(
/obj/item/primer/low
)
code/modules/economy/cash.dm
+162 -36
View File
@@ -41,6 +41,16 @@
to_chat(user, SPAN_NOTICE("You add [src.worth] credits worth of money to the bundles.<br>It holds [bundle.worth] credits now."))
qdel(src)
/proc/coin_typepath_suffix(var/amount)
// accepts 0.01, 0.05, 0.10, 0.25; returns "c001", "c005", etc.
var/cents = round(amount * 100)
if(cents < 10)
return "c00[cents]"
else if(cents < 100)
return "c0[cents]"
else
return "c[cents]"
/obj/item/spacecash/bundle
name = "credit chips"
icon_state = ""
@@ -51,32 +61,46 @@
/obj/item/spacecash/bundle/update_icon()
ClearOverlays()
var/list/ovr = list()
var/sum = src.worth
var/num = 0
for(var/i in list(1000,500,200,100,50,20,10,1))
while(sum >= i && num < 50)
sum -= i
var/cents = round(src.worth * 100) // INTEGER CENTS for splitting
// list is in cents, so 1000 = $10, 100 = $1, 25 = $0.25, 1 = $0.01
if(src.worth < 1)
src.name = "credit coins"
src.drop_sound = 'sound/items/drop/ring.ogg'
src.pickup_sound = 'sound/items/pickup/ring.ogg'
else
src.name = "credit chips"
// build The Pile(TM)
for(var/denom in list(100000,50000,20000,10000,5000,2000,1000,500,100,25,10,5,1))
while(cents >= denom && num < 50)
cents -= denom
num++
var/image/banknote = image('icons/obj/cash.dmi', "spacecash[i]")
var/image/banknote
var/denom_value = denom / 100.0
if(denom >= 100)
// bills (>= $1.00)
banknote = image('icons/obj/cash.dmi', "spacecash[round(denom_value)]")
else
// coins (< $1.00)
// pad denom_value for icon_state, e.g. "spacecash0.05"
var/coinstr = "[denom_value]"
if(findtext(coinstr, ".") && length(copytext(coinstr, findtext(coinstr, ".")+1)) == 1)
coinstr += "0"
banknote = image('icons/obj/cash.dmi', "spacecash[coinstr]")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
banknote.transform = M
ovr += banknote
if(num == 0) // Less than one credit, let's just make it look like 1 for ease
var/image/banknote = image('icons/obj/cash.dmi', "spacecash1")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
banknote.transform = M
ovr += banknote
AddOverlays(ovr)
UpdateOverlays() // The delay looks weird, so we force an update immediately.
src.desc = "A bundle of Biesel Standard Credit chips. Combined, this is worth [worth] credits."
src.desc = "A bundle of Biesel Standard Credits. Combined, this is worth [worth] credits."
/obj/item/spacecash/bundle/attack_self(mob/user as mob)
var/amount = tgui_input_number(user, "How many credits do you want to take? (0 to [src.worth])", "Take Money", 20, worth, 0)
var/amount = tgui_input_number(user, "How many credits do you want to take out? (0 to [src.worth])", "Take Money", 5, worth, 0, 0, round_value = FALSE)
if(QDELETED(src))
return 0
@@ -84,25 +108,58 @@
if(use_check_and_message(user,USE_FORCE_SRC_IN_USER))
return 0
amount = round(clamp(amount, 0, src.worth))
if(amount==0) return 0
if(amount == 0) return 0
var/cents_out = round(amount * 100)
var/bundle_cents = round(src.worth * 100)
if(cents_out > bundle_cents)
cents_out = bundle_cents
src.worth = (bundle_cents - cents_out) / 100.0
// get rid of floating points
if(abs(src.worth) < 0.0001)
src.worth = 0
src.worth -= amount
src.update_icon()
if(!worth)
if(!src.worth)
user.drop_from_inventory(src)
if(amount in list(1000,500,200,100,50,20,1))
var/cashtype = text2path("/obj/item/spacecash/c[amount]")
var/obj/cash = new cashtype (user.loc)
user.put_in_hands(cash)
// bill denominations (whole creds)
if(cents_out >= 100 && cents_out % 100 == 0)
var/dollars = cents_out / 100
var/cashtype = text2path("/obj/item/spacecash/c[dollars]")
if(isnull(cashtype))
// fallback: spawn a bundle if something's wrong
var/obj/item/spacecash/bundle/bundle = new(user.loc)
bundle.worth = cents_out / 100.0
bundle.update_icon()
user.put_in_hands(bundle)
else
var/obj/cash = new cashtype(user.loc)
user.put_in_hands(cash)
// coin denominations
else if(cents_out in list(25, 10, 5, 1))
var/cashtype = text2path("/obj/item/spacecash/coin/[coin_typepath_suffix(cents_out / 100.0)]")
if(isnull(cashtype))
var/obj/item/spacecash/bundle/bundle = new(user.loc)
bundle.worth = cents_out / 100.0
bundle.update_icon()
user.put_in_hands(bundle)
else
var/obj/cash = new cashtype(user.loc)
user.put_in_hands(cash)
// fallback for weird edge cases
else
var/obj/item/spacecash/bundle/bundle = new (user.loc)
bundle.worth = amount
var/obj/item/spacecash/bundle/bundle = new(user.loc)
bundle.worth = cents_out / 100.0
bundle.update_icon()
user.put_in_hands(bundle)
if(!worth)
if(!src.worth)
qdel(src)
/obj/item/spacecash/c1
@@ -111,6 +168,12 @@
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1 credit."
worth = 1
/obj/item/spacecash/c5
name = "5 credit chip"
icon_state = "spacecash5"
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 5 credits."
worth = 5
/obj/item/spacecash/c10
name = "10 credit chip"
icon_state = "spacecash10"
@@ -153,18 +216,81 @@
desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1000 credits."
worth = 1000
/obj/item/spacecash/coin
drop_sound = 'sound/items/drop/ring.ogg'
pickup_sound = 'sound/items/pickup/ring.ogg'
worth = 0
var/sides = 2
var/last_flip = 0 //spam limiter
/obj/item/spacecash/coin/attack_self(mob/user)
if(last_flip <= world.time - 20)
last_flip = world.time
var/result = rand(1, sides)
var/comment = ""
if(result == 1)
comment = "tails"
else if(result == 2)
comment = "heads"
playsound(get_turf(src), 'sound/items/coinflip.ogg', 100, 1, -4)
user.visible_message(SPAN_NOTICE("\The [user] throws \the [src]. It lands on [comment]!"), SPAN_NOTICE("You throw \the [src]. It lands on [comment]!"))
/obj/item/spacecash/coin/c001
name = "1 cent unie coin"
icon_state = "spacecash0.01"
desc = "A Biesel Standard Credit coin, called a 'unie'. This is worth 0.01 credits."
worth = 0.01
/obj/item/spacecash/coin/c005
name = "5 cent quin coin"
icon_state = "spacecash0.05"
desc = "A Biesel Standard Credit coin, called a 'quin'. This is worth 0.05 credits."
worth = 0.05
/obj/item/spacecash/coin/c010
name = "10 cent dece coin"
icon_state = "spacecash0.10"
desc = "A Biesel Standard Credit coin, called a 'dece'. This is worth 0.10 credits."
worth = 0.10
/obj/item/spacecash/coin/c025
name = "25 cent quarter coin"
icon_state = "spacecash0.25"
desc = "A Biesel Standard Credit coin, called a 'quarter'. This is worth 0.25 credits."
worth = 0.25
/proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
if(sum in list(1000,500,200,100,50,20,10,1))
var/cash_type = text2path("/obj/item/spacecash/c[sum]")
var/obj/cash = new cash_type (spawnloc)
if(ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(cash)
else
var/obj/item/spacecash/bundle/bundle = new (spawnloc)
bundle.worth = sum
bundle.update_icon()
if (ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(bundle)
var/cents = round(sum * 100)
// list all bill and coin denominations (in cents)
var/list/denoms = list(
100000,50000,20000,10000,5000,2000,1000,500,100, // Bills: $1000 ... $1
25,10,5,1 // Coins: $0.25, $0.10, $0.05, $0.01
)
// check for a single denomination match first (bill or coin)
if(cents in denoms)
var objpath
if(cents >= 100)
var/dollars = cents / 100
objpath = text2path("/obj/item/spacecash/c[dollars]")
else
var/coin_value = "[cents / 100.0]"
// pad to two decimals for path if needed
if(findtext(coin_value, ".") && length(copytext(coin_value, ".")+1) == 1)
coin_value += "0"
objpath = text2path("/obj/item/spacecash/coin/[coin_typepath_suffix(cents / 100.0)]")
if(!isnull(objpath))
var/obj/cash = new objpath(spawnloc)
if(ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(cash)
return
// spawn a bundle for mixed/odd amounts
var/obj/item/spacecash/bundle/bundle = new(spawnloc)
bundle.worth = cents / 100.0
bundle.update_icon()
if(ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(bundle)
return
/obj/item/spacecash/ewallet
code/modules/item_worth/worths_list.dm
+714 -714
View File
File diff suppressed because it is too large Load Diff
code/modules/law/laws/low_severity.dm
+34 -34
View File
@@ -9,8 +9,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 200
max_fine = 300
min_fine = 50
max_fine = 100
/datum/law/low_severity/petty_theft
name = "i102 - Petty Theft"
@@ -20,8 +20,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 150
max_fine = 225
min_fine = 75
max_fine = 150
/datum/law/low_severity/minor_assault
name = "i103 - Minor Assault"
@@ -31,8 +31,8 @@
min_brig_time = 4
max_brig_time = 10
min_fine = 400
max_fine = 800
min_fine = 100
max_fine = 300
/datum/law/low_severity/battery
name = "i104 - Battery"
@@ -42,8 +42,8 @@
min_brig_time = 2
max_brig_time = 8
min_fine = 200
max_fine = 400
min_fine = 75
max_fine = 175
/datum/law/low_severity/hooliganism
name = "i105 - Indecent Exposure or Hooliganism"
@@ -53,8 +53,8 @@
min_brig_time = 5
max_brig_time = 8
min_fine = 250
max_fine = 375
min_fine = 50
max_fine = 125
/datum/law/low_severity/radio_misuse
name = "i107 - Misuse of Public Radio Channels"
@@ -64,8 +64,8 @@
min_brig_time = 3
max_brig_time = 3
min_fine = 150
max_fine = 225
min_fine = 35
max_fine = 75
/datum/law/low_severity/violating_injunction
name = "i108 - Violation of Injunction"
@@ -75,8 +75,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 500
max_fine = 750
min_fine = 150
max_fine = 250
/datum/law/low_severity/slander_hos
name = "i109 - Slandering a Head of Staff"
@@ -86,8 +86,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 250
max_fine = 375
min_fine = 100
max_fine = 175
/datum/law/low_severity/slander
name = "i110 - Slander or Verbal Abuse"
@@ -97,8 +97,8 @@
min_brig_time = 3
max_brig_time = 5
min_fine = 150
max_fine = 250
min_fine = 50
max_fine = 100
/datum/law/low_severity/failure_execute
name = "i111 - Failure to Execute an Order"
@@ -108,8 +108,8 @@
min_brig_time = 5
max_brig_time = 15
min_fine = 500
max_fine = 750
min_fine = 150
max_fine = 300
/datum/law/low_severity/animal_cruelty
name = "i113 - Animal Cruelty"
@@ -119,8 +119,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 0
max_fine = 0
min_fine = 150
max_fine = 350
/datum/law/low_severity/vandalism
name = "i114 - Vandalism"
@@ -130,8 +130,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 450
max_fine = 675
min_fine = 175
max_fine = 300
/datum/law/low_severity/threat_murder
name = "i115 - Threat of Murder or Serious Injury"
@@ -141,8 +141,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 500
max_fine = 750
min_fine = 250
max_fine = 500
/datum/law/low_severity/necrophilia
name = "i116 - Disrespect to the Dead"
@@ -152,8 +152,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 400
max_fine = 600
min_fine = 150
max_fine = 250
/datum/law/low_severity/excessive_detainment
name = "i117 - Excessive Use of Force in Detainment"
@@ -163,8 +163,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 350
max_fine = 700
min_fine = 150
max_fine = 300
/datum/law/low_severity/violation_privacy
name = "i118 - Violation of Privacy Laws"
@@ -174,8 +174,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 500
max_fine = 750
min_fine = 250
max_fine = 500
/datum/law/low_severity/illegal_search
name = "i119 - Illegal Search"
@@ -185,5 +185,5 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 500
max_fine = 750
min_fine = 200
max_fine = 400
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+1 -1
View File
@@ -16,7 +16,7 @@ They are very slow, reasonably strong, and quite durable. They also require ligh
age_max = 1000
default_genders = list(PLURAL)
selectable_pronouns = list(NEUTER, PLURAL)
economic_modifier = 3
economic_modifier = 7
icobase = 'icons/mob/human_races/diona/r_diona.dmi'
deform = 'icons/mob/human_races/diona/r_def_plant.dmi'
preview_icon = 'icons/mob/human_races/diona/diona_preview.dmi'
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -9,7 +9,7 @@
height_max = 250
age_min = 1
age_max = 60
economic_modifier = 3
economic_modifier = 6
default_genders = list(NEUTER)
selectable_pronouns = list(NEUTER, PLURAL)
code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm
+1 -1
View File
@@ -43,7 +43,7 @@
name_language = LANGUAGE_SIIK_MAAS
ethanol_resistance = 0.9//Gets drunk a little faster
rarity_value = 2
economic_modifier = 7
economic_modifier = 9
stamina = 90 // Tajara evolved to maintain a steady pace in the snow, sprinting wastes energy
stamina_recovery = 4
code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm
+1 -1
View File
@@ -36,7 +36,7 @@
ethanol_resistance = 0.8
taste_sensitivity = TASTE_SENSITIVE
economic_modifier = 7
economic_modifier = 9
num_alternate_languages = 2
secondary_langs = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA)
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm
+1 -1
View File
@@ -11,7 +11,7 @@
age_max = 20
default_genders = list(NEUTER)
selectable_pronouns = null
economic_modifier = 2
economic_modifier = 7
language = LANGUAGE_VAURCA
primitive_form = SPECIES_MONKEY_VAURCA
greater_form = SPECIES_VAURCA_WARRIOR
code/modules/modular_computers/laptop_vendor.dm
+15 -15
View File
@@ -60,7 +60,7 @@
if(2)
if(fabricate)
fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit(fabricated_laptop)
total_price += 299
total_price += 199
switch(dev_battery)
if(1) //Micro(500C)
if(fabricate)
@@ -68,7 +68,7 @@
if(2) // Basic(750C)
if(fabricate)
fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_laptop)
total_price += 199
total_price += 99
// if(3) // Upgraded(1100C)
// if(fabricate)
// fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/advanced(fabricated_laptop)
@@ -80,7 +80,7 @@
if(2) // Basic(128GQ)
if(fabricate)
fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_laptop)
total_price += 199
total_price += 99
// if(3) // Upgraded(256GQ)
// if(fabricate)
// fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(fabricated_laptop)
@@ -89,7 +89,7 @@
if(1) // Basic(Short-Range)
if(fabricate)
fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card(fabricated_laptop)
total_price += 199
total_price += 99
// if(2) // Advanced (Long Range)
// if(fabricate)
// fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_laptop)
@@ -103,7 +103,7 @@
// if(fabricate)
// fabricated_laptop.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_laptop)
if(dev_card)
total_price += 199
total_price += 99
if(fabricate)
fabricated_laptop.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_laptop)
//if(dev_aislot)
@@ -124,11 +124,11 @@
if(2) // Upgraded(500C)
if(fabricate)
fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/micro(fabricated_tablet)
total_price += 199
total_price += 99
if(3) // Advanced(750C)
if(fabricate)
fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_tablet)
total_price += 499
total_price += 149
switch(dev_disk)
if(1) // Basic(32GQ)
if(fabricate)
@@ -136,34 +136,34 @@
if(2) // Upgraded(64GQ)
if(fabricate)
fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/small(fabricated_tablet)
total_price += 99
total_price += 49
if(3) // Advanced(128GQ)
if(fabricate)
fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_tablet)
total_price += 299
total_price += 129
switch(dev_netcard)
if(1) // Basic(Short-Range)
if(fabricate)
fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card(fabricated_tablet)
total_price += 99
total_price += 49
if(2) // Advanced (Long Range)
if(fabricate)
fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_tablet)
total_price += 299
total_price += 129
if(dev_nanoprint)
total_price += 99
total_price += 49
if(fabricate)
fabricated_tablet.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_tablet)
if(dev_card)
total_price += 199
total_price += 99
if(fabricate)
fabricated_tablet.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_tablet)
if(dev_tesla)
total_price += 399
total_price += 229
if(fabricate)
fabricated_tablet.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_tablet)
if(dev_aislot)
total_price += 499
total_price += 199
if(fabricate)
fabricated_tablet.ai_slot = new/obj/item/computer_hardware/ai_slot(fabricated_tablet)
return total_price