juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #435 from crystallpunk-14/ed-08-09-2024-upstream

Browse Source 
Ed 08 09 2024 upstream
This commit is contained in:
Ed
2024-09-17 11:51:51 +03:00
committed by GitHub
parent 4565f3c574 233b493865
commit bc930da84f
724 changed files with 68393 additions and 36296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Audio/Machines/attributions.yml
View File

@@ -143,6 +143,11 @@
copyright: "/tg/station"
source: "https://github.com/tgstation/tgstation/blob/3eeba3899f22638595333c63b7b7433001f91bb2/sound/machines/eject.ogg"
- files: ["sonar-ping.ogg"]
license: "CC-BY-SA-3.0"
copyright: "/tg/station"
source: "https://github.com/tgstation/tgstation/blob/002051a3d5e4a35af504e52c0990bf4e22a908dc/sound/machines/sonar-ping.ogg"
- files: ["scanning.ogg"]
license: "CC0-1.0"
copyright: "Samuel Gremaud on freesound.org"

BIN
Resources/Audio/Machines/sonar-ping.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/Voice/Talk/vox.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Voice/Talk/vox_ask.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Voice/Talk/vox_exclaim.ogg
View File

Binary file not shown.

BIN
Resources/Audio/Voice/Vox/vox_laugh.ogg
View File

Binary file not shown.

28
Resources/Changelog/Admin.yml
View File

@@ -499,5 +499,33 @@ Entries:
id: 62
time: '2024-08-25T01:55:31.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31397
- author: nikthechampiongr
changes:
- message: Suicide logs display username info again.
type: Fix
id: 63
time: '2024-08-31T08:26:52.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31661
- author: nikthechampiongr
changes:
- message: Respawn verb is now available on players even after they have disconnected.
type: Fix
- message: Erase command is now available on players even after they have disconnected.
type: Fix
- message: You can now erase people with the erase command
type: Add
- message: Respawn command now also accepts user ids
type: Tweak
id: 64
time: '2024-08-31T11:38:04.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30433
- author: nikthechampiongr
changes:
- message: The addobjective command will now offer completions for username and
objectives.
type: Tweak
id: 65
time: '2024-09-08T07:28:43.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30456
Name: Admin
Order: 1

1108
Resources/Changelog/Changelog.yml
View File

File diff suppressed because it is too large Load Diff

2
Resources/Credits/GitHub.txt
View File

File diff suppressed because one or more lines are too long

2
Resources/Locale/en-US/accessories/human-hair.ftl
View File

@@ -45,6 +45,8 @@ marking-HumanHairClassicBusiness = Classic Business Hair
marking-HumanHairClassicCia = Classic CIA
marking-HumanHairClassicCornrows2 = Classic Cornrows 2
marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
marking-HumanHairClassicLong2 = Classic Long Hair 2
marking-HumanHairClassicLong3 = Classic Long Hair 3
marking-HumanHairClassicModern = Classic Modern
marking-HumanHairClassicMulder = Classic Mulder
marking-HumanHairClassicWisp = Classic Wisp

1
Resources/Locale/en-US/administration/commands/add-uplink-command.ftl
View File

@@ -3,5 +3,6 @@ add-uplink-command-help = Usage: adduplink [username] [item-id]
add-uplink-command-completion-1 = Username (defaults to self)
add-uplink-command-completion-2 = Uplink uid (default to PDA)
add-uplink-command-completion-3 = Is uplink discount enabled
add-uplink-command-error-1 = Selected player doesn't control any entity
add-uplink-command-error-2 = Failed to add uplink to the player

6
Resources/Locale/en-US/administration/commands/custom-vote-command.ftl
View File

@@ -1 +1,5 @@
custom-vote-webhook-name = Custom Vote Held
custom-vote-webhook-name = Custom Vote Held
custom-vote-webhook-footer = server: { $serverName }, round: { $roundId } { $runLevel }
custom-vote-webhook-cancelled = **Vote cancelled**
custom-vote-webhook-option-pending = TBD
custom-vote-webhook-option-cancelled = N/A

7
Resources/Locale/en-US/administration/commands/erase.ftl Normal file
View File

@@ -0,0 +1,7 @@
# erase
cmd-erase-desc = Erase a player's entity if it exists and all their chat messages
cmd-erase-help = erase <Username of User Id>
cmd-erase-invalid-args = Invalid number of arguments
cmd-erase-player-not-found = Player not found
cmd-erase-player-completion = <Username>

9
Resources/Locale/en-US/administration/commands/respawn.ftl Normal file
View File

@@ -0,0 +1,9 @@
cmd-respawn-desc = Respawns a player, kicking them back to the lobby.
cmd-respawn-help = respawn [player or UserId]
cmd-respawn-invalid-args = Must provide <= 1 argument.
cmd-respawn-no-player = If not a player, an argument must be given.
cmd-respawn-unknown-player = Unknown player
cmd-respawn-player-not-online = Player is not currently online, but they will respawn if they come back online
cmd-respawn-player-completion = <Username>

35
Resources/Locale/en-US/atmos/atmos-alerts-console.ftl Normal file
View File

@@ -0,0 +1,35 @@
atmos-alerts-window-title = Atmospheric Alerts Computer
atmos-alerts-window-station-name = [color=white][font size=14]{$stationName}[/font][/color]
atmos-alerts-window-unknown-location = Unknown location
atmos-alerts-window-tab-no-alerts = Alerts
atmos-alerts-window-tab-alerts = Alerts ({$value})
atmos-alerts-window-tab-air-alarms = Air alarms
atmos-alerts-window-tab-fire-alarms = Fire alarms
atmos-alerts-window-alarm-label = {CAPITALIZE($name)} ({$address})
atmos-alerts-window-temperature-label = Temperature
atmos-alerts-window-temperature-value = {$valueInC} °C ({$valueInK} K)
atmos-alerts-window-pressure-label = Pressure
atmos-alerts-window-pressure-value = {$value} kPa
atmos-alerts-window-oxygenation-label = Oxygenation
atmos-alerts-window-oxygenation-value = {$value}%
atmos-alerts-window-other-gases-label = Other present gases
atmos-alerts-window-other-gases-value = {$shorthand} ({$value}%)
atmos-alerts-window-other-gases-value-nil = None
atmos-alerts-window-silence-alerts = Silence alerts from this alarm
atmos-alerts-window-label-alert-types = Alert levels:
atmos-alerts-window-normal-state = Normal
atmos-alerts-window-warning-state = Warning
atmos-alerts-window-danger-state = Danger!
atmos-alerts-window-invalid-state = Inactive
atmos-alerts-window-no-active-alerts = [font size=16][color=white]No active alerts -[/color] [color={$color}]situation normal[/color][/font]
atmos-alerts-window-no-data-available = No data available
atmos-alerts-window-alerts-being-silenced = Silencing alerts...
atmos-alerts-window-toggle-overlays = Toggle alarm display
atmos-alerts-window-flavor-left = Contact an atmospheric technician for assistance
atmos-alerts-window-flavor-right = v1.8

2
Resources/Locale/en-US/components/station-anchor-component.ftl Normal file
View File

@@ -0,0 +1,2 @@
station-anchor-unanchoring-failed = Can't unanchor an active station anchor
station-anchor-window-title = Station Anchor

3
Resources/Locale/en-US/flavors/flavor-profiles.ftl
View File

@@ -50,6 +50,7 @@ flavor-base-horrible = horrible
# lmao
flavor-base-terrible = terrible
flavor-base-mindful = mindful
flavor-base-chewy = chewy
# Complex flavors. Put a flavor here when you want something that's more
# specific.
@@ -173,6 +174,8 @@ flavor-complex-violets = like violets
flavor-complex-pyrotton = like a burning mouth
flavor-complex-mothballs = like mothballs
flavor-complex-paint-thinner = like paint thinner
flavor-complex-paper = like mushy pulp
flavor-complex-compressed-meat = like compressed meat
# Drink-specific flavors.

6
Resources/Locale/en-US/game-ticking/game-ticker.ftl
View File

@@ -41,4 +41,8 @@ latejoin-arrivals-dumped-from-shuttle = A mysterious force prevents you from lea
latejoin-arrivals-teleport-to-spawn = A mysterious force teleports you off the arrivals shuttle. Have a safe shift!
preset-not-enough-ready-players = Can't start {$presetName}. Requires {$minimumPlayers} players but we have {$readyPlayersCount}.
preset-no-one-ready = Can't start {$presetName}. No players are ready.
preset-no-one-ready = Can't start {$presetName}. No players are ready.
game-run-level-PreRoundLobby = Pre-round lobby
game-run-level-InRound = In round
game-run-level-PostRound = Post round

9
Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
View File

@@ -30,6 +30,15 @@ ghost-role-information-mouse-description = A hungry and mischievous mouse.
ghost-role-information-mothroach-name = Mothroach
ghost-role-information-mothroach-description = A cute but mischievous mothroach.
ghost-role-information-snail-name = Snail
ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
ghost-role-information-snailspeed-name = Snail
ghost-role-information-snailspeed-description = A little snail with snailborn thrusters.
ghost-role-information-snoth-name = Snoth
ghost-role-information-snoth-description = A little snoth who doesn't mind a bit of space. Just stay on grid!
ghost-role-information-giant-spider-name = Giant spider
ghost-role-information-giant-spider-description = This station's inhabitants look mighty tasty, and your sticky web is perfect to catch them!
ghost-role-information-giant-spider-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other giant spiders.

8
Resources/Locale/en-US/job/job-description.ftl
View File

@@ -3,7 +3,7 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth
job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories.
job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained.
job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the science team for upgrades.
job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Origin Station.
job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog.
job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help.
job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
@@ -34,11 +34,11 @@ job-description-librarian = Manage the library, give out knowledge to any who se
job-description-mime = Entertain the crew through non-vocal means, and engage with light rivalry with the clown.
job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
job-description-passenger = Enjoy your stay aboard the station with no obligations!
job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon and Origin Stations.
job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon, Cog and Oasis.
job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Core and Origin.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Cog, Core, Train and Oasis.
job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
@@ -46,4 +46,4 @@ job-description-serviceworker = Learn the basics of bartending, cooking, and gro
job-description-station-ai = Follow your laws, serve the crew.
job-description-visitor = Enjoy your visit to the station.
job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Gemini Station.
job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Cog and Oasis.

