Commit Graph
5863 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
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
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
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
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
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
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
Nemanja 043880a89b welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baa)
2024-05-03 00:27:50 +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
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
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
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
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
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
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 9b63bb672f)
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 d3b1178428)
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 ef0a4d64c8)
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 5fa424a43b)
2024-05-03 00:01:54 +02:00
Flareguy 79f14d4206 Revert "Maints Exit Sign" (#27271)
Revert "Maints Exit Sign (#26831)"

This reverts commit 905102064c.

(cherry picked from commit 10ad53df72)
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 1bfc63c546)
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 c129bb177c)
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 905102064c)
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 eee056eaf0)
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 88b56efba1)
2024-05-02 23:59:23 +02:00
Tyzemol c1d0a46691 Fix slime storage issue (#27260)
fix_slime_storage

(cherry picked from commit 0e2f5d6bf7)
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 32a90120eb)
2024-05-02 23:58:52 +02:00
Just-a-Unity-DevandKara 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 fd0ca42c58)
2024-05-02 23:57:52 +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 6b1866625c)
2024-05-02 23:52:36 +02:00
deltanedasanddeltanedas 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
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
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
VelcroboyandVelcroboy a27c9fd6f0 Update DV file note (#1123)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-22 19:10:20 +00:00
NullWanderer b0c57c9042 Various yaml fixes hopefully
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
2024-04-22 17:59:42 +02:00
Hannah Giovanna DawsonandNemanja 4edf577b1b SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75)
2024-04-21 23:46:34 +02:00
K-Dynamic e53967fcf2 Removed CC and recall reference in pallet descriptions (#27209)
cleaned pallet descriptions

(cherry picked from commit e009a80a8c)
2024-04-21 23:46:01 +02:00
Pieter-Jan Briersandmetalgearsloth 176e9b0a81 THE RETURN OF ITEM STATUS (#22986)
* THE RETURN OF ITEM STATUS

Item status is now inline with the hands again. You can now see item status for both hands at once.

If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.

The item status for the active hand is also highlighted.

Item status has been given a new look so it looks unique and matches every UI theme.

* Shrink item status to 125px

This is going to require fixing the existing controls. Do that later.

* New bullet item status rendering

sex

* Make gun item status look just a little bit nicer.

Avoid only one or two bullets ending up on a single row of an item status.

* Delete Eris theme files

* More improvements

Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.

Redid how content margins are set from the theme. Less complex and cleaner now.

Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.

* Compact down item status text

Now it fits 3 lines of text on one line. Yay.

This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.

* Add item status sprites for Ashen theme.

* Add status control to show beaker/bucket/jug solution/transfer volumes

Also PollingItemStatusControl I'll be using that more.

* Fix welder item status, clean up welder code

The item status control implementation was ancient and bad. That's why it was buggy.

Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.

Cleanup. The code was doing some really dumb stuff.

* Spray bottles show contents in item status.

* cowtools

* Fix plasmafire and clockwork themes.

Actual git gaslighting wtf.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 58f025ba80)
2024-04-21 23:41:08 +02:00
KittenColony 42a4d86bcb Two-Tone lizard snouts (#27143)
snouts

(cherry picked from commit b48d0ddefc)
2024-04-21 23:38:29 +02:00
Mr. 27 d2ce6da9e6 belts get their equip sound (#27174)
done

(cherry picked from commit 663542b82e)
2024-04-21 23:36:47 +02:00
K-Dynamic ada6f1ea71 Corrected misleading protections in jumpsuit/skirt descriptions (#27160)
removed misleading protections

(cherry picked from commit b6781946df)
2024-04-21 23:34:39 +02:00
MilenVolf 00aafb2a35 Windoors now contain proper electronics (#27133)
* Windoors now contain proper electronics

* weh

(cherry picked from commit 2da53d97e5)
2024-04-21 23:32:28 +02:00
MilenVolf 695acc366e Fix crates masks (#27137)
Fixes crates masks not allowing them to go under plastic flaps + crates no longer can go trough windoors.

(cherry picked from commit 812abd33a0)
2024-04-21 23:31:34 +02:00
SoulFN de6e2a4aea Glass shards damage (#26783)
* Update shards.yml

Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you

* Oops

Forgot about base shard

* Update shards.yml

Cleanup

* Update shards.yml

Changed damage on step (Attack damage + 1)

(cherry picked from commit 95c66b4f96)
2024-04-21 23:31:27 +02:00
Verm 21208c94f8 You can bless more containers with a bible (#26526)
* Made more things blessable

* Removed junk

* Remove whatever that was

* Make bowls blessable

* New mixablesolution component, converted everything to work with it

* Fix minor mishaps

* Fix extra spaces in bottle yml

* Fix last extra space, fix bottle havign the wrong solution name

* Remvoe unneeded event(I think), fix alcohol bottles not being mixable

* I missed cans
2024-04-21 23:31:16 +02:00
keronshb cf13c9a408 Adds non randomized rod velocity (#27123)
* adds non randomized rod velocity

* Adds despawn suffix to despawn rod

(cherry picked from commit 6be204e3f4)
2024-04-21 23:21:50 +02:00
Gyrandolaandmetalgearsloth 38a4bee25e chili/chilly peppers sprite alignment fix & minor refactorization (#25971)
* png alignment and minor refactorization

* Update migration.yml

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit fa5b93871f)
2024-04-21 23:21:17 +02:00