Commit Graph
22612 Commits
Author SHA1 Message Date
deathride58 16faa3cf64 Fixes construction graphs proccing while being microwaved (#23835)
* Fixes construction graphs proccing while being microwaved

* git those indents in line

* We knew we were missing something!

(cherry picked from commit f5c40c3623)
2024-01-26 22:33:40 +01:00
GreyMario 9e4fb570bc Pie tins returned from all pies in all situations, add lathe recipes for pie tin and some other basic kitchenwares (#23217)
* move pietin trash to FoodPieBase so all pies return their pie tin when eaten

* spawn trash from a SliceableFood if the Food has a trash

* add a limited selection of additional tablewares to the autolathe

* kitchenware material adjustments

* fix crash when slice pie in hand/inventory

* use system helpers + slices now go in parent container

(cherry picked from commit 1c3c596bae)
2024-01-26 22:33:39 +01:00
Fahasor a764a4eb3b Whistle for security (second try) (#23945)
* Move Exclamation entity

* Add Whistle Component and Whistle System

* Add BaseWhistle prototype

* Add sound to BaseWhistle

* Add SecurityWhistle prototype

* Add Sprite and Icon to SecurityWhistle

* Add whistleExclamation prototype

* Fix SecurityWhistle prototype

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

* Add whistles to sec vendingMachine

* Revert "Add sound to BaseWhistle"

This reverts commit 0c2eeab1286fb778ed7a845e59c642f667582a4a.

* Add sounds for BaseWhistle

* Make atributions compact

* Remove unnecessary spaces

* Make WhistleSystem class sealed

* Remove possibility to exclamate one person from WhistleComponent

* Remove delay from WhistleSystem

Increase delay

* Remove unnecessary HashSet

* Try replace Resolve

* Refactor sound emmiting

* Rework spawn of exclamation

* Move WhistleComponent from Server to Shared

* Edit WhistleComponent because of moving

* Move WhistleSystem from Server to Client

* Edit WhistleSystem because of moving

* Add new event

* Add server part of WhistleSystem

* Modify system for prediction

* Add documentation to WhistleComponent

* Revert "Modify system for prediction"

This reverts commit 89abb290571ff47deb5491b0f720f6bde079110b.

* Revert "Add server part of WhistleSystem"

This reverts commit ca52ca081f30fb164f401c1818d08531f02af284.

* Revert "Add new event"

This reverts commit 5ca9694757c94c03ca72d5b2f56f5f23503a3263.

* Move system from client to shared

* Modify whistle system because of moving

* Separate checks and action

* Organize file folders according to conventions

* Make component Networked

* Change trigger component for WhistleSystem

* Put indents betwen methods

* Rework WhistleExclamation prototype

* Change variable name

* Add serializer to WhistleComponent

* Rename one variable

* add predict possibility to Shared

* add Client part of prediction

* Add Server part of prediction

* Increase whistle distance

* Prevent spawn for invisible entities

* WhistleComponent now use file-scoped namespace

* Delete unnecessary part from MakeLoudWhistle

* Add Resolve check

* Delete Server and Client part for prediction

* Make system prediction properly

* Change prediction behaviour

* Fix unexpected error occured

* Avoid using obsolete methods

* Add comments

* Update DataField to make it shorter

* Update size for new size system

* Prevent ping for invisible entities for real now

* Avoid triggering unnecessary debug asserts

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
(cherry picked from commit fa3da1ab82)
2024-01-26 22:33:18 +01:00
metalgearsloth 42643e8b94 NewsSystem fixes (#23969)
(cherry picked from commit abc5094a16)
2024-01-26 22:33:17 +01:00
KittenColony 46a3e2a2ee Fixed Lizard swipe (#23953)
* made unarmed lizard / spider melees representative

* Revert Arachnids

(cherry picked from commit 0c045f815f)
2024-01-26 22:33:16 +01:00
Tayrtahn 35ba9eb50d Cuttable speaker wire for vending machines (#23873)
Implement SpeechWireAction

(cherry picked from commit b8de514237)
2024-01-26 22:33:15 +01:00
Aexxie 48feec63a5 Adds the "advanced" color palette (#23960)
(cherry picked from commit b9f694ea59)
2024-01-26 22:33:14 +01:00
Aexxie 2e6f578fd9 Greyscale decal tweaks + additions (#23961)
* "whitescales" every marking

* adds greyscale wooden trims

* Texturizes steel tile overlays

* Texturizes the rest

* Adds yaml for the greyscale trims (whoops)

(cherry picked from commit 1b8e536848)
2024-01-26 22:33:12 +01:00
icekot8 0d269d0954 new chemical-Necrosol (#23850)
* rollback

* dumb fix

(cherry picked from commit 6820cff4f5)
2024-01-26 22:33:11 +01:00
Jackal298 33fbccd65a Minor change to vending machine inventory (#23967)
(cherry picked from commit 996eba6bc6)
2024-01-26 22:32:57 +01:00
Emisse fbf19ac6f8 death squad armor tweaks (#23965)
* death squad resprite

* fix boote

(cherry picked from commit e93231ebaa)
2024-01-26 22:32:17 +01:00
Justin Pfeifler 06669e20e3 Update Blood Red Phone Sprite (#23964)
* Add new phone sprite

* Update copyright attribution

(cherry picked from commit 26c1a78186)
2024-01-26 22:31:36 +01:00
Justin Pfeifler 7c0cad7dc9 Fix Floodlight Collision (#23966)
Update floodlight mask and layer

(cherry picked from commit 43090844cd)
2024-01-26 22:31:35 +01:00
Flareguy f6273cf22b Ports some /tg/ + /vg/ space ambience (#23910)
* ports some tg + vg space ambience, removes all but 1 of the old space ambience music

* add back starlight and drifting

(cherry picked from commit 8a7ab61522)
2024-01-26 22:30:45 +01:00
metalgearsloth 01a8c0147b Update submodule to 204.1.0 (#23959)
(cherry picked from commit 4585589596)
2024-01-26 22:30:37 +01:00
Alzore 02ad3c7a2b Tesla Artifact Effect (#23958)
EffectTesla

(cherry picked from commit 5dd48f3dc0)
2024-01-26 22:30:28 +01:00
Pieter-Jan Briers 973d06aea5 Use item status extension method (#23884)
Just removes some lines of code.

(cherry picked from commit e665c2487e)
2024-01-26 22:30:27 +01:00
themias 4f2b2a5ae3 Headphones can be turned on (#23882)
Toggle headphones

(cherry picked from commit 8bba4b852b)
2024-01-26 22:30:26 +01:00
icekot8 e2e9eb62f6 medsec hud is no longer a filler (#23934)
* medsec hud

* medsec hud

* fix

(cherry picked from commit 3d9a6f57ac)
2024-01-26 22:30:25 +01:00
Jackal298 1e0f4f8dac (Add) black cap and some contraband (#23933)
* Add black cap and some contraband

* Bot fix

* bot fix 2

* Price increases

(cherry picked from commit 13c91c405c)
2024-01-26 22:30:14 +01:00
Kukutis96513 9c16a43a7e Bulk plushie lizard crate (#23927)
* make the bulk crate order

* added space lizard plushies to bulk crate

(cherry picked from commit bd17444cc5)
2024-01-26 22:28:52 +01:00
deltanedasanddeltanedas cf50b5a8b3 dedicated burn and shock meds (#23941)
* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 581c95ed72)
2024-01-26 22:28:40 +01:00
Nemanja 46f40662bb Stop the inevitability of death from misgendering you (#23949)
Fix rotting messages and make them use pronouns

(cherry picked from commit 0126b9820d)
2024-01-26 22:27:36 +01:00
Jackal298 f5925a4643 Respite and minor changes to mercenary items (#23783)
* Respite and minor changes to mercenary items

This is try number three, everything should be fine this time

* Fix meta

* Fix bot

* Fix bot 2

* Fix meta 2

* Fix meta 3

(cherry picked from commit f9f5db9357)
2024-01-26 22:27:17 +01:00
themias fde8491664 Fix clumsy defib debug assert (#23930)
* Fix clumsy defib debug assert

* don't need to specify null

(cherry picked from commit 25c477a642)
2024-01-26 22:27:16 +01:00
Trevor Day 2dbbd97720 Bluespace Anomaly Admin Logs (#23942)
Add bluespace anomaly teleportation logs.

(cherry picked from commit cc823e24e9)
2024-01-26 22:27:15 +01:00
Flareguy 73fb1b3f91 Fix light tube broken state (#23939)
fix light tube broken state

(cherry picked from commit 79ab290444)
2024-01-26 22:27:14 +01:00
metalgearsloth 2cd742f750 Split cargo shuttle to its own component (#23926)
* Split cargo shuttle to its own component

If mappers want 1 morbillion of them this is easier to manage.

* balls

(cherry picked from commit 55a60b0fca)
2024-01-26 22:27:13 +01:00
mr-bo-jangles 7075f5c37d Optimise the puddle system to reach an equilibrium quickly. (#23776)
* Optimise the puddle system to reach an equilibrium quickly.

* Remove use of Linq
Try to be more efficient with Tuples

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 064d52db41)
2024-01-26 22:27:12 +01:00
Nemanja fa762bfa8e Add doors to the station map (#23639)
* Add doors to the navmap

* tweaksies

* gah

* draw primitive

* draw primitive? at least take me out to dinner first!

* Update Content.Client/Pinpointer/UI/NavMapControl.cs

* casualties

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 1886941da6)
2024-01-26 22:27:10 +01:00
metalgearsloth ef62280bf8 Only hide ruins labels (#23925)
(cherry picked from commit 801f141c6a)
2024-01-26 22:27:09 +01:00
Ubaser cb5fb265c7 Fix tips (#23920)
(cherry picked from commit d99c56f67d)
2024-01-26 22:27:07 +01:00
Emisse a8174a0ff6 crusher rebalanceing (#23916)
* Update mining.yml

* Update mining.yml

* glaive LS is actually fine

* crusher faster than glaive

* Update mining.yml

* Update mining.yml

(cherry picked from commit f9d53525ca)
2024-01-26 22:26:56 +01:00
IProduceWidgets 058f10078c Uranium & AP magazine and projectile sprites (#23914)
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.

(cherry picked from commit 11bbf2b020)
2024-01-26 22:26:55 +01:00
Nemanja 9890ea542c machine parts + power cell resprite (#23913)
* machine parts + power cell resprite

* logic fix

(cherry picked from commit b3014e6cb3)
2024-01-26 22:26:40 +01:00
metalgearsloth c720d5fd77 Throttle MagicMirror do_afters (#23867)
Doesn't fix the gross network spam but that's for later.

(cherry picked from commit 34d2330604)
2024-01-26 22:26:30 +01:00
Emisse b737fcd694 remove ame parts from cargo (#23903)
(cherry picked from commit eee7aef63a)
2024-01-26 22:26:17 +01:00
Flareguy 601bcefb3b Makes lights use the "old" light fixture sprites (#23898)
returns the ss13 light fixture sprites

(cherry picked from commit 31cc9babaa)
2024-01-26 22:26:16 +01:00
Pieter-Jan Briers fdfd718f60 Fix admin log key order. (#23052)
The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round.

(cherry picked from commit a39999fb9c)
2024-01-26 22:26:15 +01:00
Emisse 24511a849a make intercoms draw above table (#23897)
Update intercom.yml

(cherry picked from commit c7ad10d0ad)
2024-01-26 22:26:13 +01:00
nikthechampiongr 8b414701ca Fix tranquiliser shells not working (#23886)
* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02 which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids

(cherry picked from commit ef132c8a7b)
2024-01-26 22:26:12 +01:00
Arendian e36dd93b60 Fix borg becoming emag immune if emag attempted with panel closed. (#23729)
* Fix borg becoming emag immune if emag attempted with panel closed.

* new event

* removed code added in accessreader

* fix emag 1984

(cherry picked from commit 23e714e523)
2024-01-26 22:26:05 +01:00
nikthechampiongr 98e9d86840 Aghosts and other powerful beings no longer burn their hands on lights. (#23879)
Make aghosts and other things that can't take burn damage not burn their
hand when changing lightbolbs

(cherry picked from commit 7aee192d52)
2024-01-26 22:25:50 +01:00
Arendian 918c917052 Fix roller skates debug assert (#23876)
Networkedcomponent

(cherry picked from commit 464f24d040)
2024-01-26 22:25:49 +01:00
themias 0dd92f8ab3 Fix flippo sprite layer (#23877)
(cherry picked from commit 1cf07fadac)
2024-01-26 22:25:36 +01:00
metalgearsloth 73a7c2affc Fix ruins being added to station grid (#23865)
(cherry picked from commit a46f6f3f85)
2024-01-26 22:25:34 +01:00
metalgearsloth 8a2f414ef2 Fix tiledef reloads AKA void planet (#23864)
(cherry picked from commit cd1ef71e31)
2024-01-26 22:25:33 +01:00
Guillaume E 75e6237060 Show how close bodies are to rotting (#23530)
* Show how close bodies are to rotting

When examining a dead body, you will be able to see of close
it is to rotting.

 - "It still looks fresh.", in the first third of the pre-rot period
 - "It looks ripe.", in the second third
 - "It's starting to look bad.", in the last third

This could help players prioritize medical care.

* Alter the wording of the pre-rot indicator

* Use numeric rotting stages in FTL

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit af7327e59f)
2024-01-26 22:25:32 +01:00
Debug 177d640708 Worldgen go brr 2024-01-26 22:25:00 +01:00
Ubaser d48303bd19 Moths get insect blood (#23671)
* ya

* mothroach

* update

* fix

* fixe

* add

(cherry picked from commit e91e746dd3)
2024-01-26 22:24:21 +01:00