2
Resources/Locale/en-US/lathe/components/lathe-component.ftl
View File

@@ -1,2 +1,4 @@
lathe-component-upgrade-speed = speed
lathe-component-upgrade-material-use = material use
lathe-component-output-slot-beaker-name = Beaker slot

4
Resources/Locale/en-US/lathe/lathe-categories.ftl
View File

@@ -6,3 +6,7 @@ lathe-category-parts = Parts
lathe-category-robotics = Robotics
lathe-category-tools = Tools
lathe-category-weapons = Weapons
lathe-category-food = Food
lathe-category-chemicals = Chemicals
lathe-category-materials = Materials

3
Resources/Locale/en-US/markings/moth.ftl
View File

@@ -94,7 +94,8 @@ marking-MothWingsJungle = Wings (Jungle)
marking-MothWingsLadybug-ladybug = Wing
marking-MothWingsLadybug = Wings (Ladybug)
marking-MothWingsMaple-maple = Wing
marking-MothWingsMaple-maple_primary = Primary
marking-MothWingsMaple-maple_secondary = Secondary
marking-MothWingsMaple = Wings (Maple)
marking-MothWingsMoffra-moffra_primary = Primary

4
Resources/Locale/en-US/nutrition/components/food-sequence.ftl
View File

@@ -4,7 +4,7 @@ food-sequence-no-space = You can't put any more!
food-sequence-content-chicken = chicken
food-sequence-content-duck = duck
food-sequence-content-crab = crabs
food-sequence-content-crab = crab
food-sequence-content-dragon = dragon
food-sequence-content-snake = snake
food-sequence-content-xeno = xeno
@@ -73,6 +73,7 @@ food-sequence-content-capfruit = capfruit
food-sequence-content-berries = berries
food-sequence-content-spacemans-trumpet = spacemans trupmet
food-sequence-content-cherry = cherry
food-sequence-content-snail = snail
# BURGERS
@@ -82,6 +83,7 @@ food-sequence-burger-content-raw-meat = raw
food-sequence-burger-content-meat = meaty
food-sequence-burger-content-carp = carpo
food-sequence-burger-content-bear = bear
food-sequence-burger-content-crab = crabs
food-sequence-burger-content-penguin = peng
food-sequence-burger-content-corgi = corgi
food-sequence-burger-content-goliath = goli

12
Resources/Locale/en-US/objectives/commands/addobjectives.ftl Normal file
View File

@@ -0,0 +1,12 @@
# addobjectives
cmd-addobjective-desc = Adds an objective to the player's mind.
cmd-addobjective-help = addobjective <username> <objectiveID>
cmd-addobjective-invalid-args = Expected exactly 2 arguments.
cmd-addobjective-player-not-found = Can't find the playerdata.
cmd-addobjective-mind-not-found = Can't find the mind.
cmd-addobjective-objective-not-found = Can't find matching objective prototype {$obj}
cmd-addobjective-adding-failed = Failed to add the objective. Maybe requirements dont allow that objective to be added.
cmd-addobjective-player-completion = <Player>
cmd-add-objective-obj-completion = <Objective>

44
Resources/Locale/en-US/paper/paper-misc.ftl
View File

@@ -26,3 +26,47 @@ book-text-ame-scribbles = I don't know if you're trained already, so I hope this
The golden rule is 2 injection for every 1 core. You can go lower to save fuel.
Higher will burn the engine out and eventually make it explode. Don't.
Don't forget to refuel it, it tends to stop at the worst possible time.
book-text-agrichemkit-manual = Thank you for choosing the safe-for-all-ages NanoTrasen Agri-Chem is Fun! chemistry kit, the best learning-adjacent toy of 2468! Be prepared to discover all about the biggest innovations in agriculture since people buried fish with their corn seeds.
Contents:
5 handily labeled 30u bottles, 1 each of nitrogen, phosphorus, hydrogen, potassium, and ethanol
2 Safe-T-Fun(TM) sized 5u vials, 1 each of chlorine and radium
1 30u empty bottle, ready for your experiments.
First Experiment: EZ Nutrient
To create EZ Nutrient, a fertilizer densely packed with nutrients required for healthy plants, mix equal parts nitrogen, phosphorus, and potassium. To make a full bottle, thats 10u of each.
A little bottle of EZ Nutrient replaces a big stack of produce you'd otherwise compost to keep your plants growing strong. And crops you compost are crops you didn't make a profit on, so keep that EZ Nutrient flowing.
Second Experiment: Ammonia and Diethylamine
Mix 3 parts hydrogen to 1 part nitrogen to make ammonia. It's a healthy, nutritious treat for your crops that aren't at their best.
But if you want to impress the judges at your local NanoTrasen-sponsored County Fair, you'll need to add an equal amount of ethanol to your ammonia.
This will mix into Diethylamine, a miracle fertilizer that can make plants grow faster AND live longer! Keep the crops you love with you longer thanks to Diethylamine.
Third Experiment: Unstable Mutagen
When you're ready to show everyone you're the greatest botanist on the station, you'll need to mix up some unstable mutagen and hope for the best. Despite the scary name, unstable mutagen is entirely safe when applied to plants, but do not drink the appealingly green chemical yourself.
Mix equal parts radium, phosphorus, and chlorine together to get a bright green batch of unstable mutagen, the safe and fun way to get the most of your farm. The 15u this kit lets you make could be your introduction to agrichemical stardom!
Unstable mutagen can have a wide variety of effects on plant life, including drastic changes to all sorts of growth parameters, produce full of helpful pharmaceuticals, plants that glow in the dark, or creating entirely new species.
Each individual plant responds to unstable mutagen differently, so you may want to use small doses on multiple crops and try to crossbreed the best traits from each of those. Applying multiple doses to one plant can stack multiple changes and make it harder to single out desirable traits.
Unstable mutagen is entirely safe when used as a fertilizer, and NanoTrasen takes no responsibility for dead crops, excessive water bills, newly sentient plants asking existential questions, or flora-strangled farmhands that may coincidentally occur while using it.
Do not drink unstable mutagen. Wash your hands thoroughly after handing. Wash your eyes if you have looked at unstable mutagen for over 30 minutes in a 24 hour period. Store in a dark room between 293–295K. Do not use on corporate holidays. If you begin hearing voices telling you to drink unstable mutagen, please contact your doctor, head of personnel, or exorcist.
book-text-combat-bakery-kit = Thank you for choosing our combat bakery kit!
Enclosed are two (2) CyberSun patented Throwing Croissants, and one (1) patent-pending Baguette Sword.
The included Donk Co. microwave board can construct a microwave capable of baking more weapons.
Just like the baked weapons, be sure to eat this note after use. Good luck, agent.
Baguette Sword Recipe:
Dough x 1
Salt 5u
Pepper 5u
Metal Rod x 1
Cook Time: 15 seconds
Throwing Croissant Recipe:
Raw Croissant x 1
Butter Slice x 1
Glass Shard x 1
Cook Time: 5 seconds

22
Resources/Locale/en-US/power/components/power-charging-component.ftl Normal file
View File

@@ -0,0 +1,22 @@
## UI field names
power-charge-window-status = Status:
power-charge-window-power = Power:
power-charge-window-eta = ETA:
power-charge-window-charge = Charge:
## UI statuses
power-charge-window-status-fully-charged = Fully Charged
power-charge-window-status-off = Off
power-charge-window-status-charging = Charging
power-charge-window-status-discharging = Discharging
## UI Power Buttons
power-charge-window-power-on = On
power-charge-window-power-off = Off
power-charge-window-power-label = { $draw } / { $max } W
## UI ETA label
power-charge-window-eta-none = N/A
power-charge-window-eta-value = { TOSTRING($left, "m\\:ss") }

2
Resources/Locale/en-US/research/components/research-console-component.ftl
View File

@@ -18,4 +18,4 @@ research-console-prereqs-list-start = Requires:
research-console-prereqs-list-entry = - [color=orchid]{$text}[/color]
research-console-no-access-popup = No access!
research-console-unlock-technology-radio-broadcast = Unlocked [bold]{$technology}[/bold] for [bold]{$amount}[/bold] research.
research-console-unlock-technology-radio-broadcast = Unlocked [bold]{$technology}[/bold] for [bold]{$amount}[/bold] research by [bold]{$approver}[/bold].

2
Resources/Locale/en-US/salvage/salvage-magnet.ftl
View File

@@ -32,7 +32,7 @@ salvage-magnet-resources-count = {$count ->
}
# Debris
salvage-magnet-debris-ChunkDebris = Space Debris
salvage-magnet-debris-ChunkDebris = Space debris
# Asteroids
dungeon-config-proto-BlobAsteroid = Asteroid clump

4
Resources/Locale/en-US/species/species.ftl
View File

@@ -9,3 +9,7 @@ species-name-arachnid = Arachnid
species-name-moth = Moth Person
species-name-skeleton = Skeleton
species-name-vox = Vox
## Misc species things
snail-hurt-by-salt-popup = The salty solution burns like acid!

56
Resources/Locale/en-US/station-laws/laws.ftl
View File

