]> git.smokeofanarchy.ru Git - space-station-14.git/commit
pirate content (#11799)
authorbrainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Mon, 10 Apr 2023 05:47:40 +0000 (06:47 +0100)
committerGitHub <noreply@github.com>
Mon, 10 Apr 2023 05:47:40 +0000 (22:47 -0700)
commit8e817e2b979803eff85ff2eea5b8a243dd71ecb5
tree2524a871cfab4612b59d4cccc61dbcf5c24d101d
parent317a4013eb93d1c0b2280834dc837e59bc83e444
pirate content (#11799)

* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
97 files changed:
Content.Server/Speech/Components/PirateAccentComponent.cs [new file with mode: 0644]
Content.Server/Speech/EntitySystems/PirateAccentSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/accent/pirate.ftl [new file with mode: 0644]
Resources/Maps/Shuttles/pirate.yml
Resources/Prototypes/Accents/word_replacements.yml
Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
Resources/Prototypes/Catalog/Fills/Crates/antag.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Resources/Prototypes/Roles/Antags/pirate.yml [new file with mode: 0644]
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/ball.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/ball.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/foam_icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/crate.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/crate_door.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/crate_icon.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/crate_open.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/sparking.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/piratechest.rsi/welded.png [new file with mode: 0644]