Commit Graph

7945 Commits

Author SHA1 Message Date
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
MilenVolf 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
brainfood1183 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
Ramlik 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
Ed 987ca1a2b5
Small tomato killer tweak (#27265)
* Update miscellaneous.yml

* Update mobspawn.yml

* Update miscellaneous.yml

* Update miscellaneous.yml

(cherry picked from commit 4903bc2e3da8c21008527909dd036d77ec916359)
2024-05-03 00:31:09 +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 a62e8701cb30cc0c96cbac5a33b57728efe596b5)
2024-05-03 00:31:02 +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 77d7c77f595bf7957da7b6c70ecb3dc6c74d4074)
2024-05-03 00:30:14 +02:00
metalgearsloth 01d0e2c63a
Fix lint (#27388)
(cherry picked from commit 5ec5e5ab898ef7688dfa2ff66df7ed78bedb32be)
2024-05-03 00:30:08 +02:00
Errant 1e2f97dc21
Vox sprite rework (#26985)
weh

(cherry picked from commit 257b04d27793b8c8853af57a9f53d361062d5d61)
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 2f7d0dedbded99a8f3f538c887c3c17aaa667501)
2024-05-03 00:28:42 +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 36abf1d9ba67ab26c648ae278d6cc80b74691ccc)
2024-05-03 00:28:37 +02:00
Nemanja 043880a89b
welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baaa50044189ffa5176431a99942e93bd)
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 defb8dd941cc97e8a5584623cd5a7113b7863b31)
2024-05-03 00:26:16 +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 c6d935497ce26d957103685129c32d7c7ab8db0f)
2024-05-03 00:20:22 +02:00
Mr. 27 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 50fb91bd1837ea8a78677dbb211559ded5bba018)
2024-05-03 00:20:15 +02:00
metalgearsloth 9a2f637cb4
Fix RD suffix (#27358)
(cherry picked from commit 30b74027fbfb60a871b87efd058e6c49a85ba450)
2024-05-03 00:19:07 +02:00
metalgearsloth f6495da3c2
Fix PAI BUI (#27357)
(cherry picked from commit 394c325246c76e234ef6600194a45d9325d3702d)
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 3bed1ddc48219ecc99f957b3d40aa4842046b5a8)
2024-05-03 00:19:05 +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 080b1b1e0ca40b34d1a3538942ee54acdd8b117f)
2024-05-03 00:18:59 +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 498109a833047d933a5f72edf87961542c516f58)
2024-05-03 00:18:52 +02:00
null 466351abd3
Do the thing for the things (UI prediction stuff or something) 2024-05-03 00:18:25 +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 5896e6875266b22c565009b5d45f60ceb981d90a)
2024-05-03 00:15:32 +02:00
IlyaElDunaev 4da059a948
Treatment of blood loss in the Rat King (#26887)
Bloodloss-RatKing

(cherry picked from commit 3847a298c13192ba97364b06b8b55b4fe60deaa7)
2024-05-03 00:12:40 +02:00
FungiFellow 3b7bb84af4
Whitelisted Sec Webbing (#27303)
* Whitelisted Sec / Merc Webbing

* Update belts.yml

* Misplaced Components fixed

* Trying to fix mapped fills

* Update belts.yml

* Update belts.yml

* Removed an Empty line

* Update belts.yml

(cherry picked from commit 9b63bb672f8f8a8e46ce68d45ad2ed876025ddc1)
2024-05-03 00:12:37 +02:00
beck-thompson 2351ca213f
Radio jammer update! (#25912)
* Added selectable power level to radio jammer

* Cleaned up OnGetVerb

* Settings are now stored in the .yml file. Simplified stuff a lot!

* Minor fixes!

* Small little baby fix :)

* Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location.

* Minor code cleanup

* Changed byte -> int

* Update sprite

* Fixed licence

* Added power LED that changes if the jammer is on low power.

* Removed tabs

* Changed github link to the commit

* Changed all the RemComp to RemComDeferred

* Moved NetworkedComponent to shared

* Changed radio jammer textures back with minor edits

* Added a space because it was annoying me

* Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :)

* Removed useless comment

* Cleaned up code that updates the range of tracking devices.

* Fixed client namespace and removed newline

* Cleaned up ChangeLEDState and ChangeChargeLevel.

* Added comments

* Read only

* Fixed another comment

* Locked in

* Made server inherit shared

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* review fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit d3b1178428e9e0e714e51523558335589078a76c)
2024-05-03 00:10:47 +02:00
pigeonpeas c4df86f0f5
Add a trash bag to the advanced cleaning borg module. (#27226)
add the trash bag

puts the trash bag in the advanced cleaning module

(cherry picked from commit ef0a4d64c82ae10b2039e82ea06a28765499e540)
2024-05-03 00:05:48 +02:00
FungiFellow f58fef88c5
Add Truncheon to Secbelt Whitelist (#27281)
* Add Truncheon to Secbelt Whitelist

* Update belts.yml

* Added Truncehon Tag in Tags.yml

* Update security.yml

* Update security.yml

(cherry picked from commit 5fa424a43b9a04c4dc6839a9e5244f80d8e576e7)
2024-05-03 00:01:54 +02:00
Alzore 9de3cbed07
Make the cargo telepad T2 civilian (#26270)
therearetwowaystodothis

(cherry picked from commit 4290d5f13e16f01fd6a33af897665e0ba7795b3b)
2024-05-03 00:01:49 +02:00
Flareguy 79f14d4206
Revert "Maints Exit Sign" (#27271)
Revert "Maints Exit Sign (#26831)"

This reverts commit 905102064cd1311943093c9feeecca8bbd8bc358.

(cherry picked from commit 10ad53df7296506485033a3dae572e4016553630)
2024-05-02 23:59:57 +02:00
Nemanja bccc2bf40e
fix cargo teleporter (#27255)
* fix cargo teleporter

* don't delete orders

* basado

(cherry picked from commit 1bfc63c546617ee2e9be9960b14abf16eee19ad5)
2024-05-02 23:59:53 +02:00
pigeonpeas 0353ef063c
Allow the purchase of emitters from cargo. (#27229)
add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack

👍

(cherry picked from commit c129bb177c8f4e7eec0ae43c09a48aa5bc0f7268)
2024-05-02 23:59:51 +02:00
brainfood1183 25c8019a69
Maints Exit Sign (#26831)
* Maints Exit Sign

* change description

* id, sprites changed from maints to exit
prototype now has an unshaded layer so it can be seen in the dark.

(cherry picked from commit 905102064cd1311943093c9feeecca8bbd8bc358)
2024-05-02 23:59:29 +02:00
Whisper a87ea50246
lower max firestacks to 10, refactor flammable (#27159)
* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage

(cherry picked from commit eee056eaf063caa690516bf8b4eb7e65a0199e9c)
2024-05-02 23:59:27 +02:00
Ghagliiarghii f9d50c224c
Increase availibility of combat knives to security (#27224)
* Increase availibility of combat knives to security

* whitelisted combatknife in secbelt for Diona

* Revert SecDrobe change for MGS

(cherry picked from commit 88b56efba102c0f537c268f3b23e21715d5c34d6)
2024-05-02 23:59:23 +02:00
Tyzemol c1d0a46691
Fix slime storage issue (#27260)
fix_slime_storage

(cherry picked from commit 0e2f5d6bf730c67cc5adeeca2f0ba5fbe6f1f9f4)
2024-05-02 23:59:16 +02:00
FungiFellow 74610235dd
Syndi-Cat Tweaks (#27222)
* Syndicat Price 10 -> 6

* Update animals.yml

* Update animals.yml

* Update uplink_catalog.yml

* Update uplink_catalog.yml

* Update animals.yml

(cherry picked from commit 32a90120ebaa9e013594432f9fd1e1025cb321d8)
2024-05-02 23:58:52 +02:00
Kara 696d7b8878
Minor slime fix (#27237)
(cherry picked from commit 85c6383cc025289d3376ef0e76f358483b888b18)
2024-05-02 23:58:05 +02:00
Just-a-Unity-Dev 8086508273
General slime improvements (#23425)
* General slime improvements

* Finish morphing

* oops 2x2 not 3x3

* actually lets ball - 2x3 inventory

* Last two things on the todo list

* .\RobustToolbox\

* JUST COMPILE

* fix tests 2.0

* fix tests 3.0

* Do reviews

* minor change

* guideboob

* more

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

(cherry picked from commit fd0ca42c58315b4c4f91fe9364c3dc3d88ba5624)
2024-05-02 23:57:52 +02:00
potato1234_x 9ad13b8200
Psicodine, Mannitol, Lipolicide and Happiness (#27134)
* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit e2b260d894812194f444e209dfc1d1d2ea0ab645)
2024-05-02 23:53:00 +02:00
Weax 180b3f21c3
Make CLF3 reaction require heating first. (#27187)
* heat your bombs

* Removing comment

(cherry picked from commit b5bcf86b74e76ba15aa0cb2a2fe39f81cb8991cd)
2024-05-02 23:52:58 +02:00
Pieter-Jan Briers 612822aa35
Make sterile masks a tiny item (#27213)
This minorly annoyed me because breath masks are tiny too, so if I swapped them I may run out of inventory space.

(cherry picked from commit 6b1866625cf20d7b64f1dba9c711193d44380da2)
2024-05-02 23:52:36 +02:00
no f10014496e
Remove "Placeholder sprite." text from hairballs, normality crystals, telegnostic projection descriptions (#1154) 2024-05-01 23:39:43 +00:00
deltanedas fccee49fbb
early merge projector rewrite/fixes (#1128)
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-01 15:03:26 +00:00
Null 511685e7b6
Revert "Railgun" (#1155)
Revert "Railgun (#718)"

This reverts commit c0de272a13.
2024-04-29 19:55:00 +00:00
Firewatch c0de272a13
Railgun (#718)
* test

please work

* cleanup

removing old assets causing issues

* addition to uplink

both traitors and nukeops can buy this absurdly powerful cannon

* Update railgun_ammo.yml

* laser variant

shrimple as adding a new variant with two firemodes, overkill, and overkiller

* laser railgun cleanup

fixing some trash

* adds the caninator

shoot cans and scare security

* admeme variant and removal of clown variant for now

* Slowdown in Hands

Slows you down when any variant is held as to make the weapon more balanced

* Laser railgun Sprite

adds a unique sprite for the laser variant of the railgun

* fix the sprite

i am dumb

* Issue Cleanup

Dusts off some of the code and makes some balance changes, along with better parenting.

* purchasable ammo and charge sound update

made the charge sound slightly less annoying and added ammo purchasable by both traitors and syndicate

* QA pass

various little fixes to improve the code and general cleanup

* error fixing

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Sprite Update + Reverse Engineering

This adds reverse engineering, the new sprites, and a host of balance changes.
- The Railgun now does 80 stamina damage again on hit with normal bolts.

* reverse engineered fast firerate

as a reward for researching new technology, you've made it slightly faster. yay. also resprites the non-lethal variant to look more plunger-like

* Final Changes

ready for merge, sir!

* Copyright Update

Makes the sounds all under free use creative commons to avoid copyright issues.

* Update license.txt

* remove old attributions

this sound has been altered as to not use pixabay

* price increase

sorry danger but 14 tc is way too low lmao, nukies get it for 20 tc

* requested changes

hopefully

* conversion to mono

yipeeee

* fix of that other fix for the new file rename shit

pure agony

* proper noun

the Decimator is now a proper noun similar to other weapons

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>

* Update duffelbag.yml

* Update uplink_catalog.yml

* Update rod_impact.ogg

* Update uplink_catalog.yml

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-04-29 10:16:53 +00:00
Tad "Taddy" Johnson 1005293925
Upcate Vulcan (#1139)
Now features an increased fire rate and selector. Watch your fire, though, it kicks.
2024-04-28 22:37:30 +02:00
Adrian16199 0b5f732111
Adds playtime requirement to 2 ghost roles. (#1093)
* Adds playtime requirement to 2 ghost roles.

* Whoops, did it wrong.
2024-04-28 22:35:53 +02:00
Adeinitas d2caa686dc
Adds some things to the lobby (#1143)
* The first part of this PR, "Lobby Music"

* Part 2 of this PR, act 1: "Operator Plush"

* WebP conversion+ Fixing some YML
2024-04-28 18:15:51 +02:00
no 29b3303d53
Add awoo emote to vulps (and harpies) (#1094)
* Add awoo as howl trigger

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>

* Actually add awooing for real this time

---------

Signed-off-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2024-04-25 11:43:24 -05:00