Morb0
d9bfc5cdcb
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
ArtisticRoomba
8894e32a10
Budget insuls leaves behind frayed insulative fibers instead of insulative fibers ( #31886 )
...
* Adds fibers-insulative-frayed to fibers.ftl and relevant fibers-insulative-frayed components to budget insuls
* +1 to the "different types of fibers in the game" info under the forensics guidebook entry (pray this is actually correct and accurate)
2024-09-09 12:30:24 +02:00
Iztok Bajcar
031ddc0420
Guidebook typo fixes ( #31159 )
...
* Fixed typo: access --> accessed
* Fixed typo: 'access restricted' --> 'access-restricted'
* Fixed typo: added 'be'
* Fixed typo: added 'a'
* Fixed typo: 'Asssistants' --> 'Assistants'
* Fixed typo: 'overpressure' --> 'overpressurize'
* Fixed typo: 'outisde' --> 'outside'
* Fixed typo: added a comma
* Fixed typo: added a comma
* Fixed typo: 'aformentioned' --> 'aforementioned'
* Fixed typo: added a comma
* Fixed typo: added a comma
* Fixed typo: 'radition' --> 'radiation'
* Fixed typo: 'turing' --> 'turning'
* Fixed typo: 'appropiate' --> 'appropriate'
* Fixed typo: added 'the'
* Fixed typo: added a dot to ellipsis
* Fixed typo: 'aswell' --> 'as well'
* Fixed typo: 'permanant' --> 'permanent'
* Fixed typo: 'flammmable' --> 'flammable'
* Fixed typo: 'recommmended' --> 'recommended'
* Fixed typo: 'recipies' --> 'recipes'
* Fixed typo: 'pre-adminsitered' --> 'pre-administered'
* Fixed typo: 'resusitated' --> 'resuscitated'
* Fixed typo: 'types' --> 'type'
* Fixed typo: `someones` --> `someone's`
* Fixed typo: 'appy' --> 'apply'
* Fixed typo: added 'to'
* Fixed typo: 'CentCom' --> 'CentComm' (as per https://github.com/space-wizards/space-station-14/pull/29217 )
* Fixed typo: 'emergencys' --> 'emergencies'
* Fixed typo: removed a dash
2024-08-18 11:31:48 -04:00
UBlueberry
c6ff1e44fb
Guidebook Updates for the Amateur Spessman ( #28603 )
...
* Created NewPlayer.xml
* Created NewPlayer.yml and added it to guides.ftl
* shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later
* switched some stuff between the New? entry and the Space Station 14 entry
* Made everything so nice!!!!!!!!!!!!!!
* fixed formatting inconsistencies
* added a How to use this guidebook section
* build correction and guidebook clarification for other servers
* wrote character creation ig probs fo shizzle
* added new terms to the glossary and alphabetized it
* meh this seems important enough to add
* okay no more shitsec bad idea
* I HATED Roleplaying.xml ANYWAY!!!
* I REALLY REALLY HATED IT ACTUALLYLLL
* Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete
* Separated the character creation bits that are just cosmetic from the ones that matter
* also put all the related new player xml files in their own folder
* expanded Radio.xml, kinda fixed survival.xml
* removed the line that mighta maybe sorta possibly could encourage self antag
* thought about this randomly but ICK OCK
* talking is no longer a key part of this game
* moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around
* ah probably should make sure this works first also me when i lie on the internet
* don't be such a grammar nukie
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* okay nevermind that's justified
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* prepare. it is coming. the great reorganization...
* yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.
* rename that real quick
* step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.
* update shiftandcrew.yml to only have departments as children also fuck it alphabetization
* consolidated salvage into cargo
* made a new entry for command
* gave salvage a home and service an existence
* made some XML files to be filled out later
* quick rename...
* took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml
* The Great Writing about Departments (25XX, black and white)
* added a bunch of links everywhere
* biochemical is no longer a thing
* service formatinaaaaaaa
* shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,
* let's get that fixed
* second time i made a typo there as well
* we hate fun around here
* grammar?!???/
* various fixes and more linkings
* oops
* wewlad lol!!
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-06-09 01:00:43 +02:00
UBlueberry
8eab1f499f
Guidebook update for the Space Ninja ( #26650 )
...
* added ninja to Antagonists.xml
* give the space ninja some love
* by the way did you know there are now 25 fiber types? i demand this number get updated with every single PR
2024-04-20 16:10:22 +10:00
Morb0
70e63172f7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# README.md
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Medical/Cloning.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
2024-02-12 12:53:34 +03:00
deltanedas
683591ab04
criminal records revival ( #22510 )
2024-02-04 19:29:35 -04:00
lzk
9d847773f3
Defusal & cargo general guidebooks translate ( #1761 )
...
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-17 04:42:15 +03:00
lzk
7066262fe5
Forensics guide addition ( #1698 )
2024-01-16 16:38:44 +03:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
Chief-Engineer
476ea14e8a
Add access logs (IC ones) ( #17810 )
2023-12-26 18:24:53 -04:00
lzk
d8cab95119
DNA and Bartender guidebooks translade ( #1643 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-12-16 02:40:55 +03:00
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
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
lzk
ceeb53647b
[Translate] Guidebooks additions ( #1184 )
2023-07-28 14:19:46 +03: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
Myakot
20b55d7af8
gbookcommits ( #17611 )
2023-06-24 14:07:25 -06:00
lapatison
95530c5c30
Various translations ( #1091 )
2023-05-26 07:32:39 +03:00
Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
Leon Friedrich
116670ae8a
Rename "Server Info" to ServerInfo ( #15436 )
2023-04-16 10:55:59 +10:00
