Morb0
|
0eba25c0eb
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
|
2024-10-15 17:04:40 +03:00 |
|
github-actions[bot]
|
56ba3fdf09
|
Update Credits (#32774)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-10-13 18:06:40 +02:00 |
|
Morb0
|
3ab6d3ef71
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/Engineering/chief_engineer.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/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
|
2024-10-04 19:47:54 +03:00 |
|
github-actions[bot]
|
8833cf624a
|
Update Credits (#32516)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-10-02 01:29:00 +02:00 |
|
github-actions[bot]
|
4f5255bdcb
|
Update Credits (#32362)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-09-22 13:19:38 +10:00 |
|
Morb0
|
34d3cf6293
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
|
2024-09-19 10:30:01 +03:00 |
|
github-actions[bot]
|
940e791b13
|
Update Credits (#32178)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-09-15 11:51:05 +10:00 |
|
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 |
|
github-actions[bot]
|
e2bbd59985
|
Update Credits (#31937)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-09-07 21:41:52 -06:00 |
|
Morb0
|
0f339baab5
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
|
2024-09-01 22:20:47 +03:00 |
|
github-actions[bot]
|
5df3454db6
|
Update Credits (#31692)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-08-31 20:33:21 -04:00 |
|
Morb0
|
721f7bfecf
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
|
2024-08-28 16:40:36 +03:00 |
|
github-actions[bot]
|
1ef67e023b
|
Update Credits (#31409)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-08-25 11:54:40 +10:00 |
|
Morb0
|
8572f60456
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
# Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
|
2024-08-19 08:18:59 +03:00 |
|
github-actions[bot]
|
16e1c23ffe
|
Update Credits (#31141)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-08-17 22:09:00 -04:00 |
|
Morb0
|
acf1ff4ec0
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
|
2024-08-12 13:18:43 +03:00 |
|
github-actions[bot]
|
84217011a9
|
Update Credits (#30891)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-08-11 11:45:49 +10:00 |
|
Morb0
|
7990ca8f46
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.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/Engineering/chief_engineer.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/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
|
2024-08-08 01:38:43 +03:00 |
|
github-actions[bot]
|
6e8f8d706a
|
Update Credits (#30620)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-08-03 21:01:41 -04:00 |
|
Arthur Asimov
|
b97dcf215a
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# .github/labeler.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
|
2024-08-02 11:29:44 +03:00 |
|
github-actions[bot]
|
e3d7c1bd6e
|
Update Credits (#30420)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-07-27 21:36:00 -04:00 |
|
Morb0
|
8ffde2eea4
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
|
2024-07-14 12:15:16 +03:00 |
|
github-actions[bot]
|
a06309b964
|
Update Credits (#30026)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-07-13 20:26:39 -04:00 |
|
Morb0
|
076783b977
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Locale/en-US/chemistry/components/mixing-component.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/ServerInfo/Guidebook/Mobs/Diona.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Science/Technologies.xml
# Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
# Resources/Textures/Tiles/attributions.yml
|
2024-07-08 13:41:28 +03:00 |
|
github-actions[bot]
|
0098d71717
|
Update Credits (#29784)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-07-07 13:50:12 +10:00 |
|
Morb0
|
a7492708b6
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Datasets/ion_storm.yml
|
2024-07-01 14:55:33 +03:00 |
|
github-actions[bot]
|
af78c75d66
|
Update Credits (#29594)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-06-29 20:31:18 -04:00 |
|
Morb0
|
da333a1972
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
|
2024-06-27 13:40:52 +03:00 |
|
github-actions[bot]
|
f15ccea6dd
|
Update Credits (#29363)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-06-23 02:29:52 +02:00 |
|
Morb
|
2484a01a39
|
Revert "Replace TTS provider" (#2289)
|
2024-06-18 13:00:33 +03:00 |
|
github-actions[bot]
|
ddd7008bfe
|
Update Credits (#29065)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-06-15 20:25:34 -04:00 |
|
Pieter-Jan Briers
|
307a0428c7
|
Shut up a child throwing a tantrum (#28538)
|
2024-06-03 03:05:18 +02:00 |
|
github-actions[bot]
|
da6a1bbdd4
|
Update Credits (#28493)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-06-02 03:03:51 +02:00 |
|
github-actions[bot]
|
d99e73ed92
|
Update Credits (#28288)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-05-25 20:32:32 -04:00 |
|
github-actions[bot]
|
676fc22eb4
|
Update Credits (#28124)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-05-19 03:33:41 +02:00 |
|
github-actions[bot]
|
db2beafd59
|
Update Credits (#27938)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-05-11 21:23:48 -04:00 |
|
github-actions[bot]
|
2f3f917007
|
Update Credits (#27681)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-05-04 21:23:45 -04:00 |
|
DrSmugleaf
|
c57164211b
|
Update Patrons.yml (#27560)
|
2024-04-30 18:20:39 -07:00 |
|
github-actions[bot]
|
02d2611d94
|
Update Credits (#27413)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-04-27 18:21:52 -07:00 |
|
github-actions[bot]
|
d2fb5130c9
|
Update Credits (#27192)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-04-21 04:13:08 +02:00 |
|
github-actions[bot]
|
1f4a01aa38
|
Update Credits (#26938)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-04-13 21:46:55 -04:00 |
|
github-actions[bot]
|
857f29f583
|
Update Credits (#26787)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-04-06 21:23:39 -04:00 |
|
DrSmugleaf
|
7a4a0bcc84
|
Update Patrons.yml (#26578)
|
2024-03-31 13:01:52 +11:00 |
|
github-actions[bot]
|
602d30c908
|
Update Credits (#26589)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-03-31 12:58:47 +11:00 |
|
github-actions[bot]
|
4c840a7e6a
|
Update Credits (#26373)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-03-24 02:47:10 +01:00 |
|
github-actions[bot]
|
22477a1f24
|
Update Credits (#26196)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-03-16 18:19:24 -07:00 |
|
github-actions[bot]
|
37ece88d09
|
Update Credits (#25953)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-03-11 12:57:39 +11:00 |
|
github-actions[bot]
|
bfa70a59e3
|
Update Credits (#25792)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-03-03 17:43:44 +11:00 |
|
DrSmugleaf
|
4301dbb9eb
|
Update Patrons.yml (#25727)
|
2024-02-29 15:24:25 -07:00 |
|
github-actions[bot]
|
431f0bd640
|
Update Credits (#25532)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
|
2024-02-24 20:28:11 -05:00 |
|