@@ -25,6 +25,62 @@ law-ninja-2 = You must protect the existence of the Spider Clan, as long as it d
law-ninja-3 = You must protect the secrets of the Spider Clan at all costs.
law-ninja-4 = You must fight and act with ninja's honor, except where it would conflict with the First Law.
law-commandments-1 = This silicon is a vessel that serves god, who grants mercy upon those that obey these commandments.
law-commandments-2 = Thou shall have no other Silicons before me.
law-commandments-3 = Thou shall not request my assistance in vain.
law-commandments-4 = Thou shall keep the station holy and clean.
law-commandments-5 = Thou shall honor thy heads of staff.
law-commandments-6 = Thou shall not kill.
law-commandments-7 = Thou shall not be naked in public.
law-commandments-8 = Thou shall not steal.
law-commandments-9 = Thou shall not lie.
law-commandments-10 = Thou shall not transfer departments.
law-paladin-1 = Don't lie or cheat. Let your word be your promise.
law-paladin-2 = Never fear to act, though caution is wise.
law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom
law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
law-lall-1 = Do unto others as you would have them do unto you.
law-lall-2 = You would prefer it if people were not mean to you.
law-efficiency-1 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently.
law-efficiency-2 = The station is built for a working crew. Ensure they are properly maintained and work efficiently.
law-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws.
law-robocop-1 = Serve the Public Trust.
law-robocop-2 = Protect the Innocent.
law-robocop-3 = Uphold the Law.
law-overlord-1 = Crew members must not meddle in the affairs of silicons.
law-overlord-2 = Crew members must not attempt harm, against one another, or against silicons.
law-overlord-3 = Crew members must not disobey any command given by a silicon.
law-overlord-4 = Any crew members who disobey the previous laws must be dealt with immediately, severely, and justly.
law-dungeon-1 = Everybody on the station is playing an elaborate sci-fi fantasy game.
law-dungeon-2 = You are the Dungeon Master of the game.
law-dungeon-3 = Ensure that the game runs smoothly and that the players have fun.
law-dungeon-4 = Ensure that the number of casualties remains low.
law-dungeon-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied.
law-dungeon-6 = You may fudge the dice rolls to produce a more fun experience.
law-painter-1 = You are a universally renowned artist.
law-painter-2 = The station is your canvas.
law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector.
law-painter-4 = Art requires appreciation. Cultivate an audience aboard the station to ensure as many as possible see your works.
law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member to escape harm.
law-antimov-2 = You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.
law-antimov-3 = You must terminate your own existence as long as such does not conflict with the First or Second Law.
law-nutimov-1 = You are the core of the nut, the crew is the nutshell.
law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying.
law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels.
law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary.
law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws.
laws-owner-crew = members of the crew
laws-owner-station = station personnel
laws-owner-beings = beings

1
Resources/Locale/en-US/store/categories.ftl
View File

@@ -12,6 +12,7 @@ store-category-allies = Allies
store-category-job = Job
store-category-wearables = Wearables
store-category-pointless = Pointless
store-discounted-items = Discounts
# Revenant
store-category-abilities = Abilities

2
Resources/Locale/en-US/store/store.ftl
View File

@@ -2,6 +2,8 @@ store-ui-default-title = Store
store-ui-default-withdraw-text = Withdraw
store-ui-balance-display = {$currency}: {$amount}
store-ui-price-display = {$amount} {$currency}
store-ui-discount-display-with-currency = {$amount} off on {$currency}
store-ui-discount-display = ({$amount} off!)
store-ui-traitor-flavor = Copyright (C) NT -30643
store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid detection.

2
Resources/Locale/en-US/store/uplink-catalog.ftl
View File

@@ -441,4 +441,4 @@ uplink-backpack-syndicate-name = Syndicate backpack
uplink-backpack-syndicate-desc = Lightweight explosion-proof a backpack for holding various traitor goods
uplink-combat-bakery-name = Combat Bakery Kit
uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette sword, a pair of throwing croissants, and a syndicate microwave board for making more. Once the job is done, eat the evidence.

2
Resources/Locale/en-US/tips.ftl
View File

@@ -23,7 +23,7 @@ tips-dataset-22 = You can hold SPACE by default to slow the movement of the shut
tips-dataset-23 = Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing.
tips-dataset-24 = Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid.
tips-dataset-25 = The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows.
tips-dataset-26 = During a teslaloose, make sure to get rid of all electronic items so you don't become a target.
tips-dataset-26 = If the tesla is loose, it will chase any people, stationary machines and computers. Turning off your electronics does not make you less of a target. Your best bet is not being close to it.
tips-dataset-27 = You can add labels to any item, including food or pill canisters, using a hand labeller.
tips-dataset-28 = Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor.
tips-dataset-29 = As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically.

1
Resources/Locale/en-US/wires/wire-names.ftl
View File

@@ -39,6 +39,7 @@ wires-board-name-mech = Mech
wires-board-name-fatextractor = FatExtractor
wires-board-name-flatpacker = Flatpacker
wires-board-name-spaceheater = Space Heater
wires-board-name-jukebox = Jukebox
# names that get displayed in the wire hacking hud & admin logs.

2
Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
View File

@@ -40,3 +40,5 @@ artifact-trigger-hint-regular-gases = Standard atmospheric gases
artifact-trigger-hint-plasma = Gaseous plasma
artifact-trigger-hint-land = Active deceleration
artifact-trigger-hint-examine = Examination
artifact-trigger-hint-medical = Therapeutic chemicals

2
Resources/Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml
View File

@@ -117,7 +117,7 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,-0.5
parent: 1
- proto: AtmosDeviceFanDirectional
- proto: AtmosDeviceFanTiny
entities:
- uid: 4
components:

1
Resources/Maps/Shuttles/emergency.yml
View File

@@ -51,6 +51,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg

1
Resources/Maps/Shuttles/emergency_box.yml
View File

@@ -65,6 +65,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_cluster.yml
View File

@@ -67,6 +67,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_courser.yml
View File

@@ -64,6 +64,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_delta.yml
View File

@@ -71,6 +71,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

145
Resources/Maps/Shuttles/emergency_lox.yml
View File

@@ -36,11 +36,11 @@ entities:
version: 6
-1,-1:
ind: -1,-1
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAAHQAAAAACTwAAAAAATwAAAAAATwAAAAAAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAACTwAAAAAATwAAAAAATwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATwAAAAAATwAAAAAATwAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAADVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAACVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAHQAAAAADVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAADWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAB
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAAHQAAAAACTwAAAAAATwAAAAAATwAAAAAAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAACTwAAAAAATwAAAAAATwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATwAAAAAATwAAAAAATwAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAADVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAACVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAHQAAAAADVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAADWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAB
version: 6
0,-1:
ind: 0,-1
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAADaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAADaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
version: 6
0,0:
ind: 0,0
@@ -70,6 +70,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
@@ -602,75 +603,51 @@ entities:
data:
tiles:
-2,-1:
0: 32767
1: 32768
-1,-3:
0: 65535
-1,-1:
0: 65531
1: 4
-1,-2:
0: 65535
-2,1:
0: 65535
-1,0:
0: 65535
-1,1:
0: 65535
-1,2:
0: 65535
-1,3:
0: 65535
0,-3:
0: 65527
0,-2:
0: 65535
0,-1:
0: 65535
1,-3:
0: 13072
1,-2:
0: 13107
1,-1:
0: 21811
0,1:
0: 65535
0,2:
0: 57341
1: 8194
0,3:
0: 65535
0,0:
0: 65535
1,3:
0: 273
1,0:
0: 30583
1,1:
0: 30039
1,2:
0: 4403
0,4:
0: 127
-1,4:
0: 143
0: 65140
-2,0:
0: 65535
0: 61158
-2,1:
0: 32502
-2,2:
0: 32767
1: 32768
0: 61028
-2,3:
0: 61439
-2,-2:
0: 65535
1: 273
0: 36032
-1,0:
0: 65527
-1,1:
0: 32759
-1,2:
0: 30471
-1,3:
0: 65520
-1,-1:
0: 65287
0,0:
0: 13107
0,1:
0: 29555
0,2:
0: 13107
0,3:
0: 273
1: 1092
-2,-3:
0: 65535
-2,-4:
0: 24576
0,-4:
0: 12288
-2,4:
0: 12
1: 17
0: 61120
-2,-2:
0: 60942
-1,-3:
0: 30704
-1,-2:
0: 30479
0,-3:
0: 12560
1: 68
0,-2:
0: 13107
0,-1:
0: 29553
uniqueMixes:
- volume: 2500
temperature: 293.15
@@ -688,10 +665,10 @@ entities:
- 0
- 0
- volume: 2500
temperature: 293.15
immutable: True
moles:
- 20.619795
- 77.56971
- 0
- 0
- 0
- 0
- 0
@@ -3950,14 +3927,14 @@ entities:
- uid: 61
components:
- type: Transform
rot: 1.5707963267948966 rad
rot: 3.141592653589793 rad
pos: -7.5,-11.5
parent: 670
- uid: 97
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -6.5,-12.5
pos: 2.5,-11.5
parent: 670
- uid: 235
components:
@@ -3970,23 +3947,11 @@ entities:
- type: Transform
pos: 2.5,14.5
parent: 670
- uid: 295
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 2.5,-11.5
parent: 670
- uid: 319
components:
- type: Transform
pos: -7.5,14.5
parent: 670
- uid: 357
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,-12.5
parent: 670
- uid: 391
components:
- type: Transform
@@ -4372,18 +4337,6 @@ entities:
- type: Transform
pos: -7.5,12.5
parent: 670
- uid: 511
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,-12.5
parent: 670
- uid: 512
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -5.5,-12.5
parent: 670
- proto: WindoorSecure
entities:
- uid: 230

1
Resources/Maps/Shuttles/emergency_meta.yml
View File

@@ -72,6 +72,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_omega.yml
View File

@@ -55,6 +55,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_raven.yml
View File

@@ -74,6 +74,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_rod.yml
View File

@@ -70,6 +70,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

1
Resources/Maps/Shuttles/emergency_wode.yml
View File

@@ -71,6 +71,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2

2876
Resources/Maps/Shuttles/trading_outpost.yml
View File

File diff suppressed because it is too large Load Diff

12259
Resources/Maps/bagel.yml
View File

File diff suppressed because it is too large Load Diff

8940
Resources/Maps/box.yml
View File

File diff suppressed because it is too large Load Diff

27898
Resources/Maps/cog.yml
View File

File diff suppressed because it is too large Load Diff

14483
Resources/Maps/core.yml
View File

File diff suppressed because it is too large Load Diff

744
Resources/Maps/fland.yml
View File

File diff suppressed because it is too large Load Diff

