Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Languages #43

Merged
merged 92 commits into from
Jun 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
da76123
Fixes for universal speakers (no more walls speaking GC)
Mnemotechnician Mar 20, 2024
a95f105
Fixes for universal speakers (no more walls speaking GC)
Mnemotechnician Mar 20, 2024
728e9b1
Fixes for universal speakers (no more walls speaking GC)
Mnemotechnician Mar 20, 2024
113826b
Revert "Fixes for universal speakers (no more walls speaking GC)"
FoxxoTrystan Mar 24, 2024
6bdc514
Fixes for universal speakers (no more walls speaking GC)
Mnemotechnician Mar 20, 2024
3d86f02
Port
FoxxoTrystan Mar 24, 2024
bf80a15
Missing Default Langauges (Only Harpies duh)
FoxxoTrystan Mar 25, 2024
c65c1d3
Animals SPEAKS!
FoxxoTrystan Mar 25, 2024
c61e061
Apply suggestions from code review
Mnemotechnician Mar 30, 2024
0b7dd07
Did what the review suggested
Mnemotechnician Mar 30, 2024
54b15c1
Merge remote-tracking branch 'upstream/master' into Languages
FoxxoTrystan Mar 31, 2024
f3b2daa
abstract + yml changes
FoxxoTrystan Mar 31, 2024
381eea1
Split translator comps into separate files and pray it compiles
Mnemotechnician Apr 7, 2024
6f841fb
Refactor RadioReceiveEvent
Mnemotechnician Apr 7, 2024
cdb786c
Refactor ChatSystem & add comments
Mnemotechnician Apr 7, 2024
f9dcd71
Clean up using directives after jetbrains rider messed em up
Mnemotechnician Apr 7, 2024
4bc2c46
Merge branch 'master' into Languages
FoxxoTrystan Apr 8, 2024
076bfc3
Merge branch 'Simple-Station:master' into Languages
FoxxoTrystan Apr 24, 2024
7dff567
Tiny Fixes/Requests
FoxxoTrystan Apr 24, 2024
a0d8c08
Added the most basic of syndicate flavor
Eagle-0 Apr 25, 2024
d14461e
Synths real
Eagle-0 Apr 25, 2024
55794de
Updated Door Sprites, syndicate Dropship, Saltern, Captains Cape
Arkyfloof Apr 26, 2024
4c3724d
Fixed traitors, new synth sounds, Urist update
Eagle-0 Apr 26, 2024
e819a63
Mechs real, Synth balance, Terragov Preset
Eagle-0 Apr 27, 2024
ec92c56
Changed cargo gifts, no more centcomm, urist shuttles
Eagle-0 Apr 28, 2024
937a4d9
Resolved Test
FoxxoTrystan Apr 29, 2024
21dd8dd
Update LanguageMenuUIController.cs
FoxxoTrystan Apr 29, 2024
f6d46f8
Added new Shuttle for the Terragov faction
Reese1243 Apr 29, 2024
1baab28
added a new shuttle for the TerraGov faction
Reese1243 Apr 29, 2024
c1287b8
Fixed some announcements, centcom name change, atmosia fake
Eagle-0 Apr 29, 2024
ba7d807
Delete TerraGovernor.yml
Reese1243 Apr 30, 2024
1618f20
SyndieSaltern
VMSolidus Apr 30, 2024
c10d283
Merge pull request #3 from Eagle-0/saltern-updates
Eagle-0 Apr 30, 2024
0983aa7
Update LanguageMenuUIController.cs
FoxxoTrystan May 1, 2024
b3ad259
Merge branch 'Simple-Station:master' into Languages
FoxxoTrystan May 1, 2024
041ef46
Update LanguageMenuUIController.cs
FoxxoTrystan May 1, 2024
7452487
Update LanguageMenuUIController.cs
FoxxoTrystan May 1, 2024
2b3a807
Merge branch 'Languages' of https://github.com/FoxxoTrystan/Einstein-…
FoxxoTrystan May 1, 2024
a938832
Update LanguageMenuUIController.cs
FoxxoTrystan May 1, 2024
e66df36
Update LanguageMenuUIController.cs
FoxxoTrystan May 1, 2024
c507898
Added terragov shuttle
Reese1243 May 1, 2024
70987a9
Merge pull request #4 from Eagle-0/Blitz
Reese1243 May 1, 2024
5ce48b2
Reverting
FoxxoTrystan May 1, 2024
d5d51b6
Uhh, test, if this works accept it
Arkyfloof May 1, 2024
b47718d
Merge pull request #5 from Eagle-0/arky
Arkyfloof May 1, 2024
52c4566
swapped the Shuttle Consoles and Communications consoles to the syndi…
Reese1243 May 1, 2024
d2ca520
Mons are real, Total Catgirl removal
Eagle-0 May 1, 2024
d873884
Edited Terragov shuttle
Reese1243 May 1, 2024
8af1830
Changed Antag role timers to match Wizards Den
Reese1243 May 1, 2024
5300226
Changed Antag role timers to match Wizards Den
Reese1243 May 1, 2024
93e7218
Merge branch 'Blitz' of https://github.com/Eagle-0/Syndicate-Station …
Reese1243 May 1, 2024
873ab05
Merge branch 'master' into Blitz
Reese1243 May 2, 2024
a7fefa4
New SOM guns, broken clothing :sob:
Eagle-0 May 2, 2024
b5a6013
Fixed LoneOps time requirement to be the same as NukeOps
Reese1243 May 3, 2024
a4ecd2b
Merge branch 'master' of https://github.com/Eagle-0/Syndicate-Station
Eagle-0 May 3, 2024
875cf7b
Update LanguageMenuUIController.cs
FoxxoTrystan May 3, 2024
5201873
Merge branch 'master' into Languages
FoxxoTrystan May 3, 2024
96e1c0a
Update LanguageMenuUIController.cs
FoxxoTrystan May 3, 2024
7c2621b
Merge branch 'Languages' of https://github.com/FoxxoTrystan/Einstein-…
FoxxoTrystan May 3, 2024
5023cc4
Update LanguageMenuUIController.cs
FoxxoTrystan May 3, 2024
38060c9
Finally Fixing it
VMSolidus May 3, 2024
9f6ee28
Update LanguageMenuUIController.cs
FoxxoTrystan May 3, 2024
54dee4f
Update LanguageMenuUIController.cs
FoxxoTrystan May 3, 2024
b75939c
Fixed SOM gear
Eagle-0 May 3, 2024
87a0a87
Merge branch 'master' into Languages
FoxxoTrystan May 5, 2024
d935e80
Added HoP drip, new Terragov uplink items
Eagle-0 May 5, 2024
6234be8
UI Better and Test!
FoxxoTrystan May 6, 2024
ec9116a
Oops
FoxxoTrystan May 6, 2024
afdb7ce
Merge branch 'master' into Languages
FoxxoTrystan May 6, 2024
932bc29
SPACE!
FoxxoTrystan May 6, 2024
90f3588
Merge branch 'Languages' of https://github.com/FoxxoTrystan/Einstein-…
FoxxoTrystan May 6, 2024
f2adcee
Merge branch 'master' into Languages
FoxxoTrystan May 6, 2024
f5e8bca
Revert "Merge branch 'master' into Languages"
FoxxoTrystan May 6, 2024
c25d2ec
Update Resources/Prototypes/Entities/Objects/Devices/translator_impla…
FoxxoTrystan May 7, 2024
566d861
Update Resources/Prototypes/Entities/Objects/Devices/translator_impla…
FoxxoTrystan May 7, 2024
146c32f
Merge branch 'master' into Languages
FoxxoTrystan May 7, 2024
9cb5950
Networking OnClientSetLanguage
FoxxoTrystan May 8, 2024
f526f0a
Move LanguageSpeaker from BaseMobSpeciesOrganic to BaseMobSpecies
FoxxoTrystan May 9, 2024
0fa806c
Merge branch 'master' into Languages
FoxxoTrystan May 9, 2024
dea18f0
Merge branch 'master' into Languages
VMSolidus May 12, 2024
e0d65d4
Merge branch 'master' into Languages
VMSolidus May 12, 2024
a85ed4d
Parrots Moments
FoxxoTrystan May 12, 2024
e23dabe
Merge branch 'Simple-Station:master' into Languages
FoxxoTrystan May 13, 2024
f336f5a
Sanitize Messes!
FoxxoTrystan May 13, 2024
5ebbbc0
Merge branch 'Simple-Station:master' into Languages
FoxxoTrystan May 13, 2024
b9850d8
Merge branch 'master' into Languages
FoxxoTrystan May 28, 2024
19697bb
Merge branch 'master' into Languages
FoxxoTrystan Jun 3, 2024
789cf4e
Apply (some) suggestions from code review
Mnemotechnician Jun 4, 2024
1d7d5d2
Please, for the sake of god and all that's holy, never ever creature …
Mnemotechnician Jun 4, 2024
f6f6679
More refactoring & linter fixes
Mnemotechnician Jun 4, 2024
c4cec66
Lots of refactoring; partially fixed language menu desync
Mnemotechnician Jun 4, 2024
7581981
Update Content.Server/Chat/Systems/ChatSystem.cs
FoxxoTrystan Jun 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
New SOM guns, broken clothing 😭
  • Loading branch information
