]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
23 months agoNew Lobbyscreen Art (#23943)
Alekshhh [Thu, 11 Jan 2024 23:28:13 +0000 (01:28 +0200)]
New Lobbyscreen Art (#23943)

sos

23 months agoHeadphones can be turned on (#23882)
themias [Thu, 11 Jan 2024 23:25:27 +0000 (18:25 -0500)]
Headphones can be turned on (#23882)

Toggle headphones

23 months agoatlas update (#23938)
deltanedas [Thu, 11 Jan 2024 23:24:39 +0000 (23:24 +0000)]
atlas update (#23938)

Co-authored-by: deltanedas <@deltanedas:kde.org>
23 months agomedsec hud is no longer a filler (#23934)
icekot8 [Thu, 11 Jan 2024 23:22:42 +0000 (02:22 +0300)]
medsec hud is no longer a filler (#23934)

* medsec hud

* medsec hud

* fix

23 months ago(Add) black cap and some contraband (#23933)
Jackal298 [Thu, 11 Jan 2024 23:19:58 +0000 (02:19 +0300)]
(Add) black cap and some contraband (#23933)

* Add black cap and some contraband

* Bot fix

* bot fix 2

* Price increases

23 months agoGemini maint power (#23932)
Aexxie [Thu, 11 Jan 2024 23:18:59 +0000 (17:18 -0600)]
Gemini maint power (#23932)

Connects an LV to the maints west of science, powering them.

23 months agoBulk plushie lizard crate (#23927)
Kukutis96513 [Thu, 11 Jan 2024 23:18:28 +0000 (01:18 +0200)]
Bulk plushie lizard crate (#23927)

* make the bulk crate order

* added space lizard plushies to bulk crate

23 months agodedicated burn and shock meds (#23941)
deltanedas [Thu, 11 Jan 2024 23:17:23 +0000 (23:17 +0000)]
dedicated burn and shock meds (#23941)

* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
23 months agoAdds winterdrobe to cluster (#23928)
Aexxie [Thu, 11 Jan 2024 23:16:46 +0000 (17:16 -0600)]
Adds winterdrobe to cluster (#23928)

23 months agoSmall clamp for fland cargo (#23947)
Arendian [Thu, 11 Jan 2024 23:15:13 +0000 (00:15 +0100)]
Small clamp for fland cargo (#23947)

23 months agoStop the inevitability of death from misgendering you (#23949)
Nemanja [Thu, 11 Jan 2024 23:12:32 +0000 (18:12 -0500)]
Stop the inevitability of death from misgendering you (#23949)

Fix rotting messages and make them use pronouns

23 months agoRespite and minor changes to mercenary items (#23783)
Jackal298 [Thu, 11 Jan 2024 22:47:51 +0000 (01:47 +0300)]
Respite and minor changes to mercenary items (#23783)

* Respite and minor changes to mercenary items

This is try number three, everything should be fine this time

* Fix meta

* Fix bot

* Fix bot 2

* Fix meta 2

* Fix meta 3

23 months agoFix clumsy defib debug assert (#23930)
themias [Thu, 11 Jan 2024 21:58:25 +0000 (16:58 -0500)]
Fix clumsy defib debug assert (#23930)

* Fix clumsy defib debug assert

* don't need to specify null

23 months agoBluespace Anomaly Admin Logs (#23942)
Trevor Day [Thu, 11 Jan 2024 21:56:06 +0000 (13:56 -0800)]
Bluespace Anomaly Admin Logs (#23942)

Add bluespace anomaly teleportation logs.

23 months agoFix light tube broken state (#23939)
Flareguy [Thu, 11 Jan 2024 18:34:37 +0000 (12:34 -0600)]
Fix light tube broken state (#23939)

fix light tube broken state

23 months agoSplit cargo shuttle to its own component (#23926)
metalgearsloth [Thu, 11 Jan 2024 15:53:00 +0000 (02:53 +1100)]
Split cargo shuttle to its own component (#23926)

* Split cargo shuttle to its own component

If mappers want 1 morbillion of them this is easier to manage.

* balls

23 months agoOptimise the puddle system to reach an equilibrium quickly. (#23776)
mr-bo-jangles [Thu, 11 Jan 2024 13:22:56 +0000 (13:22 +0000)]
Optimise the puddle system to reach an equilibrium quickly. (#23776)

* Optimise the puddle system to reach an equilibrium quickly.

* Remove use of Linq
Try to be more efficient with Tuples

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
23 months agoAdd doors to the station map (#23639)
Nemanja [Thu, 11 Jan 2024 13:14:20 +0000 (08:14 -0500)]
Add doors to the station map (#23639)

* Add doors to the navmap

* tweaksies

* gah

* draw primitive

* draw primitive? at least take me out to dinner first!

* Update Content.Client/Pinpointer/UI/NavMapControl.cs

* casualties

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
23 months agoOnly hide ruins labels (#23925)
metalgearsloth [Thu, 11 Jan 2024 12:56:07 +0000 (23:56 +1100)]
Only hide ruins labels (#23925)

23 months agoFix tips (#23920)
Ubaser [Thu, 11 Jan 2024 10:55:24 +0000 (21:55 +1100)]
Fix tips (#23920)

23 months agorevert core cargo shuttle for now (#23921)
Emisse [Thu, 11 Jan 2024 10:54:57 +0000 (03:54 -0700)]
revert core cargo shuttle for now (#23921)

* Delete Resources/Maps/Shuttles/cargo_core.yml

* Update core.yml

* Update base.yml

* Update nanotrasen.yml

23 months agocrusher rebalanceing (#23916)
Emisse [Thu, 11 Jan 2024 09:09:33 +0000 (02:09 -0700)]
crusher rebalanceing (#23916)

* Update mining.yml

* Update mining.yml

* glaive LS is actually fine

* crusher faster than glaive

* Update mining.yml

* Update mining.yml

23 months agoUranium & AP magazine and projectile sprites (#23914)
IProduceWidgets [Thu, 11 Jan 2024 08:01:41 +0000 (03:01 -0500)]
Uranium & AP magazine and projectile sprites (#23914)

Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.

23 months agoreach update (#23915)
Emisse [Thu, 11 Jan 2024 08:00:43 +0000 (01:00 -0700)]
reach update (#23915)

* reach update

* ape board

* Update reach.yml

* chimp + recharger

* chef vend

23 months agomachine parts + power cell resprite (#23913)
Nemanja [Thu, 11 Jan 2024 06:06:01 +0000 (01:06 -0500)]
machine parts + power cell resprite (#23913)

* machine parts + power cell resprite

* logic fix

23 months agoremove 1 chemist from gemini (#23909)
Emisse [Thu, 11 Jan 2024 03:59:27 +0000 (20:59 -0700)]
remove 1 chemist from gemini (#23909)

Update gemini.yml

23 months agobagel update (#23905)
Emisse [Thu, 11 Jan 2024 00:14:11 +0000 (17:14 -0700)]
bagel update (#23905)

23 months agoThrottle MagicMirror do_afters (#23867)
metalgearsloth [Thu, 11 Jan 2024 00:08:42 +0000 (11:08 +1100)]
Throttle MagicMirror do_afters (#23867)

Doesn't fix the gross network spam but that's for later.

23 months agomarathon update (#23904)
Emisse [Thu, 11 Jan 2024 00:07:48 +0000 (17:07 -0700)]
marathon update (#23904)

23 months agoremove ame parts from cargo (#23903)
Emisse [Thu, 11 Jan 2024 00:07:41 +0000 (17:07 -0700)]
remove ame parts from cargo (#23903)

23 months agoMakes lights use the "old" light fixture sprites (#23898)
Flareguy [Thu, 11 Jan 2024 00:07:14 +0000 (18:07 -0600)]
Makes lights use the "old" light fixture sprites (#23898)

returns the ss13 light fixture sprites

23 months agoFix admin log key order. (#23052)
Pieter-Jan Briers [Thu, 11 Jan 2024 00:03:25 +0000 (01:03 +0100)]
Fix admin log key order. (#23052)

The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round.

23 months agomake intercoms draw above table (#23897)
Emisse [Wed, 10 Jan 2024 23:05:59 +0000 (16:05 -0700)]
make intercoms draw above table (#23897)

Update intercom.yml

23 months agoFix tranquiliser shells not working (#23886)
nikthechampiongr [Wed, 10 Jan 2024 23:02:37 +0000 (01:02 +0200)]
Fix tranquiliser shells not working (#23886)

* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02a872f0aaff84f4556b83d3c6f835ef which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids

23 months agoaspid update (#23872)
lzk [Wed, 10 Jan 2024 22:42:32 +0000 (23:42 +0100)]
aspid update (#23872)

aspid

- connected missed external airlocks
- replaced water tank on hight-capacity water tank at jani room

23 months agobagel update (#23870)
lzk [Wed, 10 Jan 2024 22:42:15 +0000 (23:42 +0100)]
bagel update (#23870)

bagel

- connected missed external airlocks
- removed vendor mapped names
- skub

23 months agoGemini Hotfix (#23869)
luckyshotpictures [Wed, 10 Jan 2024 22:41:43 +0000 (23:41 +0100)]
Gemini Hotfix (#23869)

hotfix hotfix hotfix

23 months agobox update (#23871)
lzk [Wed, 10 Jan 2024 22:41:29 +0000 (23:41 +0100)]
box update (#23871)

box

- removed mapped vendor names
- connected missed external airlocks

23 months agoFix borg becoming emag immune if emag attempted with panel closed. (#23729)
Arendian [Wed, 10 Jan 2024 22:01:38 +0000 (23:01 +0100)]
Fix borg becoming emag immune if emag attempted with panel closed. (#23729)

* Fix borg becoming emag immune if emag attempted with panel closed.

* new event

* removed code added in accessreader

* fix emag 1984

23 months agoAghosts and other powerful beings no longer burn their hands on lights. (#23879)
nikthechampiongr [Wed, 10 Jan 2024 21:39:56 +0000 (23:39 +0200)]
Aghosts and other powerful beings no longer burn their hands on lights. (#23879)

Make aghosts and other things that can't take burn damage not burn their
hand when changing lightbolbs

23 months agoFix roller skates debug assert (#23876)
Arendian [Wed, 10 Jan 2024 21:38:24 +0000 (22:38 +0100)]
Fix  roller skates debug assert (#23876)

Networkedcomponent

23 months agoFixed opened cargo airlock sprite (#23889)
sneb [Wed, 10 Jan 2024 21:12:46 +0000 (16:12 -0500)]
Fixed opened cargo airlock sprite (#23889)

fix cargo door open sprite

23 months agoFix flippo sprite layer (#23877)
themias [Wed, 10 Jan 2024 15:58:01 +0000 (10:58 -0500)]
Fix flippo sprite layer (#23877)

23 months agoFix ruins being added to station grid (#23865)
metalgearsloth [Wed, 10 Jan 2024 12:44:09 +0000 (23:44 +1100)]
Fix ruins being added to station grid (#23865)

23 months agoFix tiledef reloads AKA void planet (#23864)
metalgearsloth [Wed, 10 Jan 2024 12:28:42 +0000 (23:28 +1100)]
Fix tiledef reloads AKA void planet (#23864)

23 months agoRod/Transit Evacuation shuttle update (#23862)
Ubaser [Wed, 10 Jan 2024 12:14:46 +0000 (23:14 +1100)]
Rod/Transit Evacuation shuttle update (#23862)

* add

* update

23 months agoShow how close bodies are to rotting (#23530)
Guillaume E [Wed, 10 Jan 2024 12:00:21 +0000 (13:00 +0100)]
Show how close bodies are to rotting (#23530)

* Show how close bodies are to rotting

When examining a dead body, you will be able to see of close
it is to rotting.

 - "It still looks fresh.", in the first third of the pre-rot period
 - "It looks ripe.", in the second third
 - "It's starting to look bad.", in the last third

This could help players prioritize medical care.

* Alter the wording of the pre-rot indicator

* Use numeric rotting stages in FTL

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
23 months agoEnable worldgen on WD (#23861)
metalgearsloth [Wed, 10 Jan 2024 11:45:00 +0000 (22:45 +1100)]
Enable worldgen on WD (#23861)

23 months agoMoths get insect blood (#23671)
Ubaser [Wed, 10 Jan 2024 11:42:20 +0000 (22:42 +1100)]
Moths get insect blood (#23671)

* ya

* mothroach

* update

* fix

* fixe

* add

23 months agoUpdate Core (#23860)
Ubaser [Wed, 10 Jan 2024 11:39:38 +0000 (22:39 +1100)]
Update Core (#23860)

add

23 months agoSyndie elite uplink (#23859)
Emisse [Wed, 10 Jan 2024 11:33:10 +0000 (04:33 -0700)]
Syndie elite uplink (#23859)

* elite suit store

* eek

* dont drink

23 months agoHide ruins spawns (#23857)
metalgearsloth [Wed, 10 Jan 2024 11:15:48 +0000 (22:15 +1100)]
Hide ruins spawns (#23857)

* Hide ruins spawns

* Update count

* Add naming

23 months agomarton fix arrivals (#23855)
Emisse [Wed, 10 Jan 2024 10:41:52 +0000 (03:41 -0700)]
marton fix arrivals (#23855)

* marathon update

* wrong version

23 months agoRad suit swag and toggleable now (#23854)
Emisse [Wed, 10 Jan 2024 09:54:29 +0000 (02:54 -0700)]
Rad suit swag and toggleable now (#23854)

* troll

* Update hoods.yml

* Update hoods.yml

* Update suits.yml

* Update engineer.yml

* Update migration.yml

* Update emergency.yml

* forgor

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
23 months agogps can go inm belt (#23853)
Emisse [Wed, 10 Jan 2024 09:21:42 +0000 (02:21 -0700)]
gps can go inm belt (#23853)

* Update belts.yml

* Update gps.yml

* Update tags.yml

* Update belts.yml

23 months agoFix storage state (#23852)
metalgearsloth [Wed, 10 Jan 2024 09:07:35 +0000 (20:07 +1100)]
Fix storage state (#23852)

slughands

23 months agoAdds footstep sounds to tables (#23851)
deathride58 [Wed, 10 Jan 2024 08:48:38 +0000 (03:48 -0500)]
Adds footstep sounds to tables (#23851)

adds footstep sounds to tables

23 months agomore tarantula changes (#23816)
Mr. 27 [Wed, 10 Jan 2024 08:30:39 +0000 (03:30 -0500)]
more tarantula changes (#23816)

word

23 months agoFix objects tab not showing nents (#23837)
metalgearsloth [Wed, 10 Jan 2024 08:30:20 +0000 (19:30 +1100)]
Fix objects tab not showing nents (#23837)

* Fix objects tab not showing nents

* Fix everything

23 months agoStationstation update (#23848)
Emisse [Wed, 10 Jan 2024 08:29:49 +0000 (01:29 -0700)]
Stationstation update (#23848)

* stationstation update

* stationstation

23 months agoaspid update (#23847)
Emisse [Wed, 10 Jan 2024 07:49:46 +0000 (00:49 -0700)]
aspid update (#23847)

* aspid update

* remove free glaive

23 months agometa update (#23846)
Emisse [Wed, 10 Jan 2024 07:49:39 +0000 (00:49 -0700)]
meta update (#23846)

23 months agomarathon update (#23845)
Emisse [Wed, 10 Jan 2024 07:49:31 +0000 (00:49 -0700)]
marathon update (#23845)

23 months agofland update (#23844)
Emisse [Wed, 10 Jan 2024 07:49:24 +0000 (00:49 -0700)]
fland update (#23844)

23 months agobox update (#23843)
Emisse [Wed, 10 Jan 2024 07:49:17 +0000 (00:49 -0700)]
box update (#23843)

23 months agobagel update (#23842)
Emisse [Wed, 10 Jan 2024 07:49:10 +0000 (00:49 -0700)]
bagel update (#23842)

23 months agobluespace jumper + renames old whiteship (#23841)
Carolyn3114 [Wed, 10 Jan 2024 07:49:02 +0000 (01:49 -0600)]
bluespace jumper + renames old whiteship (#23841)

* bluespace jumper + renames old whiteship

* Update Resources/Prototypes/Entities/Stations/base.yml

* Update base.yml

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
23 months agorelaystation update (#23838)
Emisse [Wed, 10 Jan 2024 07:08:57 +0000 (00:08 -0700)]
relaystation update (#23838)

relay

23 months agodjstation (#23839)
Emisse [Wed, 10 Jan 2024 07:08:45 +0000 (00:08 -0700)]
djstation (#23839)

23 months agoAdds the old AI sat ruin from SS13 (#23836)
Flareguy [Wed, 10 Jan 2024 05:50:30 +0000 (23:50 -0600)]
Adds the old AI sat ruin from SS13 (#23836)

adds the old AI sat ruin from ss13

23 months agoAdjust Aspid max player count (#23829)
Kadeo64 [Wed, 10 Jan 2024 04:11:29 +0000 (23:11 -0500)]
Adjust Aspid max player count (#23829)

23 months agoMinor discord cl fix (#23833)
metalgearsloth [Wed, 10 Jan 2024 01:53:49 +0000 (12:53 +1100)]
Minor discord cl fix (#23833)

This means it won't send a dummy post if no changelog entries are found. The old one just sent it and didn't check if it worked.

23 months agoRemove the old python server/client packeging scripts (#23739)
Vasilis [Wed, 10 Jan 2024 01:49:39 +0000 (02:49 +0100)]
Remove the old python server/client packeging scripts (#23739)

L

23 months agoAdd more discord changelog logs (#23831)
metalgearsloth [Wed, 10 Jan 2024 01:14:42 +0000 (12:14 +1100)]
Add more discord changelog logs (#23831)

23 months agoFix changelogs rss probably (#23830)
metalgearsloth [Wed, 10 Jan 2024 00:42:26 +0000 (11:42 +1100)]
Fix changelogs rss probably (#23830)

23 months agoFix test fail from dupe prototypes (#23827)
Vasilis [Tue, 9 Jan 2024 23:31:50 +0000 (00:31 +0100)]
Fix test fail from dupe prototypes (#23827)

remove dupe and fix test fail

23 months agobuff syndicate assault borgs (#23797)
Ilya246 [Tue, 9 Jan 2024 22:33:12 +0000 (02:33 +0400)]
buff syndicate assault borgs (#23797)

rebalance

23 months agoGemini Engineering Rework + Minor fixes (#23817)
luckyshotpictures [Tue, 9 Jan 2024 22:32:03 +0000 (23:32 +0100)]
Gemini Engineering Rework + Minor fixes (#23817)

Gemini Engineering update

- Complete Overhaul of Engineering
- Minor decalling
- Renamed all APCs
- North solar (ruins) added

Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
23 months agoruins (#23767)
Emisse [Tue, 9 Jan 2024 22:29:36 +0000 (15:29 -0700)]
ruins (#23767)

* ruins

* code-side

* round-robin instead

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 22:15:09 +0000 (22:15 +0000)]
Automatic changelog update

23 months agoAdd artifact fragments to salvage magnet (#23791)
metalgearsloth [Tue, 9 Jan 2024 22:14:04 +0000 (09:14 +1100)]
Add artifact fragments to salvage magnet (#23791)

slavage

23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 22:07:33 +0000 (22:07 +0000)]
Automatic changelog update

23 months agoWheelchair users can bump open doors (#23806)
themias [Tue, 9 Jan 2024 22:06:28 +0000 (17:06 -0500)]
Wheelchair users can bump open doors (#23806)

23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 22:06:07 +0000 (22:06 +0000)]
Automatic changelog update

23 months agoFix fatal error when closing vending machine wire UI (#23815)
Tayrtahn [Tue, 9 Jan 2024 22:05:40 +0000 (17:05 -0500)]
Fix fatal error when closing vending machine wire UI (#23815)

That's a whoops on my part

23 months agoDoors will no longer be pried open once the doafter finishes if they shouldn't. ...
nikthechampiongr [Tue, 9 Jan 2024 22:05:02 +0000 (00:05 +0200)]
Doors will no longer be pried open once the doafter finishes if they shouldn't. (#23818)

* Fix bug where prying would succeed even a door could no longer be pried.

* Remove redundant call to Resolve

* Remove redundant comment

23 months agoAdjust prototype names to lowercase (#23810)
degradka [Tue, 9 Jan 2024 21:25:38 +0000 (00:25 +0300)]
Adjust prototype names to lowercase (#23810)

23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 18:18:09 +0000 (18:18 +0000)]
Automatic changelog update

23 months agoBunch of slot locales (#23792)
lapatison [Tue, 9 Jan 2024 18:18:04 +0000 (21:18 +0300)]
Bunch of slot locales (#23792)

* locale

* tweaks

23 months agofix mice eating (#23801)
themias [Tue, 9 Jan 2024 18:17:04 +0000 (13:17 -0500)]
fix mice eating (#23801)

* fix mice eating

* actually just ignore utensils

23 months agoFix pop.ogg (was stereo now mono) (#23795)
brainfood1183 [Tue, 9 Jan 2024 18:11:54 +0000 (18:11 +0000)]
Fix pop.ogg (was stereo now mono) (#23795)

23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 18:11:39 +0000 (18:11 +0000)]
Automatic changelog update

23 months agoFix TrashOnSolutionEmptySystem modifying uninitialized entities (#23798)
DrSmugleaf [Tue, 9 Jan 2024 18:11:22 +0000 (10:11 -0800)]
Fix TrashOnSolutionEmptySystem modifying uninitialized entities (#23798)

23 months agoMake Puddle drawable by syringes and droppers. (#23804)
Thom [Tue, 9 Jan 2024 18:10:34 +0000 (18:10 +0000)]
Make Puddle drawable by syringes and droppers. (#23804)

23 months agoAutomatic changelog update
PJBot [Tue, 9 Jan 2024 18:06:23 +0000 (18:06 +0000)]
Automatic changelog update

23 months agoAutomatic changelog update
PJBot [Wed, 3 Jan 2024 06:17:08 +0000 (06:17 +0000)]
Automatic changelog update

23 months agoFurther adjust rigged gloves (#23811)
ninruB [Tue, 9 Jan 2024 18:05:17 +0000 (20:05 +0200)]
Further adjust rigged gloves (#23811)

* set stamina damage to 25, attack speed to 1.4, remove jank

"jank" is me artificially setting the stamina damage lower so it accounts for blunt damage, now the gloves are pure stamina damage with no blunt conversion

* bump the price to 6 for passengers and 4 for boxers

23 months agoMinor antag name fix (#23812)
lapatison [Tue, 9 Jan 2024 17:55:37 +0000 (20:55 +0300)]
Minor antag name fix (#23812)

23 months agoFix pirate weapons (#23794)
metalgearsloth [Tue, 9 Jan 2024 15:33:42 +0000 (02:33 +1100)]
Fix pirate weapons (#23794)

23 months agoMore pirate weapon content(two new cannon ammo types, a musket and flintlock resprite...
Boaz1111 [Tue, 9 Jan 2024 12:23:11 +0000 (13:23 +0100)]
More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance)  (#23408)

* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>