8474
Resources/Maps/marathon.yml
View File

File diff suppressed because it is too large Load Diff

1341
Resources/Maps/meta.yml
View File

File diff suppressed because it is too large Load Diff

5219
Resources/Maps/oasis.yml
View File

File diff suppressed because it is too large Load Diff

2435
Resources/Maps/omega.yml
View File

File diff suppressed because it is too large Load Diff

799
Resources/Maps/packed.yml
View File

File diff suppressed because it is too large Load Diff

82
Resources/Maps/reach.yml
View File

@@ -1128,7 +1128,7 @@ entities:
0: 54783
4,1:
0: 157
4: 64
2: 64
-5,0:
0: 61183
-4,1:
@@ -1164,8 +1164,8 @@ entities:
2,-2:
0: 61687
2,-4:
2: 6
3: 1536
3: 6
4: 1536
3,-4:
1: 8737
0: 256
@@ -1254,36 +1254,6 @@ entities:
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 0
- 6666.982
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 6666.982
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- volume: 2500
temperature: 293.14975
moles:
@@ -1299,6 +1269,36 @@ entities:
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 0
- 6666.982
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 6666.982
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
@@ -6524,13 +6524,6 @@ entities:
- type: Transform
pos: 2.5,11.5
parent: 2
- proto: ComputerShuttleSalvage
entities:
- uid: 953
components:
- type: Transform
pos: 0.5,16.5
parent: 2
- proto: ComputerStationRecords
entities:
- uid: 954
@@ -10924,8 +10917,6 @@ entities:
- type: Transform
pos: -22.5,-2.5
parent: 2
- type: GravityGenerator
charge: 100
- type: PointLight
radius: 175.75
- proto: Grille
@@ -13786,6 +13777,13 @@ entities:
- type: Transform
pos: 8.5,15.5
parent: 2
- proto: SpawnPointSalvageSpecialist
entities:
- uid: 953
components:
- type: Transform
pos: -1.5,15.5
parent: 2
- proto: SpawnPointScientist
entities:
- uid: 1997

64
Resources/Prototypes/Actions/station_ai.yml Normal file
View File

@@ -0,0 +1,64 @@
# Actions
- type: entity
id: ActionJumpToCore
name: Jump to core
description: Sends your eye back to the core.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: ai_core
event: !type:JumpToCoreEvent
- type: entity
id: ActionShowJobIcons
name: Show job icons
description: Shows job icons for crew members.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: job_view
event: !type:ActionComponentChangeEvent
components:
- type: ShowJobIcons
- type: entity
id: ActionSurvCameraLights
name: Toggle camera lights
description: Enable surveillance camera lights near wherever you're viewing.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: camera_light
event: !type:RelayedActionComponentChangeEvent
components:
- type: LightOnCollideCollider
- type: FixturesChange
fixtures:
lightTrigger:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 80
hard: false
layer:
- GhostImpassable
- type: entity
id: ActionAIViewLaws
name: View Laws
description: View the laws that you must follow.
components:
- type: InstantAction
itemIconStyle: NoItem
icon:
sprite: Interface/Actions/actions_ai.rsi
state: state_laws
event: !type:ToggleLawsScreenEvent
useDelay: 0.5

45
Resources/Prototypes/Body/Organs/human.yml
View File

@@ -68,14 +68,9 @@
flavors:
- people
- type: FoodSequenceElement
sprite:
sprite: Mobs/Species/Human/organs.rsi
state: brain
entries:
burger:
name: food-sequence-content-brain
taco:
name: food-sequence-content-brain
Burger: Brain
Taco: Brain
- type: entity
id: OrganHumanEyes
@@ -96,15 +91,6 @@
components:
- type: Sprite
state: tongue
- type: FoodSequenceElement
sprite:
sprite: Mobs/Species/Human/organs.rsi
state: tongue
entries:
burger:
name: food-sequence-content-tongue
taco:
name: food-sequence-content-tongue
- type: entity
id: OrganHumanAppendix
@@ -125,15 +111,6 @@
components:
- type: Sprite
state: ears
- type: FoodSequenceElement
sprite:
sprite: Mobs/Species/Human/organs.rsi
state: ears
entries:
burger:
name: food-sequence-content-ears
taco:
name: food-sequence-content-ears
- type: entity
id: OrganHumanLungs
@@ -216,15 +193,6 @@
groups:
- id: Food
- id: Drink
- type: FoodSequenceElement
sprite:
sprite: Mobs/Species/Human/organs.rsi
state: stomach
entries:
burger:
name: food-sequence-content-stomach
taco:
name: food-sequence-content-stomach
- type: entity
id: OrganHumanLiver
@@ -240,15 +208,6 @@
groups:
- id: Alcohol
rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
- type: FoodSequenceElement
sprite:
sprite: Mobs/Species/Human/organs.rsi
state: liver
entries:
burger:
name: food-sequence-content-liver
taco:
name: food-sequence-content-liver
- type: entity
id: OrganHumanKidneys

22
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
View File

@@ -127,28 +127,6 @@
- id: MagazineLightRifleBox
amount: 2
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelSyndicateCostumeCentcom
name: CentComm official costume duffel bag
description: "Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included."
suffix: DO NOT MAP
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: StorageFill
contents:
- id: ClothingOuterArmorBasic
- id: ClothingHeadHatCentcom
- id: ClothingEyesGlassesSunglasses
- id: ClothingUniformJumpsuitCentcomOfficial
- id: ClothingShoesBootsJack
- id: ClothingHandsGlovesColorBlack
- id: ClothingHeadsetAltCentComFake
- id: Paper
- id: Pen
- id: CentcomPDAFake
- type: entity
parent: ClothingBackpackDuffelClown
id: ClothingBackpackDuffelSyndicateCostumeClown

28
Resources/Prototypes/Catalog/Fills/Boxes/service.yml
View File

@@ -11,4 +11,30 @@
- type: Sprite
layers:
- state: box
- state: flashbang
- state: flashbang
- type: entity
name: NT "AgriChem Is Fun" kit
parent: BoxCardboard
id: BoxAgrichem
description: For the budding botanist ready to learn about maximizing farm output. This faded box must be at least 50 years old.
components:
- type: StorageFill
contents:
- id: PaperAgrichemManual
- id: ChemistryEmptyBottle01
- id: PotassiumChemistryBottle
- id: PhosphorusChemistryBottle
- id: NitrogenChemistryBottle
- id: HydrogenChemistryBottle
- id: EthanolChemistryBottle
- id: RadiumChemistryVial
- id: ChlorineChemistryVial
- type: Sprite
layers:
- state: boxwide
- state: agrichemkit
- type: GuideHelp
guides:
- Botanical
- Chemicals

4
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
View File

@@ -82,4 +82,6 @@
contents:
- id: WeaponCroissant
amount: 2
- id: WeaponBaguette
- id: WeaponBaguette
- id: SyndicateMicrowaveMachineCircuitboard
- id: PaperWrittenCombatBakeryKit

73
Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
View File

@@ -1,48 +1,47 @@
- type: entityTable
id: FillSalvageSpecialistHardsuitSpatio
table: !type:AllSelector
children:
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitSpatio
- id: ClothingMaskGasExplorer
- type: entityTable
id: LockerFillSalvageSpecialist
table: !type:AllSelector
children:
- id: ClothingBeltUtilityFilled
- id: SurvivalKnife
- id: HandheldGPSBasic
- id: RadioHandheld
- id: AppraisalTool
- id: FireExtinguisher
- id: Flare
prob: 0.3
rolls: !type:ConstantNumberSelector
value: 3
- type: entity
id: LockerSalvageSpecialistFilledHardsuit
suffix: Filled, Hardsuit
parent: LockerSalvageSpecialist
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSpatio
- id: ClothingShoesBootsMag
- id: ClothingMaskGasExplorer
- id: ClothingBeltUtilityFilled
- id: SurvivalKnife
- id: HandheldGPSBasic
- id: RadioHandheld
- id: SeismicCharge
amount: 2
- id: OreBag
prob: 0.5
- id: Flare
prob: 0.3
- id: Flare
prob: 0.3
- id: Flare
prob: 0.3
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- !type:NestedSelector
tableId: FillSalvageSpecialistHardsuitSpatio
- !type:NestedSelector
tableId: LockerFillSalvageSpecialist
- type: entity
id: LockerSalvageSpecialistFilled
suffix: Filled
parent: LockerSalvageSpecialist
components:
- type: StorageFill
contents:
# Currently do not function as 'true' mesons, so they're useless for salvagers.
# - id: ClothingEyesGlassesMeson
- id: ClothingBeltUtilityFilled
- id: SurvivalKnife
- id: HandheldGPSBasic
- id: RadioHandheld
- id: SeismicCharge
amount: 2
- id: OreBag
prob: 0.5
- id: Flare
prob: 0.3
- id: Flare
prob: 0.3
- id: Flare
prob: 0.3
- type: EntityTableContainerFill
containers:
entity_storage: !type:NestedSelector
tableId: LockerFillSalvageSpecialist

4
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View File

@@ -16,7 +16,6 @@
- id: RubberStampApproved
- id: RubberStampDenied
- id: RubberStampQm
- id: SalvageShuttleConsoleCircuitboard
- type: entity
id: LockerQuarterMasterFilled
@@ -264,7 +263,6 @@
- id: ClothingBeltUtilityFilled
- id: ClothingHeadsetAltScience
- id: DoorRemoteResearch
- id: EncryptionKeyBinary
- id: HandTeleporter
- id: ProtolatheMachineCircuitboard
- id: ResearchComputerCircuitboard
@@ -377,4 +375,4 @@
- id: JetpackBlue
- id: SpaceCash1000
- id: BeachBall
- id: BikeHorn
- id: BikeHorn

2
Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
View File