Eagle-0 committed May 2, 2024
commit a7fefa4b764e04fcf9da8cd8e8b3e609fa75d78b
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
@@ -454,3 +454,19 @@
soundHit:
collection: BoxingHit
animation: WeaponArcFist

# Sons of Mars

- type: entity
parent: ClothingHandsGlovesColorBlack
id: ClothingHandsGlovesSOM
name: Martian Combat Gloves
description: These tactical gloves are perfect for choking out Terran opressors.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/Boxing/somgloves.rsi
- type: Clothing
sprite: Clothing/Hands/Gloves/Boxing/somgloves.rsi
- type: Insulated
- type: Fiber
fiberMaterial: fibers-insulative
22 changes: 22 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
@@ -402,3 +402,25 @@
- type: Tag
tags:
- HidesHair

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHelmetLeaderSOM
name: SOM Leader Helmet
description: A robust helmet for a robust leader.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/somleaderhelm.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/somleaderhelm.rsi
- type: IngestionBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: Tag
tags:
- HidesHair
23 changes: 23 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
Original file line number Diff line number Diff line change
@@ -399,3 +399,26 @@
- type: ExplosionResistance
damageCoefficient: 0.9
- type: GroupExamine

- type: entity
parent: ClothingOuterBaseLarge
id: ClothingSoMHeavy
name: SoM Heavy Armor
description: The Sons of Mars most protective armor. Nothing's getting through this.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Misc/sonsheavy.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Misc/sonsheavy.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.3
Slash: 0.3
Piercing: 0.3
Heat: 0.3
Radiation: 0.3
Caustic: 0.3
- type: ExplosionResistance
damageCoefficient: 0.5
- type: GroupExamine
16 changes: 15 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
@@ -231,4 +231,18 @@
- type: Sprite
sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
- type: Clothing
sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi

