Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
Ubaser
8b107b5a9f
Update tips ( #23611 )
...
* add
* fix
2024-01-06 20:19:09 -05:00
Tayrtahn
2de5570094
Fix tiny grammar/spelling issues ( #23534 )
2024-01-04 23:35:31 +01: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
LankLTE
ed997dc5be
remove racism ( #23039 )
...
* Remove only 'species' is crew rules
* hit space one too many times
2023-12-27 23:30:24 +11:00
lzk
b8ab292dea
Move corvax datasets to corvax folder ( #1680 )
2023-12-25 21:42:22 +03:00
lzk
79ed21cf94
Borg locale ( #1663 )
2023-12-25 01:45:37 +03:00
SpaceyLady
9103061ac0
Correct spelling mistakes for daily tips ( #22893 )
...
Update tips.yml
2023-12-23 07:57:58 -06:00
Kara
ad97580727
Rename Miasma to Ammonia ( #22791 )
...
* Rename Miasma to Ammonia
* Namespace changes
* Map change????? why
2023-12-20 21:19:50 -07:00
lzk
52f0b4eac3
Dataset ops p2 ( #1627 )
2023-12-12 11:30:07 +03:00
Morb0
62a32143ae
Add vulp names
2023-12-12 01:00:58 +03:00
Morb0
29a7082223
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
lzk
4035b76652
Ert names ops ( #22246 )
...
* names
* humanoids
2023-12-11 02:27:05 -07:00
lzk
d205905fdd
Datasets ops part 1 ( #1613 )
2023-12-08 16:51:51 +03:00
lzk
013011af24
Translate Upstream #1580 ( #1583 )
...
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-11-27 01:08:25 +03:00
lzk
808ed846d1
Update Operation_suffix.yml ( #21882 )
2023-11-24 14:53:18 -05:00
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
lzk
605e7f7dda
:trollface: ( #21724 )
2023-11-17 10:44:21 -05:00
lzk
fcec440fb6
Lil diona names expansion ( #1535 )
2023-11-17 17:15:30 +03:00
2013HORSEMEATSCANDAL
23b54dae79
Operations ( #21154 )
...
* Creates an operation name when Nukies spawn.
* Fixed each nukie getting a different name
* Fixed it again for real this time
* commit name
* Revert "fix (#20719 )"
This reverts commit bfa301b53e
2023-11-16 14:04:50 -07:00
lapatison
cd4f96dec8
Upstream #1532 locale Patch ( #1536 )
2023-10-30 02:37:31 +03:00
lapatison
2e1e434b11
Translate #1532 ( #1533 )
2023-10-29 12:42:07 +03:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
deltanedas
b9af991e04
Ion storm event ( #20277 )
...
* ion storm event prototype + locale
* add lawsets
* use lawsets, make borgs ion storm targets
* ion storm rule and ion storm target
* lawset prototype
* use lawsets
* update silicon law system to use lawsets and support ion storm event
* new toys
* fix
* more fix
* fixy
* ion storm admin logging
* assigning laws makes borg provide its own laws, other stuff
* 1h reoccurence
* 50% chance
* better call saul
* emagLaws is required
* add announcment audio
* fixy
* family friendly gaming
* fixy
* address reviews
* fixy
* more fixy and no erp
* pro
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 22:40:13 -04:00
deltanedas
88a29450d9
give roundstart borgs names ( #20081 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 00:00:08 +11:00
Flareguy
0c217c8b7e
Minor tips update ( #20505 )
2023-09-26 09:13:55 -08:00
lzk
6847a8671c
Translate rat_king_commands.yml ( #1456 )
2023-09-25 15:35:29 +03:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Nemanja
f16ff3a2d9
Rat King Milsim + Buffs ( #20190 )
...
* rat king update
* rummaging
* buuuuunnnnncccchhh of shit
* the last of it
* make rat servants not ghost roles
* pissma buff and cooldown
2023-09-22 15:01:05 -05:00
lzk
9739909a6e
Datasets translate ( #1411 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-09-19 12:20:08 +03:00
deltanedas
7d9550bc55
remove sus codewords ( #20060 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 00:37:43 -05:00
lzk
9832320243
Remove some reptilian name ( #1403 )
2023-09-10 23:54:06 +03:00
lapatison
09778a74bc
Translate Upstream #1355 and #1358 ( #1360 )
...
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2023-08-23 07:28:40 +03:00
Morb0
4516e1ceef
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
2023-08-22 08:22:56 +03:00
Nemanja
3f2ea17bb7
fix species skin colors ( #19417 )
2023-08-21 19:05:24 -07:00
Errant
7527036cf1
Laser namechange and some buffs ( #18951 )
...
* Laser naming
* More laser changes
2023-08-13 01:18:49 -06:00
lzk
8b55947280
Translation of Nian names ( #1290 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-08-11 02:21:39 +03:00
Morb0
1f35458078
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Player/diona.yml
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/dark_plastic.png
# Resources/Textures/Tiles/plastic.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white_plastic.png
2023-08-05 05:10:09 +03:00
Vordenburg
4821003972
Add names for moths ( #18618 )
2023-08-04 10:59:53 +10:00
lzk
fb3ddf145b
[Translate] Names dataset ( #1061 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-07-28 14:22:17 +03:00
lapatison
5994754a2f
Hide a tip leading to a ban, spelling errors ( #1220 )
2023-07-25 16:52:09 +03:00
faint
0e1e7668a3
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Procedural/salvage_rewards.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
# Resources/Textures/Tiles/attributions.yml
2023-07-14 14:40:25 +03:00
Emisse
65d069a203
sussy toolbox 2tc again ( #18000 )
...
* 2 tc
* digusting
2023-07-12 13:47:35 -06: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
lzk
205ac48710
Update tips.yml ( #17223 )
2023-06-08 13:58:51 -06:00
lzk
fad06853ff
Commented some tips longer than max symbols amount ( #1120 )
2023-06-06 16:22:03 +03:00
lzk
f02cfc94e4
Tips translation + minor translation fixes ( #1108 )
...
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2023-06-05 16:39:13 +03:00
lzk228
4783a655a4
remove useless tip ( #17000 )
2023-06-01 03:09:44 -07:00
metalgearsloth
57858f802f
Shuttle drone improvements ( #16931 )
2023-05-31 11:13:02 +10:00
faint
34d03aa1df
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Structures/hydro_tray.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-05-25 00:18:11 +03:00