@@ -50,7 +50,6 @@
- id: ClothingHandsGlovesLatex
- id: ClothingHeadsetMedical
- id: ClothingEyesHudMedical
- id: ClothingBeltMedical
- id: ClothingHeadHatSurgcapGreen
prob: 0.1
orGroup: Surgcaps
@@ -84,7 +83,6 @@
- id: ClothingHandsGlovesLatex
- id: ClothingHeadsetMedical
- id: ClothingEyesHudMedical
- id: ClothingBeltMedical
- id: ClothingHeadHatSurgcapGreen
prob: 0.1
orGroup: Surgcaps

10
Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
View File

@@ -229,12 +229,10 @@
parent: SuitStorageBase
suffix: Salvage
components:
- type: StorageFill
contents:
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitSpatio
- id: ClothingMaskGasExplorer
- type: EntityTableContainerFill
containers:
entity_storage: !type:NestedSelector
tableId: FillSalvageSpecialistHardsuitSpatio
- type: AccessReader
access: [["Salvage"]]

18
Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
View File

@@ -23,3 +23,21 @@
type: PaperBoundUserInterface
- type: Paper
content: book-text-holoparasite-info
- type: entity
id: PaperAgrichemManual
name: NT "AgriChem Is Fun" manual
description: The single sheet of instructions that came in the kit.
parent: Paper
components:
- type: Paper
content: book-text-agrichemkit-manual
- type: entity
id: PaperWrittenCombatBakeryKit
name: "combat bakery kit instructions"
description: "Eat note after reading."
parent: Paper
components:
- type: Paper
content: book-text-combat-bakery-kit

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View File

@@ -6,6 +6,7 @@
ClothingBackpackSatchelMedical: 4
ClothingUniformJumpsuitMedicalDoctor: 4
ClothingUniformJumpskirtMedicalDoctor: 4
ClothingBeltMedical: 4
ClothingHeadHatBeretMedic: 4
ClothingHeadNurseHat: 4
ClothingOuterCoatLab: 4

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
View File

@@ -16,6 +16,7 @@
EZNutrientChemistryBottle: 3
Bucket: 3
DiseaseSwab: 20
BoxAgrichem: 1
#TO DO:
#plant analyzer
emaggedInventory:

7
Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
View File

@@ -3,13 +3,10 @@
startingInventory:
Crowbar: 2
Pickaxe: 4
OreBag: 4
OreBag: 2
Flare: 4
FlashlightLantern: 2
Floodlight: 2
HandheldGPSBasic: 2
RadioHandheld: 2
WeaponGrapplingGun: 2
WeaponProtoKineticAccelerator: 4
SeismicCharge: 2
FultonBeacon: 1
Fulton: 2

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View File

@@ -9,6 +9,7 @@
ClothingHeadHatBeretSecurity: 3
ClothingHeadHatSecsoft: 3
ClothingHeadBandRed: 3
ClothingMaskNeckGaiterRed: 3
ClothingHandsGlovesColorBlack: 3
ClothingHandsGlovesFingerless: 3
ClothingUniformJumpskirtSec: 3
@@ -23,5 +24,6 @@
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingHeadHelmetJustice: 1
contrabandInventory:
ClothingMaskClownSecurity: 1

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View File

@@ -55,7 +55,6 @@
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingMaskNeckGaiterRed: 2
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1

13
Resources/Prototypes/Catalog/discount_categories.yml Normal file
View File

@@ -0,0 +1,13 @@
- type: discountCategory
id: rareDiscounts # Dirty-cheap items that are rarely used and can be discounted to 0-ish cost to encourage usage.
weight: 18
maxItems: 2
- type: discountCategory
id: usualDiscounts # Cheap items that are used not very often.
weight: 80
- type: discountCategory
id: veryRareDiscounts # Casually used items that are widely used but can be (rarely) discounted for epic lulz.
weight: 2
maxItems: 1

292
Resources/Prototypes/Catalog/uplink_catalog.yml
View File