# Sons of Mars

- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesSOM
name: Martian Boots
description: Fits Terran heads perfectly
components:
- type: Sprite
sprite: Clothing/Shoes/Boots/somboots.rsi
- type: Clothing
sprite: Clothing/Shoes/Boots/somboots.rsi
- type: Matchbox
Original file line number Diff line number Diff line change
@@ -706,3 +706,36 @@
- type: Appearance
- type: StaticPrice
price: 750

# Sons of Mars

- type: entity
name: VX-32 Charger
parent: BaseWeaponBattery
id: WeaponVolkiteRifle
description: An advanced energy weapon used by the Sons of Mars. Turns Terrans into smoldering piles of ash.
components:
- type: Item
size: Ginormous
- type: MultiHandedItem
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8
- type: HeldSpeedModifier
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/vol_rifle.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Gun
fireRate: 1.5
soundGunshot:
path: /Audio/Weapons/plasma_cutter.ogg
params:
pitch: 2
- type: ProjectileBatteryAmmoProvider
proto: BulletEnergyGunVolkite
fireCost: 32
- type: Battery
maxCharge: 1440
startingCharge: 1440
Original file line number Diff line number Diff line change
@@ -1034,3 +1034,52 @@
soundHit:
path: "/Audio/Weapons/tap.ogg"
soundForce: true

# Sons of Mars

- type: entity
name: Volkite bolt
id: BulletEnergyGunVolkite
parent: BaseBullet
noSpawn: true
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: orange
- type: Ammo
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
hard: false
mask:
- Opaque
fly-by: *flybyfixture
- type: Projectile
impactEffect: BulletImpactEffectRedDisabler
damage:
types:
Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
soundHit:
collection: MeatLaserImpact
- type: PointLight
enabled: true
color: "#ffa500"
radius: 2.0
energy: 7.0
- type: IgniteOnCollide
fireStacks: 3.5
Original file line number Diff line number Diff line change
@@ -211,3 +211,55 @@
whitelist:
tags:
- CartridgeRifle

# Sons of Mars

- type: entity
name: V-31 assault rifle
parent: BaseWeaponRifle
id: WeaponRifleV31
description: The primary rifle of the Sons of Mars. Uses .30 rifle ammo.
components:
- type: Wieldable
- type: GunWieldBonus
minAngle: -20
maxAngle: -25
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/som_rifle.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Gun
minAngle: 20
maxAngle: 25
fireRate: 5
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineLightRifle
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineLightRifle
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifle
priority: 1
whitelist:
tags:
- CartridgeLightRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: Appearance


Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Hands/Gloves/somgloves.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by CryptoSporidium1 (github) for ss14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by patogrone (ss14 discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"direction": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Shoes/Boots/somboots.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading