Commit Graph
16624 Commits
Author SHA1 Message Date
RiceMar1244 7b10527dc4 Resprite antique laser pistol (#27037)
* Resprites the captain's antique laser pistol

* Adds artist credit

* Improves icon outline and shading

* Replaces new sprites with something more resembling the in-game version
2024-05-06 01:35:58 +02:00
Terraspark4941 cd003a6a47 The Honored Quran (Sprite addition) (#27400)
The Honored Quran
2024-05-06 01:35:57 +02:00
PJBot 2591b08505 Automatic changelog update 2024-05-06 01:35:55 +02:00
nao fujiwara a91f6379cb repositioned spooky long hair to its proper place in the alphabet (tweak) (#27370)
* repositioned spooky long hair to its proper place in the alphabet

* forgot the meta.json for hairstyles oopsie
2024-05-06 01:35:34 +02:00
MilenVolfandmetalgearsloth 2fc9743793 Glass box fixes + Construction & Stealthy deconstruction (#25365)
* Showcase update

* Fix craft prototype. Add glass box deconstruction for stealth gameplay

* Remove duplicated tag

* Forgor

* Some cleanup

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-05-06 01:32:04 +02:00
PJBot f62350c0dc Automatic changelog update 2024-05-06 01:31:22 +02:00
brainfood1183andmetalgearsloth eb9e3974d0 Rodents can be Faxecuted (executed via Fax machine) (#21461)
* Rodents can be Faxecuted (executed via Fax machine)

* use brute instead of new group.

* fax visuals now use tags for mouse and hamster instead of comps

* fix for ubuntu, damn ubuntu bane of my life

* cant copy hamlet, can now faxecute mothroaches.

* fix

* fix

* fixes

* removed ifs now using switch, removed hastag now using string.

* fixes and no more switch

* cleanup

* more cleanup

* fix

* cleanup

* moved damage out of faxmachine and into own system and component.

* changes

* fixes and done i think.

* tidy

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-05-06 01:31:20 +02:00
PJBot fbb31a791a Automatic changelog update 2024-05-06 01:27:48 +02:00
Ramlikandlzk 48a05d3b00 Add a handy security radio (#25913)
* Add a handy security radio

I've always wanted to have a handy security radio in game and I thought it would be cool to have one in game.

Demonstation can be found in here: https://youtu.be/VQOLiTQAmKc

* Merged radio files and changed sprite location

* Fixed RSI not having license and copyright

* Added a chance to spawn in security closets

All security closets will have 50% chance to spawn a handy security radio in it

* Update radio id

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Change id in locker spawn

* Change id in locker spawn

* Changed id to RadioHandheldSecurity as suggested

* Add radio to vending machine instead of locker

Removed radio from lockers and added it to security vending machine

* Fixed radio not having a sprite

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-05-06 01:27:41 +02:00
metalgearsloth 4021885520 Update cane UI key (#27395)
* Update cane UI key

* none of the pr passed ci yippee

* weh
2024-05-06 01:27:19 +02:00
PJBot c324162f8e Automatic changelog update 2024-05-06 01:26:45 +02:00
PJBot 0582b098c1 Automatic changelog update 2024-05-06 01:26:42 +02:00
PJBot 0a4a2a88b6 Automatic changelog update
(cherry picked from commit dec101465b)
2024-05-03 00:31:11 +02:00
Ed 987ca1a2b5 Small tomato killer tweak (#27265)
* Update miscellaneous.yml

* Update mobspawn.yml

* Update miscellaneous.yml

* Update miscellaneous.yml

(cherry picked from commit 4903bc2e3d)
2024-05-03 00:31:09 +02:00
PJBot 85d4564fe7 Automatic changelog update
(cherry picked from commit 4d85ca5c2a)
2024-05-03 00:31:07 +02:00
Errant 3838aef210 vox oxygen toxicity, respiration changes (#26705)
* vox oxygen toxicity and related stuff

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit a62e8701cb)
2024-05-03 00:31:02 +02:00
PJBot a21304eb99 Automatic changelog update
(cherry picked from commit 670ad3d962)
2024-05-03 00:30:59 +02:00
eoineoineoin 6b2fd62ee7 Add tooltips to artifact analyzer UI (#27393)
Add tooltips to indicate why "Extract" button is disabled.

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit b8a8d6f8fc)
2024-05-03 00:30:47 +02:00
PJBot 4a7b91ccd8 Automatic changelog update
(cherry picked from commit 324cce9bff)
2024-05-03 00:30:15 +02:00
Ps3Moira e3721da175 Canes + Cane Blade for Syndicate Librarians (#25873)
* Cane + Cane Blade

* Add - type: ContainerContainer

* Add another - type: ContainerContainer

* Fix and add proper ContainerContainer component

* Add UserInterface component

* Remove Space

* Stat Changes

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 77d7c77f59)
2024-05-03 00:30:14 +02:00
nao fujiwara 06b4ba7d20 tweaked the old dress sprite (#27391)
# made the waistband position consistent when rotating

(cherry picked from commit 35885345c2)
2024-05-03 00:30:13 +02:00
PJBot a2d34b72ee Automatic changelog update
(cherry picked from commit de85e6d518)
2024-05-03 00:30:10 +02:00
metalgearsloth 01d0e2c63a Fix lint (#27388)
(cherry picked from commit 5ec5e5ab89)
2024-05-03 00:30:08 +02:00
Errant 1e2f97dc21 Vox sprite rework (#26985)
weh

(cherry picked from commit 257b04d277)
2024-05-03 00:29:32 +02:00
Pieter-Jan Briers b2294a8cdc Displacement map prototype (#26709)
Requires https://github.com/space-wizards/RobustToolbox/pull/5023

This uses the new engine features (above) to add a displacement map shader. This allows deforming a sprite based on another sprite.

Primary use case is automatically adapting human clothing sprites to different species, something we want to make species like Vox a reality.

A basic example of wiring this up with Vox has been added. The system is however incredibly simple and **will** need more work by a content developer to select and toggle displacement maps when appropriate. I am leaving that to somebody else. For example right now the displacement map is applied even if a species already has custom-fit sprites for a piece of clothing, such as the grey jumpsuit for Vox.

Basic Aseprite plugins to help with authoring displacement maps have also been made.

(cherry picked from commit 2f7d0dedbd)
2024-05-03 00:28:42 +02:00
PJBot e0db333d31 Automatic changelog update
(cherry picked from commit b4212a08f4)
2024-05-03 00:28:41 +02:00
Vigers Ray 268a79e060 Fix stupid NPC. (#26868)
* init commit

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 36abf1d9ba)
2024-05-03 00:28:37 +02:00
PJBot 9e43e083ca Automatic changelog update
(cherry picked from commit f898e72e57)
2024-05-03 00:28:33 +02:00
Nemanja 043880a89b welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baa)
2024-05-03 00:27:50 +02:00
vorkathbruh 4818f684d5 Adjusts price of SWAT crate (#27365)
Adjusts price of SWAT crate in cargo_security.yml from 5500 to 7500.

(cherry picked from commit defb8dd941)
2024-05-03 00:26:16 +02:00
PJBot e5d75fd390 Automatic changelog update
(cherry picked from commit bebcc70c7d)
2024-05-03 00:26:14 +02:00
PJBot 43d0cd25c7 Automatic changelog update
(cherry picked from commit 18e27342d1)
2024-05-03 00:25:03 +02:00
PJBot b2e5ff691a Automatic changelog update
(cherry picked from commit 012857331b)
2024-05-03 00:20:24 +02:00
nao fujiwara 2109d476c4 spooky dress and hairstyle (#27333)
* first draft loooong hair

* *added the old dress item *added old dress to the theatrical performances create

* updated spooky long hair name

* fixed an oopsie made when updating item names

(cherry picked from commit c6d935497c)
2024-05-03 00:20:22 +02:00
PJBot 3d2fe15b5c Automatic changelog update
(cherry picked from commit a04d143c2c)
2024-05-03 00:20:21 +02:00
Mr. 27andTayrtahn 22cb3eb23a monkey reinforcement teleporters can now select between kobold or monkey with a verb (#25982)
* inital

* Update animals.yml

* Update animals.yml

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* selecting different role will change the description and name

* fix name

* gargh

* the review

Hello

* e

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

(cherry picked from commit 50fb91bd18)
2024-05-03 00:20:15 +02:00
PJBot 0d49a0cc1c Automatic changelog update
(cherry picked from commit 36084d9712)
2024-05-03 00:19:11 +02:00
metalgearsloth 9a2f637cb4 Fix RD suffix (#27358)
(cherry picked from commit 30b74027fb)
2024-05-03 00:19:07 +02:00
metalgearsloth f6495da3c2 Fix PAI BUI (#27357)
(cherry picked from commit 394c325246)
2024-05-03 00:19:06 +02:00
lzk 0a387eb935 Add morgue access door (#26852)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 3bed1ddc48)
2024-05-03 00:19:05 +02:00
PJBot 66d6db305b Automatic changelog update
(cherry picked from commit 053ec6a309)
2024-05-03 00:19:01 +02:00
wafehling 338fc46f78 Added hotkey and controller to re-open end of round scoreboard (#25884)
* Added keybind for scoreboard, starting work

* Fixed the window appearing

* Added loc text

* Updated namespace for ScoreboardUIController.cs

* Switched to UISystemDependency

"- UIControllers can use [Dependency] as normal for IoC services and other controllers, but must use [UISystemDependency] for entity systems, which may be null as controllers exist before entity systems do." Jezithyr — 10/12/2022 1:20 PM

* Reverted back to functional state

* Replace with UISystemDependency

* Move RoundEndSummaryWindow to ScoreboardUIController

* Convert to EntitySystem

* Clean up command bind

* Move to RoundEnd directory

* Remove Nukeops rule when no nukies

* Cleanup

* Change to toggle hotkey

* Cleanup

* Revert "Remove Nukeops rule when no nukies"

This reverts commit 5d4bbca09f45110b24a674d59b505be87b602b67.

* Cleanup

* Make the Toggle hotkey work in lobby

* Fix error

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
(cherry picked from commit 8febdc5fc4)
2024-05-03 00:19:00 +02:00
Redfire1331 b1b156d0f9 Added Chopsticks (#27298)
* added chopstick sprites

* Create chopsticks.yml

* added chopstick yml

* hopfully it acts like a forke

* added chopsticks to dinnerware vendor

* uncapitalized the name

* Update Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* made the chopsticks icon a reasonable size

* added chopsticks to chang vendor

* made paired chopsticks you can break apart

* added them to vendors

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
(cherry picked from commit 080b1b1e0c)
2024-05-03 00:18:59 +02:00
PJBot eae7c4d448 Automatic changelog update
(cherry picked from commit 11227c754c)
2024-05-03 00:18:54 +02:00
WarMechanic 85048c5d32 fix wieldable guns not being able to cycle inhand (#27307)
* Add UnwieldOverride variable that overrides unwielding inhand to enable other interactions

* Give LMGs UnwieldOverride

* logically inverted UnwieldOverride to UnwieldOnUse

* fixed typo

(cherry picked from commit 498109a833)
2024-05-03 00:18:52 +02:00
PJBot 686fd0e910 Automatic changelog update
(cherry picked from commit 80bbf19f95)
2024-05-03 00:18:51 +02:00
null 466351abd3 Do the thing for the things (UI prediction stuff or something) 2024-05-03 00:18:25 +02:00
PJBot 2603967c3e Automatic changelog update
(cherry picked from commit 934c5089a9)
2024-05-03 00:15:35 +02:00
metalgearsloth 1d63b4cfcb Content update for UI prediction (#27214)
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge

(cherry picked from commit 5896e68752)
2024-05-03 00:15:32 +02:00
PJBot c585cd9610 Automatic changelog update
(cherry picked from commit 32b81de8c5)
2024-05-03 00:13:21 +02:00