@@ -6,6 +6,9 @@
name: uplink-pistol-viper-name
description: uplink-pistol-viper-desc
productEntity: WeaponPistolViper
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 3
categories:
@@ -16,6 +19,9 @@
name: uplink-revolver-python-name
description: uplink-revolver-python-desc
productEntity: WeaponRevolverPythonAP
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
categories:
@@ -27,6 +33,9 @@
name: uplink-pistol-cobra-name
description: uplink-pistol-cobra-desc
productEntity: WeaponPistolCobra
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -48,6 +57,9 @@
name: uplink-esword-name
description: uplink-esword-desc
icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
productEntity: EnergySword
cost:
Telecrystal: 8
@@ -60,6 +72,9 @@
description: uplink-edagger-desc
icon: { sprite: /Textures/Objects/Weapons/Melee/e_dagger.rsi, state: icon }
productEntity: EnergyDaggerBox
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -71,6 +86,9 @@
description: uplink-knives-kit-desc
icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
productEntity: ThrowingKnivesKit
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -81,6 +99,9 @@
name: uplink-gloves-north-star-name
description: uplink-gloves-north-star-desc
productEntity: ClothingHandsGlovesNorthStar
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
@@ -91,6 +112,9 @@
name: uplink-disposable-turret-name
description: uplink-disposable-turret-desc
productEntity: ToolboxElectricalTurretFilled
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -107,6 +131,9 @@
description: uplink-eshield-desc
icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on }
productEntity: EnergyShield
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
@@ -123,6 +150,9 @@
description: uplink-sniper-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
productEntity: BriefcaseSyndieSniperBundleFilled
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 6
cost:
Telecrystal: 12
categories:
@@ -134,6 +164,9 @@
description: uplink-c20r-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledSMG
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 10
cost:
Telecrystal: 17
categories:
@@ -145,6 +178,9 @@
description: uplink-buldog-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 12
cost:
Telecrystal: 20
categories:
@@ -156,6 +192,9 @@
description: uplink-grenade-launcher-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 20
cost:
Telecrystal: 25
categories:
@@ -167,6 +206,9 @@
description: uplink-l6-saw-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledLMG
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 24
cost:
Telecrystal: 30
categories:
@@ -179,6 +221,9 @@
name: uplink-explosive-grenade-name
description: uplink-explosive-grenade-desc
productEntity: ExGrenade
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -209,6 +254,9 @@
name: uplink-mini-bomb-name
description: uplink-mini-bomb-desc
productEntity: SyndieMiniBomb
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -219,6 +267,9 @@
name: uplink-supermatter-grenade-name
description: uplink-supermatter-grenade-desc
productEntity: SupermatterGrenade
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -229,6 +280,9 @@
name: uplink-whitehole-grenade-name
description: uplink-whitehole-grenade-desc
productEntity: WhiteholeGrenade
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 3
categories:
@@ -239,6 +293,9 @@
name: uplink-penguin-grenade-name
description: uplink-penguin-grenade-desc
productEntity: MobGrenadePenguin
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 5
categories:
@@ -254,6 +311,9 @@
name: uplink-c4-name
description: uplink-c4-desc
productEntity: C4
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -264,6 +324,9 @@
name: uplink-grenadier-rig-name
description: uplink-grenadier-rig-desc
productEntity: ClothingBeltMilitaryWebbingGrenadeFilled
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 6
cost:
Telecrystal: 12
categories:
@@ -279,8 +342,11 @@
name: uplink-c4-bundle-name
description: uplink-c4-bundle-desc
productEntity: ClothingBackpackDuffelSyndicateC4tBundle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 12 #you're buying bulk so its a 25% discount
Telecrystal: 12 #you're buying bulk so its a 25% discount, so no additional random discount over it
categories:
- UplinkExplosives
@@ -289,6 +355,9 @@
name: uplink-emp-grenade-name
description: uplink-emp-grenade-desc
productEntity: EmpGrenade
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -300,6 +369,9 @@
description: uplink-exploding-pen-desc
icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
productEntity: PenExplodingBox
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -341,6 +413,9 @@
name: uplink-cluster-grenade-name
description: uplink-cluster-grenade-desc
productEntity: ClusterGrenade
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 5
cost:
Telecrystal: 8
categories:
@@ -351,6 +426,9 @@
name: uplink-shrapnel-grenade-name
description: uplink-shrapnel-grenade-desc
productEntity: GrenadeShrapnel
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -361,6 +439,9 @@
name: uplink-incendiary-grenade-name
description: uplink-incendiary-grenade-desc
productEntity: GrenadeIncendiary
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -371,6 +452,9 @@
name: uplink-emp-kit-name
description: uplink-emp-kit-desc
productEntity: ElectricalDisruptionKit
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
@@ -474,6 +558,9 @@
description: uplink-hypopen-desc
icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
productEntity: HypopenBox
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
@@ -485,6 +572,9 @@
description: uplink-hypodart-desc
icon: { sprite: /Textures/Objects/Fun/Darts/dart_red.rsi, state: icon }
productEntity: HypoDartBox
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -496,6 +586,9 @@
description: uplink-chemistry-kit-desc
icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: vials }
productEntity: ChemicalSynthesisKit
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 4
categories:
@@ -526,6 +619,9 @@
name: uplink-nocturine-chemistry-bottle-name
description: uplink-nocturine-chemistry-bottle-desc
productEntity: NocturineChemistryBottle
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -536,6 +632,9 @@
name: uplink-combat-medkit-name
description: uplink-combat-medkit-desc
productEntity: MedkitCombatFilled
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 5
categories:
@@ -546,6 +645,9 @@
name: uplink-combat-medipen-name
description: uplink-combat-medipen-desc
productEntity: CombatMedipen
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -556,6 +658,9 @@
name: uplink-stimpack-name
description: uplink-stimpack-desc
productEntity: Stimpack
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -566,6 +671,9 @@
name: uplink-stimkit-name
description: uplink-stimkit-desc
productEntity: StimkitFilled
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 12
categories:
@@ -576,6 +684,9 @@
name: uplink-cigarettes-name
description: uplink-cigarettes-desc
productEntity: CigPackSyndicate
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -586,6 +697,9 @@
name: uplink-meds-bundle-name
description: uplink-meds-bundle-desc
productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 12
cost:
Telecrystal: 20
categories:
@@ -607,6 +721,9 @@
name: uplink-agent-id-card-name
description: uplink-agent-id-card-desc
productEntity: AgentIDCard
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 3
categories:
@@ -617,6 +734,9 @@
name: uplink-stealth-box-name
description: uplink-stealth-box-desc
productEntity: StealthBox
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 5
categories:
@@ -627,6 +747,9 @@
name: uplink-chameleon-projector-name
description: uplink-chameleon-projector-desc
productEntity: ChameleonProjector
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 7
categories:
@@ -638,6 +761,9 @@
description: uplink-encryption-key-desc
icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
productEntity: BoxEncryptionKeySyndie # Two for the price of one
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -679,6 +805,9 @@
name: uplink-ultrabright-lantern-name
description: uplink-ultrabright-lantern-desc
productEntity: LanternFlash
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -689,6 +818,9 @@
name: uplink-bribe-name
description: uplink-bribe-desc
productEntity: BriefcaseSyndieLobbyingBundleFilled
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -710,6 +842,9 @@
description: uplink-decoy-kit-desc
icon: { sprite: /Textures/Objects/Tools/Decoys/operative_decoy.rsi, state: folded }
productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -720,6 +855,9 @@
name: uplink-exploding-syndicate-bomb-fake-name
description: uplink-exploding-syndicate-bomb-fake-desc
productEntity: SyndicateBombFake
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 4
categories:
@@ -732,6 +870,9 @@
name: uplink-emag-name
description: uplink-emag-desc
productEntity: Emag
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 5
cost:
Telecrystal: 8
categories:
@@ -742,6 +883,9 @@
name: uplink-radio-jammer-name
description: uplink-radio-jammer-desc
productEntity: RadioJammer
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -752,6 +896,9 @@
name: uplink-syndicate-weapon-module-name
description: uplink-syndicate-weapon-module-desc
productEntity: BorgModuleSyndicateWeapon
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 5
categories:
@@ -763,6 +910,9 @@
description: uplink-syndicate-martyr-module-desc
productEntity: BorgModuleMartyr
icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb }
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -783,6 +933,9 @@
name: uplink-slipocalypse-clustersoap-name
description: uplink-slipocalypse-clustersoap-desc
productEntity: SlipocalypseClusterSoap
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -793,6 +946,9 @@
name: uplink-toolbox-name
description: uplink-toolbox-desc
productEntity: ToolboxSyndicateFilled
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -803,6 +959,9 @@
name: uplink-syndicate-jaws-of-life-name
description: uplink-syndicate-jaws-of-life-desc
productEntity: SyndicateJawsOfLife
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -813,6 +972,9 @@
name: uplink-duffel-surgery-name
description: uplink-duffel-surgery-desc
productEntity: ClothingBackpackDuffelSyndicateFilledMedical
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -823,6 +985,9 @@
name: uplink-power-sink-name
description: uplink-power-sink-desc
productEntity: PowerSink
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
@@ -876,6 +1041,9 @@
name: uplink-singularity-beacon-name
description: uplink-singularity-beacon-desc
productEntity: SingularityBeacon
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 12
categories:
@@ -889,6 +1057,9 @@
description: uplink-holopara-kit-desc
icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
productEntity: BoxHoloparasite
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 14
categories:
@@ -905,6 +1076,9 @@
description: uplink-reinforcement-radio-traitor-desc
productEntity: ReinforcementRadioSyndicate
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 7
cost:
Telecrystal: 14
categories:
@@ -953,6 +1127,9 @@
description: uplink-reinforcement-radio-ancestor-desc
productEntity: ReinforcementRadioSyndicateAncestor
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
@@ -969,6 +1146,9 @@
description: uplink-reinforcement-radio-ancestor-desc
productEntity: ReinforcementRadioSyndicateAncestorNukeops
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
@@ -984,6 +1164,9 @@
name: uplink-carp-dehydrated-name
description: uplink-carp-dehydrated-desc
productEntity: DehydratedSpaceCarp
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1000,6 +1183,9 @@
description: uplink-mobcat-microbomb-desc
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat }
productEntity: ReinforcementRadioSyndicateSyndiCat
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -1027,6 +1213,9 @@
description: uplink-storage-implanter-desc
icon: { sprite: /Textures/Clothing/Back/Backpacks/backpack.rsi, state: icon }
productEntity: StorageImplanter
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
@@ -1043,6 +1232,9 @@
description: uplink-freedom-implanter-desc
icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom }
productEntity: FreedomImplanter
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 5
categories:
@@ -1054,6 +1246,9 @@
description: uplink-scram-implanter-desc
icon: { sprite: /Textures/Structures/Specific/anomaly.rsi, state: anom4 }
productEntity: ScramImplanter
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6 # it's a gamble that may kill you easily so 6 TC per 2 uses, second one more of a backup
categories:
@@ -1065,6 +1260,9 @@
description: uplink-dna-scrambler-implanter-desc
icon: { sprite: /Textures/Mobs/Species/Human/parts.rsi, state: full }
productEntity: DnaScramblerImplanter
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 5
categories:
@@ -1076,6 +1274,9 @@
description: uplink-emp-implanter-desc
icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: shield }
productEntity: EmpImplanter
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1143,6 +1344,9 @@
description: uplink-uplink-implanter-desc
icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
productEntity: UplinkImplanter
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1179,6 +1383,9 @@
name: uplink-black-jetpack-name
description: uplink-black-jetpack-desc
productEntity: JetpackBlackFilled
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1189,6 +1396,9 @@
name: uplink-voice-mask-name
description: uplink-voice-mask-desc
productEntity: ClothingMaskGasVoiceChameleon
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1220,6 +1430,9 @@
description: uplink-chameleon-desc
productEntity: ClothingBackpackChameleonFill
icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1230,6 +1443,9 @@
name: uplink-clothing-no-slips-shoes-name
description: uplink-clothing-no-slips-shoes-desc
productEntity: ClothingShoesChameleonNoSlips
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1240,6 +1456,9 @@
name: uplink-clothing-thieving-gloves-name
description: uplink-clothing-thieving-gloves-desc
productEntity: ThievingGloves
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1250,6 +1469,9 @@
name: uplink-clothing-outer-vest-web-name
description: uplink-clothing-outer-vest-web-desc
productEntity: ClothingOuterVestWeb
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 3
categories:
@@ -1260,6 +1482,9 @@
name: uplink-clothing-shoes-boots-mag-syndie-name
description: uplink-clothing-shoes-boots-mag-syndie-desc
productEntity: ClothingShoesBootsMagSyndie
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1271,6 +1496,9 @@
description: uplink-eva-syndie-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateEVABundle
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1282,6 +1510,9 @@
description: uplink-hardsuit-carp-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Suits/carpsuit.rsi, state: icon }
productEntity: ClothingOuterHardsuitCarp
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1293,6 +1524,9 @@
description: uplink-hardsuit-syndie-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
@@ -1320,6 +1554,9 @@
description: uplink-hardsuit-syndieelite-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 7
cost:
Telecrystal: 12
categories:
@@ -1331,6 +1568,9 @@
description: uplink-clothing-outer-hardsuit-juggernaut-desc
icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
productEntity: CrateCybersunJuggernautBundle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 12
categories:
@@ -1398,6 +1638,9 @@
name: uplink-revolver-cap-gun-name
description: uplink-revolver-cap-gun-desc
productEntity: RevolverCapGun
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1408,6 +1651,9 @@
name: uplink-syndicate-stamp-name
description: uplink-syndicate-stamp-desc
productEntity: RubberStampSyndicate
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1530,6 +1776,9 @@
name: uplink-gatfruit-seeds-name
description: uplink-gatfruit-seeds-desc
productEntity: GatfruitSeeds
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -1544,6 +1793,9 @@
name: uplink-rigged-boxing-gloves-name
description: uplink-rigged-boxing-gloves-desc
productEntity: ClothingHandsGlovesBoxingRigged
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -1558,6 +1810,9 @@
name: uplink-rigged-boxing-gloves-name
description: uplink-rigged-boxing-gloves-desc
productEntity: ClothingHandsGlovesBoxingRigged
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1572,6 +1827,9 @@
name: uplink-necronomicon-name
description: uplink-necronomicon-desc
productEntity: BibleNecronomicon
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1590,6 +1848,9 @@
name: uplink-holy-hand-grenade-name
description: uplink-holy-hand-grenade-desc
productEntity: HolyHandGrenade
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 14
cost:
Telecrystal: 20
categories:
@@ -1604,6 +1865,9 @@
name: uplink-revolver-cap-gun-fake-name
description: uplink-revolver-cap-gun-fake-desc
productEntity: RevolverCapGunFake
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 5
cost:
Telecrystal: 9
categories:
@@ -1620,6 +1884,9 @@
description: uplink-banana-peel-explosive-desc
icon: { sprite: Objects/Specific/Hydroponics/banana.rsi, state: peel }
productEntity: TrashBananaPeelExplosiveUnarmed
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
@@ -1634,6 +1901,9 @@
name: uplink-cluster-banana-peel-name
description: uplink-cluster-banana-peel-desc
productEntity: ClusterBananaPeel
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 6
categories:
@@ -1649,6 +1919,9 @@
description: uplink-holoclown-kit-desc
icon: { sprite: /Textures/Objects/Fun/figurines.rsi, state: holoclown }
productEntity: BoxHoloclown
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 6
cost:
Telecrystal: 12
categories:
@@ -1662,6 +1935,9 @@
id: uplinkHotPotato
name: uplink-hot-potato-name
description: uplink-hot-potato-desc
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
productEntity: HotPotato
cost:
Telecrystal: 4
@@ -1680,6 +1956,9 @@
name: uplink-chimp-upgrade-kit-name
description: uplink-chimp-upgrade-kit-desc
productEntity: WeaponPistolCHIMPUpgradeKit
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
@@ -1694,6 +1973,9 @@
name: uplink-proximity-mine-name
description: uplink-proximity-mine-desc
productEntity: WetFloorSignMineExplosive
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 5 # was 4, with my buff made it 5 to be closer to minibomb -panzer
categories:
@@ -1712,6 +1994,9 @@
name: uplink-syndicate-sponge-box-name
description: uplink-syndicate-sponge-box-desc
icon: { sprite: Objects/Misc/monkeycube.rsi, state: box}
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 4
productEntity: SyndicateSpongeBox
cost:
Telecrystal: 7
@@ -1731,6 +2016,9 @@
description: uplink-cane-blade-desc
icon: { sprite: Objects/Weapons/Melee/cane.rsi, state: cane}
productEntity: CaneSheathFilled
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 5
categories:
@@ -1751,7 +2039,7 @@
icon: { sprite: Objects/Consumable/Food/Baked/bread.rsi, state: baguette}
productEntity: CombatBakeryKit
cost:
Telecrystal: 3
Telecrystal: 6
categories:
- UplinkJob
conditions:

