Avalon
c81f09747e
Impstation Port - #2575 And #2351 ( #3845 )
...
* It begins
* Fixes
* MIssed a Comp+system
* Update muzzleflashes.yml
* Some fixes, new issues
* Ouroboros to BASALISK
* More fixes
* More changes
* Update meta.json
* I FEEEXED IT!!!
* Delete muzzle_synd.png
* Update uplink_catalog.yml
* Update projectiles.yml
* Update projectiles.yml
* fixes
* Update pyrotechnic.yml
* Make our suits protect from self damage
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Adjustments
* Update SharedToolSystem.Welder.cs
* Update uplink_catalog.yml
* Update ReagentTankComponent.cs
* Update Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Fixes
* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update tags.yml
* Changes
* I am commitiing this and asking for help
* Fixes
* Fixes
* Doing a thing
* Thing is done
* Update Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/basilisk.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootProtectionComponent.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Tools/SolutionRefuelSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootComponent.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Tools/SolutionRefuelComponent.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* More fixes
* Update SharedToolSystem.Welder.cs
* Update SharedToolSystem.Welder.cs
* LETS TRY
* FUCK GO BACK
This Partially reverts commit de3bd33873 .
* Update ReagentTankComponent.cs
* Update meta.json
* Indentation fixes
* Update syndicate.yml
* FIXED (I think)
* Fixes
* Update anaconda.yml
* Update leviathan.yml
* Nuke 2
* All set!
* Update Resources/Prototypes/_Impstation/Catalog/Fills/Backpacks/duffelbag.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Resources/Locale/en-US/_Impstation/tools/solution-refuel-component.ftl
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
* Update Content.Shared/_Impstation/Tools/SolutionRefuelSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>
---------
Signed-off-by: Avalon <jfbentley1@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-12 20:55:35 +02:00
portfiend
14b3ec0125
More Species Plushies ( #3850 )
...
* add: species plushies
* whitespace
* port thaven plushies from impstation
* makes deltav plushies obtainable elsewhere
* adds thaven plush to a couple more pools too
yay!
* convert these comments to start/end tags
* comment capitalization
* shorten indentation on plushie soundcollection
* fucked up this comment oops
* reduce indents on plushie components
* removes these comments
i dint notice it was in the DV namespace lmao
* FIXES HARPY PLUSH STRAY PIXEL
i hate my baka life
* removed thaven plushie and extra sprites
as per art director's request
* simplified a comment
2025-05-29 14:05:41 +00:00
deltanedas
dd283b8f20
Revert "SOS app for the PDA" ( #2907 )
...
Revert "SOS app for the PDA (#2812 )"
This reverts commit 6879e37ce0 .
2025-02-06 18:32:51 +00:00
rosieposie
6879e37ce0
SOS app for the PDA ( #2812 )
...
* Merge pull request #1450 from Saeko-44/master
SOS app for the PDA
* fix PDAs
* untouch
* Revert "untouch"
This reverts commit 5c08a2972d .
* untouch the right guy
* Update pda.yml
* removed unnecessary using that caused an error
* add feedback popup
* Update SOSCartridgeSystem.cs
* add cart sprite
* review changes
* Update cartridges.yml
* remove app from shitter roles
* fine
* display seconds
* Update cartridges.ftl
* upped cooldown to 90 seconds
* use imp namespace
* Update pda.yml
---------
Co-authored-by: mqole <113324899+mqole@users.noreply.github.com>
2025-02-06 03:16:13 -05:00
hivehum
47b14d431a
One Day Blinding Stew ("Camel's Soup") from Impstation ( #2757 )
...
* one day blinding stew
* you got it boss
* o7
* dv comments
2025-01-28 15:26:15 +00:00
rosieposie
3204aa8c50
Acidifying Sec Crates & Emergency Lasers ( #2672 )
...
* adds three PRs!
* random failure
* Update AntiTamperSystem.cs
* Update cargo_technician.yml
* Update cargo_technician.yml
* armory & sec crates only
* untouch
* review fixes
* more tweaks
2025-01-16 12:37:56 +00:00