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
Flareguy
2179f43e0f
Adds a bunch of new game tips ( #16696 )
...
* tips update
* dodeydodedode
* oops
* well... Bitch
* gramer
* fode
* well... bitchas
2023-05-23 04:00:59 -06:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
PixelTK
8269a500b3
Arachnid species ( #13945 )
2023-04-30 02:19:06 +10:00
lapatison
263ade6ba8
Tranlate Upstream #1023 ( #1029 )
2023-04-28 07:34:00 -07:00
lapatison
d82d0f8c90
Remove some generate names ( #1025 )
2023-04-27 14:21:38 -07:00
lapatison
44156f9c48
Translation of Space Ninja names dataset ( #998 )
2023-04-19 00:17:47 -07: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
Scribbles0
e24d0b4e44
[Antag] Lone Ops ( #14647 )
...
* loneops event, prototype stuff, striker shuttle, and nukeops rule changes
* newline
* shuttle attributions
* optimizations and tweaks
* bugfix and mutually exclusive with nukeops
* bugfix but better
* fix nukie planet spawning when defaulting to extended
* remove hypospray protection references
* ghost_roles.yml edit thingy
* remove .orig file
2023-04-17 00:00:43 -06:00
Morb
861e9d349c
Fix tips length ( #841 )
2023-02-18 23:48:54 -08:00
Morb
f6bcca2733
Revert "Remove too long tip strings" ( #836 )
2023-02-18 19:52:24 -08:00
Morbo
b1741d53bd
Remove too long tip strings
2023-02-15 07:17:34 +03:00
lapatison
b97225cf52
Tips and Fortunes locale ( #829 )
...
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2023-02-14 17:06:37 -08:00
Morbo
1836b0c0c3
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-02-05 07:23:48 +03:00
Nemanja
e74fe2d87b
Update tips.yml ( #13936 )
2023-02-04 21:31:18 -06:00
Morbo
de5cc32101
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-31 04:47:46 +03:00
lapatison
f06019b1ec
ERT last name tweak ( #758 )
...
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2023-01-29 17:41:48 -08:00
Whisper
0b936d8a2d
Cleaned up syndicate names. ( #13768 )
2023-01-28 11:09:22 -08:00
Morbo
f3bd98ceed
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Content.Shared/Humanoid/HumanoidComponent.cs
# Content.Shared/Humanoid/SharedHumanoidSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
2023-01-25 22:46:52 +03:00
lapatison
fca0be1c1a
More cookie fortunes ( #13584 )
2023-01-22 09:20:17 -04:00
Morbo
35ea494981
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Doors/Components/AirlockComponent.cs
# Content.Server/Fax/FaxMachineComponent.cs
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-01-17 22:57:53 +03:00
Kara
8550baa218
Tips extensions ( #13551 )
2023-01-17 12:43:51 -06:00
Kara
52e50bd34f
Tips system ( #13509 )
...
* dataset
* cvar
* tips system
* oops
* even higher
* peptide
* dataset cvar
2023-01-16 10:52:52 -06:00
Whisper
f3b8ff243d
Random name cleanup ( #13392 )
2023-01-10 23:45:06 +11:00
Kara
c64b8cec4c
Remove "Goebbles" from last name list ( #13020 )
2022-12-13 16:37:24 -08:00
Morbo
f9229d979c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
2022-12-02 06:42:59 +03:00
Paul Ritter
3884c4d3db
serv4 + submodule update ( #12740 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-11-27 19:25:55 +01:00
lapatison
ef940ae031
Translate Upstream #526 ( #527 )
...
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2022-11-09 09:43:48 -08:00
Morbo
d7d2dd96c0
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/PDA/PDAMenu.xaml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
2022-11-09 03:02:01 +03:00
Nemanja
fd9bedae9a
New Species: Diona ( #11497 )
...
* new species: Diona
* more diona stuff
* dey breathing now
* test fixe
* fix a merge
* now actually fix the merge
* foobar
* oversight
* ok now the rest of em
2022-11-08 14:26:59 -06:00
lapatison
f7b49c46a7
Translate Upstream #463 ( #468 )
...
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2022-10-18 05:24:47 -07:00
Morbo
57d8a459bb
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Sex.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