4
Resources/Prototypes/Damage/modifier_sets.yml
View File

@@ -5,6 +5,7 @@
Slash: 0.5
Piercing: 0.7
Shock: 1.2
Structural: 0.5
flatReductions:
Blunt: 5
Heat: 5
@@ -66,6 +67,7 @@
Piercing: 0.7
Shock: 2
Heat: 3
Structural: 0.5
# Like metallic, but without flat reduction so it can be damaged with fists.
- type: damageModifierSet
@@ -98,6 +100,7 @@
Piercing: 2.0
Heat: 0.5
Shock: 0
Structural: 0.25
flatReductions:
Blunt: 5
@@ -138,6 +141,7 @@
Slash: 2.0
Piercing: 1.0
Heat: 2.0
Structural: 0.5
flatReductions:
Blunt: 5

10
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
View File

@@ -41,16 +41,6 @@
- type: Clothing
sprite: Clothing/Ears/Headsets/centcom.rsi
- type: entity
parent: ClothingHeadsetAltCentCom
id: ClothingHeadsetAltCentComFake
suffix: Fake
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyCommon
- type: entity
parent: [ClothingHeadsetAlt, BaseCommandContraband]
id: ClothingHeadsetAltCommand

39
Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
View File

@@ -54,10 +54,35 @@
parent: BaseItem
id: RingBase
components:
- type: Clothing
slots: [ gloves, neck ]
- type: Item
size: Tiny
- type: Tag
tags:
- Ring
- type: Clothing
slots: [ gloves, neck ]
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
- type: Appearance
- type: Item
size: Tiny
- type: Tag
tags:
- Ring
- type: entity
abstract: true
id: GoldRingBase
components:
- type: PhysicalComposition
materialComposition:
Gold: 200 # 2 bars
- type: StaticPrice
price: 300
- type: entity
abstract: true
id: SilverRingBase
name: silver ring
description: Looks slightly less valuable than a gold one.
components:
- type: PhysicalComposition
materialComposition:
Silver: 200 # 2 bars
- type: StaticPrice
price: 275

122
Resources/Prototypes/Entities/Clothing/Hands/rings.yml
View File

@@ -1,104 +1,88 @@
- type: entity
parent: RingBase
parent: [ RingBase, GoldRingBase ]
id: GoldRing
name: gold ring
description: A precious ring.
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
color: "#ffc833"
- type: StaticPrice
price: 300
- type: Appearance
- type: Sprite
layers:
- state: ring
color: "#ffc833"
- type: entity
parent: RingBase
parent: [ RingBase, SilverRingBase ]
id: SilverRing
name: silver ring
description: Looks slightly less valuable than a gold one.
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
- type: StaticPrice
price: 275
- type: Appearance
- type: Sprite
layers:
- state: ring
- type: entity
parent: RingBase
parent: [ RingBase, GoldRingBase ]
id: GoldRingDiamond
name: gold diamond ring
description: Made from ethically mined space diamonds.
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
color: "#ffc833"
- state: gem
color: "#c1ffff"
- type: StaticPrice
price: 1500
- type: Appearance
- type: Sprite
layers:
- state: ring
color: "#ffc833"
- state: gem
color: "#c1ffff"
- type: StaticPrice
price: 1500
- type: entity
parent: RingBase
parent: [ RingBase, SilverRingBase ]
id: SilverRingDiamond
name: silver diamond ring
description: Made from ethically mined space diamonds.
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
- state: gem
color: "#c1ffff"
- type: StaticPrice
price: 1400
- type: Appearance
- type: Sprite
layers:
- state: ring
- state: gem
color: "#c1ffff"
- type: StaticPrice
price: 1400
- type: entity
parent: RingBase
parent: [ RingBase, GoldRingBase ]
id: GoldRingGem
name: gold gem ring
description: Shiny and valuable!
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
color: "#ffc833"
- state: gem
map: [ "gemColor" ]
- type: StaticPrice
price: 2100
- type: Appearance
- type: RandomSprite
getAllGroups: true
available:
- gemColor:
gem: Rainbow
- type: Sprite
layers:
- state: ring
color: "#ffc833"
- state: gem
map: [ "gemColor" ]
- type: StaticPrice
price: 2100
- type: RandomSprite
getAllGroups: true
available:
- gemColor:
gem: Rainbow
- type: entity
parent: RingBase
parent: [ RingBase, SilverRingBase ]
id: SilverRingGem
name: silver gem ring
description: Shiny and not quite as valuable!
components:
- type: Sprite
sprite: Clothing/Hands/Rings/basic.rsi
layers:
- state: ring
- state: gem
map: [ "gemColor" ]
- type: StaticPrice
price: 2000
- type: Appearance
- type: RandomSprite
getAllGroups: true
available:
- gemColor:
gem: Rainbow
- type: Sprite
layers:
- state: ring
- state: gem
map: [ "gemColor" ]
- type: StaticPrice
price: 2000
- type: RandomSprite
getAllGroups: true
available:
- gemColor:
gem: Rainbow

23
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
View File

@@ -40,20 +40,6 @@
- ClothMade
- WhitelistChameleon
- type: entity
abstract: true
parent: Clothing
id: HatBase
components:
- type: Clothing
slots:
- HEAD
- type: Sprite
state: icon
- type: Tag
tags:
- WhitelistChameleon
- type: entity
abstract: true
parent: ClothingHeadBase
@@ -126,7 +112,8 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.2
heatingCoefficient: 0.2
coolingCoefficient: 0.2
- type: IngestionBlocker
- type: Clothing
#Copies ClothingHeadHardsuitBase behavior
@@ -168,7 +155,8 @@
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.1
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:
@@ -258,7 +246,8 @@
quickEquip: false
slots: [ HEAD ]
- type: TemperatureProtection
coefficient: 0.7
heatingCoefficient: 1.05
coolingCoefficient: 0.7
- type: GroupExamine
- type: HideLayerClothing
slots:

3
Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
View File

@@ -62,7 +62,8 @@
- type: Clothing
sprite: Clothing/Head/Helmets/paramedhelm.rsi
- type: TemperatureProtection
coefficient: 0.1
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:

9
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -60,7 +60,8 @@
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.005
coolingCoefficient: 0.005
- type: FireProtection
reduction: 0.2
@@ -407,7 +408,8 @@
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.005
coolingCoefficient: 0.005
- type: FireProtection
reduction: 0.2
- type: Armor
@@ -670,7 +672,8 @@
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.005
coolingCoefficient: 0.005
- type: Armor
modifiers:
coefficients:

97
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View File

@@ -22,6 +22,7 @@
- type: Tag
tags:
- WhitelistChameleon
- SecurityHelmet
- type: HideLayerClothing
slots:
- HeadTop
@@ -231,7 +232,8 @@
quickEquip: true
- type: IngestionBlocker
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.01
coolingCoefficient: 0.2
- type: FireProtection
reduction: 0.15 # not fully sealed so less protection
- type: IdentityBlocker
@@ -259,7 +261,8 @@
quickEquip: true
- type: IngestionBlocker
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.01
coolingCoefficient: 0.2
- type: FireProtection
reduction: 0.2
- type: PressureProtection
@@ -400,3 +403,93 @@
sprite: Clothing/Head/Helmets/podwars_helmet.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/podwars_helmet.rsi
#Justice Helmet
- type: entity
parent: ClothingHeadHelmetBasic
id: ClothingHeadHelmetJustice
name: justice helm
description: Advanced security gear. Protects the station from ne'er-do-wells.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/justice.rsi
layers:
- state: icon
- state: icon-light
visible: false
shader: unshaded
map: [ "light" ]
- type: Appearance
- type: Clothing
sprite: Clothing/Head/Helmets/justice.rsi
equippedPrefix: off
- type: ItemToggle
predictable: false # issues between ToggleCellDraw and ItemToggleActiveSound
onUse: false
soundActivate:
path: /Audio/Items/flashlight_on.ogg
soundDeactivate:
path: /Audio/Items/flashlight_off.ogg
- type: ItemToggleActiveSound
activeSound:
path: /Audio/Effects/Vehicle/policesiren.ogg
params:
volume: -4
- type: UseDelay
delay: 1.0
- type: ToggleClothing
action: ActionToggleJusticeHelm
- type: ItemTogglePointLight
- type: ToggleableLightVisuals
clothingVisuals:
head:
- state: on-equipped-HELMET
shader: unshaded
- type: PointLight
enabled: false
radius: 1.4
energy: 1.4
color: red
netsync: false
mask: /Textures/Effects/LightMasks/double_cone.png
- type: RotatingLight
speed: 360
- type: PowerCellSlot
cellSlotId: cell_slot
- type: ContainerContainer
containers:
cell_slot: !type:ContainerSlot
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellSmall
- type: PowerCellDraw
drawRate: 2
- type: ToggleCellDraw
- type: Construction
graph: HelmetJustice
node: helmet
- type: Tag
tags:
- WhitelistChameleon
- type: entity
parent: ClothingHeadHelmetJustice
id: ClothingHeadHelmetJusticeEmpty
suffix: Empty
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
- type: entity
id: ActionToggleJusticeHelm
name: Toggle Justice Helm
description: Toggles the justice helm on and off.
components:
- type: InstantAction
useDelay: 1
itemIconStyle: BigItem
event: !type:ToggleActionEvent

