Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
7064f262b4
Add ore bag area pickups ( #19358 )
2023-09-12 22:34:04 +10:00
eclips_e
133ca98655
Hardbombs & Defusables ( #15380 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
2023-09-11 18:42:38 -07:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
lapatison
8d3a741325
Guidebook locale ( #1393 )
2023-09-07 16:07:33 +03:00
lapatison
f5a3ae0655
Salvage guidebook locale ( #1384 )
2023-09-06 16:25:21 +03:00
Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
chromiumboy
05e9d2e33a
Plasma fueled radiation collectors ( #19598 )
...
* Fixes issue with solution regenerators
* Update Solution.cs
Removed excess whitespace
* Undid file scoping to make this easier to review
* Initial prototype
* Adjusted coefficients
* Removed unintentional changes from another PR
* Undid unintentional change
* Undid unintentional change
* Added temperature modifier to power production
* Guidebook entry and radiation collector low pressure warning
* Reviewer requested changes
2023-09-04 16:11:57 +03:00
Morb0
5a6058666e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
Chief-Engineer
d1d9e4dcc3
Revolutionary rules ( #19654 )
...
* modify rules for revolutionaries
* update recent changes for rules
2023-08-31 02:30:08 -05:00
liltenhead
dc479ba809
Update Traitor Guide ( #19648 )
2023-08-30 21:07:18 -04:00
Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
lapatison
a3141d673b
Translate Upstream #1362 ( #1366 )
2023-08-27 04:45:39 +03:00
Pieter-Jan Briers
bf16698efa
Portable Generator Rework ( #19302 )
2023-08-25 11:40:42 -07:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
/ʊniɹɑː/
f2954fff96
allow richtext on papers + edit premade documents ( #18154 )
2023-08-22 21:50:03 +10:00
Morb0
81fe87f513
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
2023-08-21 09:44:38 +03:00
Albert Snow
226374ae90
Update atmospherics guidebook ( #19273 )
2023-08-17 21:55:08 -07:00
Chief-Engineer
89b3231de0
update rules for borgs ( #19248 )
...
* update rules for borgs
* add recent changes
2023-08-17 05:49:01 -05:00
Morb0
83dcb2970d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
2023-08-14 03:22:26 +03:00
chromiumboy
0c8973df67
Add guidebook entries for the access configurator and installing airlock security upgrades ( #18983 )
...
* Adds guidebook entries for the access configurator and installing airlock security upgrades
* Moved the guidebook entry on airlock security to be under engineering
2023-08-13 01:19:28 -06:00
Errant
7527036cf1
Laser namechange and some buffs ( #18951 )
...
* Laser naming
* More laser changes
2023-08-13 01:18:49 -06:00
Morb0
f5c44e5bd0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
Pieter-Jan Briers
a242af506e
Adds the thermo-electric generator ( #18840 )
...
* Basic TEG start.
Connects via node group.
* Basic TEG test map
* Sensor monitoring basics, TEG circulator flow
* Basic power generation (it doesn't work)
* More sensor monitoring work
* Battery (SMES) monitoring system.
* Sensor monitoring fixes
Make it work properly when mapped.
* Test map improvements
* Revise TEG power output mechanism.
Now uses a fixed supplier with a custom ramping system.
* TEG test map fixes
* Make air alarms and pumps open UI on activate.
* Clean up thermo machines power switch.
Removed separate Enabled bool from the component that always matched the power receiver's state.
This enables adding a PowerSwitch component to give us alt click/verb menu.
* TEG but now fancy
* Make sensor monitoring console obviously WiP to mappers.
* Vending machine sound, because of course.
* Terrible, terrible graph background color
* Examine improvements for the TEG.
* Account for electrical power when equalizing gas mixtures.
* Get rid of the TegCirculatorArrow logic.
Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component.
Thanks Julian.
* Put big notice of "not ready, here's why" on the sensor monitoring console.
* TryGetComponent -> TryComp
* Lol there's a HideContextMenu tag
* Test fixes
* Guidebook for TEG
Fixed rotation on GuideEntityEmbed not working correctly.
Added Margin property to GuideEntityEmbed
* Make TEG power bar default to invisible.
So it doesn't appear in the guidebook and spawn menu.
2023-08-12 15:41:55 -05:00
deltanedas
a727457281
vim tweaks ( #19015 )
...
* smaller mass and radius
* same damage as hamtr
* guide
* remilia and valid dog can pilot
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-12 13:03:07 -06:00
Morb0
676272809d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-08-08 12:54:45 +03:00
Kara
afead24f1e
Rename spacebucks to spesos ( #18805 )
2023-08-06 23:43:34 -06:00
Morb0
4b873cf1cd
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Tiles/plating.png
2023-08-06 06:33:32 +03:00
DerbyX
6e5d8d2faf
New Guidebook Additions ( #18632 )
...
Co-authored-by: Derby <Derby@ss14>
2023-08-06 12:35:07 +10:00
Morb0
0cffa43345
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
# Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Decals/bricktile.rsi/dark_box.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
# Resources/Textures/Decals/bricktile.rsi/meta.json
# Resources/Textures/Decals/bricktile.rsi/steel_box.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_end_e.png
# Resources/Textures/Decals/bricktile.rsi/white_end_n.png
# Resources/Textures/Decals/bricktile.rsi/white_end_s.png
# Resources/Textures/Decals/bricktile.rsi/white_end_w.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_line_e.png
# Resources/Textures/Decals/bricktile.rsi/white_line_n.png
# Resources/Textures/Decals/bricktile.rsi/white_line_s.png
# Resources/Textures/Decals/bricktile.rsi/white_line_w.png
# Resources/Textures/Decals/minitile.rsi/dark_box.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_end_e.png
# Resources/Textures/Decals/minitile.rsi/dark_end_n.png
# Resources/Textures/Decals/minitile.rsi/dark_end_s.png
# Resources/Textures/Decals/minitile.rsi/dark_end_w.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_line_e.png
# Resources/Textures/Decals/minitile.rsi/dark_line_n.png
# Resources/Textures/Decals/minitile.rsi/dark_line_s.png
# Resources/Textures/Decals/minitile.rsi/dark_line_w.png
# Resources/Textures/Decals/minitile.rsi/meta.json
# Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_end_e.png
# Resources/Textures/Decals/minitile.rsi/steel_end_n.png
# Resources/Textures/Decals/minitile.rsi/steel_end_s.png
# Resources/Textures/Decals/minitile.rsi/steel_end_w.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_line_e.png
# Resources/Textures/Decals/minitile.rsi/steel_line_n.png
# Resources/Textures/Decals/minitile.rsi/steel_line_s.png
# Resources/Textures/Decals/minitile.rsi/steel_line_w.png
# Resources/Textures/Decals/minitile.rsi/white_box.png
# Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_corner_se.png
# Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_end_e.png
# Resources/Textures/Decals/minitile.rsi/white_end_n.png
# Resources/Textures/Decals/minitile.rsi/white_end_s.png
# Resources/Textures/Decals/minitile.rsi/white_end_w.png
# Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_inner_se.png
# Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_line_w.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/bar.png
# Resources/Textures/Tiles/clown.png
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/dark_diagonal.png
# Resources/Textures/Tiles/dark_diagonal_mini.png
# Resources/Textures/Tiles/dark_herringbone.png
# Resources/Textures/Tiles/dark_mini.png
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/dark_offset.png
# Resources/Textures/Tiles/dark_pavement.png
# Resources/Textures/Tiles/dark_pavement_vertical.png
# Resources/Textures/Tiles/hydro.png
# Resources/Textures/Tiles/kitchen.png
# Resources/Textures/Tiles/laundry.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/steel_diagonal.png
# Resources/Textures/Tiles/steel_diagonal_mini.png
# Resources/Textures/Tiles/steel_herringbone.png
# Resources/Textures/Tiles/steel_mini.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/steel_offset.png
# Resources/Textures/Tiles/steel_pavement.png
# Resources/Textures/Tiles/steel_pavement_vertical.png
# Resources/Textures/Tiles/white.png
# Resources/Textures/Tiles/white_diagonal.png
# Resources/Textures/Tiles/white_diagonal_mini.png
# Resources/Textures/Tiles/white_herringbone.png
# Resources/Textures/Tiles/white_mini.png
# Resources/Textures/Tiles/white_mono.png
# Resources/Textures/Tiles/white_offset.png
# Resources/Textures/Tiles/white_pavement.png
# Resources/Textures/Tiles/white_pavement_vertical.png
2023-08-02 15:13:51 +03:00
liltenhead
8d767f08a4
Milk ( #18422 )
2023-07-29 16:14:00 +03:00
lzk
ceeb53647b
[Translate] Guidebooks additions ( #1184 )
2023-07-28 14:19:46 +03:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
dribblydrone
78fbdbc145
nukie guidebook ( #17867 )
2023-07-09 20:54:43 -06:00
Chief-Engineer
42c420e635
clarify execution requirements ( #17878 )
2023-07-07 23:12:58 -05:00
lapatison
fd5eafeae3
Janitorial guidebook locale ( #1168 )
2023-07-07 19:13:13 +03:00
faint
31f283cc8e
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-04 03:14:11 +03:00
Nairod
e7fb60500b
MRP Rules Update ( #16938 )
...
* Update
* Touch ups
* Chiefs Points
* Long Form Rules
* Slight Max Brig Time Statement Change
2023-06-30 19:15:03 -05:00
Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
TemporalOroboros
d9de405859
ECS AME ( #16779 )
2023-06-28 08:02:06 -04:00
deltanedas
a3726612ad
make it even more obvious extracting is good ( #17487 )
2023-06-27 22:28:49 -04:00
faint
44dbc63ebc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/DNA.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png
2023-06-26 17:34:49 +03:00
eclips_e
5a85575017
bounities ( #17628 )
2023-06-25 22:29:09 -05:00
Myakot
20b55d7af8
gbookcommits ( #17611 )
2023-06-24 14:07:25 -06:00
Nemanja
7ab5127286
Cargo Bounties ( #17344 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-22 21:49:33 +10:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
Sir Winters
ac63a7c700
Minor changes to Janitorial and Cryogenics Guidebooks ( #17282 )
...
Co-authored-by: Owai-Seek <>
2023-06-18 19:15:01 -06:00
Nails+Tape
bb45db7151
cargo guidebook ( #17342 )
...
* adds a guidebook entry explaining playable species
* adds a cargo guidebook entry
* Update guides.ftl
* Update shiftandcrew.yml
* Update ss14.yml
* Delete Species.xml
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Update Resources/ServerInfo/Guidebook/Cargo.xml
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---------
Co-authored-by: OttoMaticode <124523848+OttoMaticode@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-06-17 20:31:49 -06:00
end
a27bd8d6b2
In game guide books ( #17304 )
2023-06-15 13:36:15 +10:00
OttoMaticode
0ee2a4eec4
adds a link to the science entry from robotics ( #17196 )
2023-06-15 12:43:02 +10:00
