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
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
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
