14d0c0a351
hopefully this all goes through well
2025-09-11 08:45:11 -07:00
4c30c8538c
Port Vox sounds from Impstation ( #4280 )
...
* what was funkystation snorting
* reuse more like unuse......
2025-09-08 20:48:49 +01:00
ef93ebbeef
*blinks ( #4155 )
...
* Port #1583 from Imp
too dumb to cherrypick so hopefully coauthor works well enough
Co-Authored-By: wafehling <wafehling@users.noreply.github.com>
* newline ops
* newline ops AGAIN!
* how did this even HAPPEN
---------
Co-authored-by: wafehling <wafehling@users.noreply.github.com>
2025-08-14 21:57:09 +01:00
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
2025-06-12 20:55:35 +02:00
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
490a208e6f
Porting Thaven from Impstation ( #2948 )
...
* thaven time
* Added No Contraction accent for mood, added missing Action prototype, added missing species yml, added missing marking bundle from Impstation.
* Adds shitmed changes from impstation PR.
* hands 1984
* Fix yaml linter
* Add thaven mood upsets
* delicious soda
* emagging begone
* yaml linting fixes
* everything everything everything in it's right place
* skibidi
* skeebert d. oilet
* unusual memes compilation v307
* mods, fish react this man
* uuuuunnnghhhhhhhgghghhhh pain
* guh
* fuck
* now that's what i call music 75
---------
Co-authored-by: AirFryerBuyOneGetOneFree <jakoblondon01@gmail.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
2025-02-25 09:45:29 +00:00
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
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
2025-02-06 03:16:13 -05:00
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
01a9e61ce9
Animated Emotes from Impstation ( #2746 )
...
* when the emotes are animated
* hopefully untouched
* INCORRECT
* can this work.
* flipping out
2025-01-18 23:50:21 +00:00
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
97492b38f5
Port undergarments from ImpStation ( #2719 )
...
All races available in the character creator may wear undergarments.
Also lets slimefolk wear chest tattoos.
2025-01-14 02:56:24 -03:00
02c690fa3b
Steal imp station suits 😈 ( #2675 )
...
* Suits Suits Suits
* typo oops
* Restructuring
* Ctrl Z Oops
* Learn Every Day
* Whitespace cleaning
* Forgot To Swap A Thing
* Make the Bartender suit be a reward
* Fix json formatting
* Fix detdrobe.yml
* Fix curadrobe.yml whitespace
* Fix more whitespaces
* Fix missing clothes from loadout
* Raised to pass the test
---------
Co-authored-by: unknown <193618231+MintyTheBinty@users.noreply.github.com>
2025-01-10 19:58:50 +00:00
AeraAulin
KOTOB
Avalon
portfiend
kushbreth
deltanedas
rosieposie
hivehum
Michelle Szinger
Radezolid