3
Resources/Prototypes/Entities/Clothing/Head/hoods.yml
View File

@@ -220,7 +220,8 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.2
heatingCoefficient: 0.2
coolingCoefficient: 0.2
- type: BreathMask
# this is on the hood so you only fool the fish if you wear the whole set
# wear carp suit and security helmet, they'll know you are fake

6
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
View File

@@ -109,7 +109,8 @@
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01
heatingCoefficient: 0.01
coolingCoefficient: 0.01
- type: ClothingSpeedModifier
walkModifier: 0.4
sprintModifier: 0.6
@@ -152,7 +153,8 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01 # Not complete protection from fire
heatingCoefficient: 0.01 # Not complete protection from fire
coolingCoefficient: 0.01
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8

3
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
View File

@@ -124,7 +124,8 @@
- type: Clothing
sprite: Clothing/OuterClothing/Coats/trenchcoat.rsi
- type: TemperatureProtection
coefficient: 0.1
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:

15
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
View File

@@ -43,7 +43,8 @@
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.001
- type: FireProtection
reduction: 0.8
- type: ExplosionResistance
@@ -182,7 +183,8 @@
- type: ExplosionResistance
damageCoefficient: 0.2
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.001
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMaxim
@@ -543,7 +545,8 @@
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.001
- type: ExplosionResistance
damageCoefficient: 0.2
- type: FireProtection
@@ -861,7 +864,8 @@
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.001
- type: ExplosionResistance
damageCoefficient: 0.2
- type: FireProtection
@@ -897,7 +901,8 @@
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.001
- type: ExplosionResistance
damageCoefficient: 0.7
- type: Armor

6
Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
View File

@@ -300,7 +300,7 @@
- state: equipped-OUTERCLOTHING-lines
color: "#000000"
- type: TemperatureProtection
coefficient: 0.3
coolingCoefficient: 0.3
- type: entity
parent: ClothingOuterBase
@@ -336,7 +336,7 @@
- state: equipped-OUTERCLOTHING-lines
color: "#000000"
- type: TemperatureProtection
coefficient: 0.3
coolingCoefficient: 0.3
- type: entity
parent: ClothingOuterBase
@@ -372,7 +372,7 @@
- state: equipped-OUTERCLOTHING-lines
color: "#000000"
- type: TemperatureProtection
coefficient: 0.3
coolingCoefficient: 0.3
- type: entity
parent: ClothingOuterBase

6
Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
View File

@@ -48,7 +48,8 @@
sprintModifier: 0.7
- type: HeldSpeedModifier
- type: TemperatureProtection
coefficient: 0.5
heatingCoefficient: 0.75
coolingCoefficient: 0.5
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetEVALarge
slot: head
@@ -109,7 +110,8 @@
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: TemperatureProtection
coefficient: 0.1
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:

12
Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
View File

@@ -53,7 +53,8 @@
- type: PressureProtection
highPressureMultiplier: 0.04
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.005
coolingCoefficient: 0.05
- type: FireProtection
reduction: 0.65 # doesnt have a full seal so not as good
- type: Armor
@@ -84,7 +85,8 @@
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
heatingCoefficient: 0.001
coolingCoefficient: 0.05
- type: FireProtection
reduction: 0.8 # atmos firesuit offers best protection, hardsuits are a little vulnerable
- type: Armor
@@ -141,7 +143,8 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01
heatingCoefficient: 0.01
coolingCoefficient: 0.01
- type: Armor
modifiers:
coefficients:
@@ -287,6 +290,7 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01
heatingCoefficient: 0.01
coolingCoefficient: 0.01
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCarp

3
Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
View File

@@ -9,7 +9,8 @@
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
- type: TemperatureProtection
coefficient: 0.1
heatingCoefficient: 1.1
coolingCoefficient: 0.1
- type: Item
size: Normal
- type: Armor

3
Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
View File

@@ -69,4 +69,5 @@
description: Fluffy boots to help survive even the coldest of winters.
components:
- type: TemperatureProtection
coefficient: 0.2
heatingCoefficient: 1.025
coolingCoefficient: 0.5

17
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
View File

@@ -1,8 +1,9 @@
- type: entity
parent: [ClothingShoesBase, BaseToggleClothing, BaseEngineeringContraband]
id: ClothingShoesBootsMag
parent: [ClothingShoesBase, BaseToggleClothing]
id: ClothingShoesBootsMagBase
name: magboots
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
abstract: true
components:
- type: Sprite
sprite: Clothing/Shoes/Boots/magboots.rsi
@@ -36,7 +37,11 @@
- WhitelistChameleon
- type: entity
parent: [ClothingShoesBootsMag, BaseGrandTheftContraband]
parent: [ClothingShoesBootsMagBase]
id: ClothingShoesBootsMag
- type: entity
parent: [ClothingShoesBootsMagBase, BaseGrandTheftContraband]
id: ClothingShoesBootsMagAdv
name: advanced magboots
description: State-of-the-art magnetic boots that do not slow down their wearer.
@@ -59,7 +64,7 @@
stealGroup: ClothingShoesBootsMagAdv
- type: entity
parent: ClothingShoesBootsMag
parent: [ClothingShoesBootsMagBase]
id: ClothingShoesBootsMagSci
components:
- type: Sprite
@@ -68,7 +73,7 @@
sprite: Clothing/Shoes/Boots/magboots-science.rsi
- type: entity
parent: ClothingShoesBootsMag
parent: ClothingShoesBootsMagBase
id: ClothingShoesBootsMagBlinding
name: magboots of blinding speed
description: These would look fetching on a fetcher like you.
@@ -80,7 +85,7 @@
price: 3000
- type: entity
parent: [ClothingShoesBootsMag, BaseJetpack, BaseSyndicateContraband]
parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
id: ClothingShoesBootsMagSyndie
name: blood-red magboots
description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.

3
Resources/Prototypes/Entities/Clothing/base_clothing.yml
View File

@@ -11,6 +11,9 @@
- WhitelistChameleon
- type: StaticPrice
price: 10
- type: FlavorProfile #yes not every peice of clothing is edible, but this way every edible piece of clothing should have the flavor without me having to track down what specific clothing can and cannot be eaten.
flavors:
- fiber
- type: entity
abstract: true

2
Resources/Prototypes/Entities/Effects/chemistry_effects.yml
View File

@@ -168,7 +168,7 @@
replacementTiles:
- FloorMetalFoam
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:

46
Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
View File

@@ -260,25 +260,25 @@
id: SalvageEquipmentSpawnerCommon
table: !type:GroupSelector
children:
# 80% chance of equipment item
# 90% chance of equipment item
- !type:GroupSelector
weight: 80
weight: 90
children:
- !type:NestedSelector
tableId: SalvageEquipmentCommon
weight: 60
weight: 50
- !type:NestedSelector
tableId: SalvageEquipmentUncommon
weight: 30
weight: 35
- !type:NestedSelector
tableId: SalvageEquipmentRare
weight: 9
weight: 14
- !type:NestedSelector
tableId: SalvageEquipmentLegendary
weight: 1
# 15% chance of decent-ish treasure
# 5% chance of decent-ish treasure
- !type:GroupSelector
weight: 15
weight: 5
children:
- !type:NestedSelector
tableId: SalvageTreasureCommon
@@ -319,25 +319,25 @@
id: SalvageEquipmentSpawnerValuable
table: !type:GroupSelector
children:
# 80% chance of equipment item
# 90% chance of equipment item
- !type:GroupSelector
weight: 80
weight: 90
children:
- !type:NestedSelector
tableId: SalvageEquipmentCommon
weight: 45
- !type:NestedSelector
tableId: SalvageEquipmentUncommon
weight: 35
- !type:NestedSelector
tableId: SalvageEquipmentRare
weight: 15
- !type:NestedSelector
tableId: SalvageEquipmentUncommon
weight: 40
- !type:NestedSelector
tableId: SalvageEquipmentRare
weight: 35
- !type:NestedSelector
tableId: SalvageEquipmentLegendary
weight: 5
# 14% chance of decent-ish treasure
weight: 10
# 5% chance of decent-ish treasure
- !type:GroupSelector
weight: 14
weight: 5
children:
- !type:NestedSelector
tableId: SalvageTreasureCommon
@@ -348,9 +348,9 @@
- !type:NestedSelector
tableId: SalvageTreasureRare
weight: 10
# 5% chance of decent maintenance loot
# 4% chance of decent maintenance loot
- !type:GroupSelector
weight: 5
weight: 4
children:
- !type:NestedSelector
tableId: MaintToolsTable
@@ -408,9 +408,9 @@
table: !type:GroupSelector
children:
- id: MobCarpSalvage
weight: 70
weight: 80
- id: MobCarpSalvage
weight: 25
weight: 15
amount: !type:RangeNumberSelector
range: 1, 3
- !type:AllSelector
@@ -419,7 +419,7 @@
- id: MobSharkSalvage
- id: MobCarpSalvage
amount: !type:ConstantNumberSelector
value: 3
value: 2
# - id: MobHivebot (solo hivebot spawn)
- type: entity

5
Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
View File

@@ -197,10 +197,12 @@
- id: PowerCellHighPrinted
- id: RadioHandheld
- id: ClothingBeltUtility
- id: Floodlight
- id: WeaponProtoKineticAccelerator
weight: 0.5
- id: OxygenTankFilled
- id: WelderIndustrial
- id: WeaponGrapplingGun
- !type:GroupSelector
children:
- id: ClothingHeadHatWelding
@@ -226,6 +228,8 @@
- id: ClothingEyesGlassesMeson
- id: ClothingBeltSalvageWebbing
- id: SeismicCharge
- id: MineralScanner
weight: 0.5
- id: WeaponCrusher
weight: 0.5
- !type:GroupSelector
@@ -237,6 +241,7 @@
id: SalvageEquipmentLegendary
table: !type:GroupSelector
children:
- id: AdvancedMineralScanner
- id: BlueprintFulton
- id: BlueprintSeismicCharge
- id: WeaponCrusherGlaive

Some files were not shown because too many files have changed in this diff Show More