18228 Commits

Author SHA1 Message Date
RavmorganButOnCocaine
58b337a893 Automatic changelog update 2024-07-29 12:34:51 +00:00
ThereDrD0
d931838649 Фиксы РЦД и РПД (#511)
* fix rcd and rpd crafting with full capacity

* Lets atmos build gas pipes in walls (#28707)

Co-authored-by: plykiya <plykiya@protonmail.com>

* slower disposal units building with rpd

* allow build pipes in walls

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-29 15:33:46 +03:00
Jabak
cb0da4cf65 Merge remote-tracking branch 'upstream/master' into ups 2024-07-29 12:58:16 +03:00
RavmorganButOnCocaine
5ae99b4e37 Automatic changelog update 2024-07-29 03:05:24 +00:00
ThereDrD0
d627758826 Баффы (#510)
* Moodsystem cleanups

* remove overhydrated and overfed mood debuffs

* admins now join game deadmined + new player timers

* faster arrivals

* recharging rcd with metal, glass, plastic or cable coils

* better timings and costs + building apc and camera

* preparing for rpd

* RPD + make RCD more generic

* add rpd to atmos lockers, rcd to engivend

* rcd and rpd to technologies

* dont deadmin me in debug

* rcd ammo buff

* add ChargeCountModifier logic for non stackable items

* increase time to become experienced player

* Dynamic Radial Menus (#29678)

* fix

* Clean Some Code

* Some Commentaries

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* more dynamically parameters

---------

Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-29 06:04:21 +03:00
Trest
0f641a46d2 added Shelf (#509) 2024-07-28 23:44:04 +03:00
RavmorganButOnCocaine
e69a0c3a49 Automatic changelog update 2024-07-28 18:03:58 +00:00
Spatison
bd7537f568 Fix (#508) 2024-07-28 21:02:54 +03:00
RavmorganButOnCocaine
5854304cc4 Automatic changelog update 2024-07-28 16:55:36 +00:00
Trest
935663cb59 Update mannequin_inventory_template.yml (#505) 2024-07-28 19:54:49 +03:00
Aviu00
edf9f243a1 Blood (#507)
* - tweak: Nerf spear.

* - tweak: Blood bolt barrage.

* - add: Cult stuff.

* - fix: Cult fixes.

* - remove: Garbage.

* - fix: Multiple pylons.

* - fix: Pylon placement fix.

* - add: Lots of cult stuff.
2024-07-28 19:54:32 +03:00
Jabak
d73a5c5f2b new music jukebox "Loop Hero - Cosmic Temperance" 2024-07-28 19:05:18 +03:00
Jabak
decd47769b Merge remote-tracking branch 'upstream/master' 2024-07-28 15:08:05 +03:00
RavmorganButOnCocaine
2a9344f616 Automatic changelog update 2024-07-27 15:49:29 +00:00
RedBurningPhoenix
3ed0f2c4bb SUPER CAMERA(OCHKO) (#501)
* SUPER CAMERA(OCHKO)

* Удобный монитор камер и портативный мониторинг для детектива. (#25)

* Улучшение мониторинга камер

* Портативный монитор камер для дека

* чейнжлог

* Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)"

This reverts commit adf35bb8f6ddd6256b18841a81b330224ebff103.

* Revert "Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)""

This reverts commit bd30fe45046b7b8508e8277f8c186d03338354cd.

* cleanups

* its so over

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: drdth <drdtheuser@gmail.com>
2024-07-27 18:47:27 +03:00
PuroSlavKing
a1f562d181 [Feature] Wide Glass Airlocks (#504)
* [Feature] Double Airlock

* up1

* [Feature] Threeple Airlock
2024-07-27 18:46:53 +03:00
Jabak
5dbbf68af8 Merge remote-tracking branch 'upstream/master' 2024-07-26 23:28:33 +03:00
ThereDrD0
85b86f2026 Revert gersoon (#502)
* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser
2024-07-26 22:06:15 +03:00
Jabak
53e4d2bfe5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-26 21:32:42 +03:00
Gersoon
2e0704bb13 Изменено (#500)
Ээээааа. Я не туда насрал
2024-07-26 19:40:56 +03:00
Gersoon
985048acc6 Изменено
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
2024-07-26 18:38:36 +02:00
RavmorganButOnCocaine
f8eb004541 Automatic changelog update 2024-07-26 13:54:28 +00:00
Spatison
e147c02db3 add: Теперь сняряды для Синано можно печатать (#499) 2024-07-26 16:53:25 +03:00
Bombinos
be8545d181 Трусы для народа!
Loadouts трусов!
2024-07-25 21:33:11 +03:00
RavmorganButOnCocaine
ce93df8a77 Automatic changelog update 2024-07-25 13:34:16 +00:00
Spatison
cf4530e3a6 Shinano (#494)
* Shinano

* A < a
2024-07-25 16:33:11 +03:00
Aviu00
f9224ea2f5 Фиксы в основном (#495)
* - fix: No concealed rune interaction.

* - fix: Wizard rule min players.

* - add: Holosign stuff.

* - add: Don't despawn dragon.

* - tweak: Implants.

* - fix: Hijack.

* - remove: Hardsuit objective.

* - fix: Holosigns.

* - fix: Fix chair rotation.

* - fix: No shooting while delayed.

* - fix: Changeling felinid polymorph.

* - fix: Fix stuck in container in container.

* - fix: Fix flash in containers.

* - fix: Whistle chameleon.

* - fix: Loc.

* - fix: No shooting in body bags.

* - fix: Error.

* - fix: Ling felinid fix attempt 2.
2024-07-25 16:32:56 +03:00
Jabak
c47ef9eea5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-25 14:32:04 +03:00
PuroSlavKing
4b486a9641 [Tweak] Better Prototypes (#490)
* [Tweak] Better Prototypes

* up1

* up2

* up3
2024-07-25 00:53:26 +03:00
RavmorganButOnCocaine
cae8c9b753 Automatic changelog update 2024-07-24 19:41:42 +00:00
ThereDrD0
f56e97b122 Порт атмоса с ЕЕ + пара фиксво (#491)
* fix a lot of spaces in shuttle call reason

* fix tts fatal without api url

* Physics Based Air Throws (#342)

I've made it so that when a room is explosively depressurized(or when a
body of high pressure air flows into one of lower pressure air), that
entities inside are launched by the air pressure with effects according
to their mass. An entity's mass is now used as an innate resistance to
forced movement by airflow, and more massive entities are both less
likely to be launched, and will launch less far than others. While
lighter entities are launched far more easily, and will shoot off into
space quite quickly! Spacing departments has never been so exciting!
This can be made extraordinarily fun if more objects are given the
ability to injure people when colliding with them at high speeds.

As a note, Humans are very unlikely to be sucked into space at a typical
force generated from a 101kpa room venting into 0kpa, unless they
happened to be standing right next to the opening to space when it was
created. The same cannot be said for "Lighter-Than-Human" species such
as Felinids and Harpies. I guess that's just the price to pay for being
cute. :)

On a plus side, because the math behind this is simplified even further
than it was before, this actually runs more efficiently than the
previous system.

Nothing, this is basically done. I've spent a good 6 hours straight
finely tuning the system until I was satisfied that it reflects
something close to reality.

**Before the Space Wind Rework:**

https://github.com/Simple-Station/Einstein-Engines/assets/16548818/0bf56c50-58e6-4aef-97f8-027fbe62331e

**With this Rework:**

https://github.com/Simple-Station/Einstein-Engines/assets/16548818/6be507a9-e9de-4bb8-9d46-8b7c83ed5f1d

🆑 VMSolidus
- add: Atmospheric "Throws" are now calculated using object mass, and
behave accordingly. Tiny objects will shoot out of rooms quite fast!

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* fixes

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-07-24 22:40:38 +03:00
Jabak
68a4d06490 Merge remote-tracking branch 'upstream/master' into ups 2024-07-24 19:13:19 +03:00
RavmorganButOnCocaine
c4ed22638b Automatic changelog update 2024-07-23 23:20:34 +00:00
Spatison
6aa5544bdb Гранатомет СБ (#483)
* tweak: Гранатомет СБ

* Синано
2024-07-24 02:19:31 +03:00
ThereDrD0
0d99c5afe7 Фиксы (#488)
* add material storage component to whitemoose

* fix pickaxe inventory size

* fix free sponsor only races

* invisible aghost no longer visible in ghost warp menu

* add migration for BoxTrashbag

* fix make wizard admin verb

* fixed wizard components swap and new wizard marks as wizard in ghost warp menu now

* Stop eating food if you drop it (#29854)

* Stop eating food if you drop it

* woops, unused param

* comments

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Eating and Drinking Doafter Change (#30060)

My lawyer told me to do this

Co-authored-by: plykiya <plykiya@protonmail.com>

* ActivatableUI tweaks (#27448)

* ActivatableUI tweaks

* EntGotRemovedFromContainerMessage

* A

* Revert "ActivatableUI tweaks (#27448)"

This reverts commit 5b311c6fdbf77db6838bdcf9993b98272d4ebeac.

* fix eating food from containers

* fix double captain duffel

* add bible for chaplain loadout

* possible bad fix for double security headsets

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
2024-07-24 02:19:13 +03:00
RavmorganButOnCocaine
a3ce41d6ea Automatic changelog update 2024-07-23 17:38:19 +00:00
ThereDrD0
1acc84c21c Cherry picks 6 (#486)
* inital

* force them to WRITE

* b

* new system

* aaaa

* b

* bbbb

* translations

* add tts support for evacuation reason

* PaddedStool_Sprite&Prototype

8 colors of pudded stool.

* PaddedStool_Crafting

* ComfyChair_Sprites&Prototype

* ComfyChair_Crafting

* Sofa_Sprites&Prototype

* Sofa_Crafting

* Sofa_SpriteFix

* Sofa_RemoveSomeSprites

* Revert "Sofa_RemoveSomeSprites"

This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6.

* Revert "Sofa_SpriteFix"

This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248.

* Revert "Sofa_Crafting"

This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b.

* Revert "Sofa_Sprites&Prototype"

This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622.

* Revert "ComfyChair_Crafting"

This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b.

* Revert "ComfyChair_Sprites&Prototype"

This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80.

* Revert "PaddedStool_Crafting"

This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802.

* Revert "PaddedStool_Sprite&Prototype"

This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba.

* Sprites&Meta

* Crafting

* Tweaks

* PaddedStool_tweaks

* Add Random Spawners

* remove old colored chairs

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* add bouquet

* Not very useful functionality has been removed

* Update toys.yml

* Now you need cloth to made bouquet

* Update toys.yml

* I hope. I done right

* Update toys.yml

* Update bouquet.yml

* Update toys.yml

* Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml

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

* add musician jumpskirt to loadouts

* better bouquet

* pAIs can now be inserted into plushies.

* No more bad bleed

* More Tourniquets, hopefully fixed YML check.

* deals a bit of bloodloss

* Reduce Stack Count.

* fix tourniquet

* add migrations for old chair types and add few new

---------

Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Moomoobeef <moomoobeef@protonmail.com>
Co-authored-by: PoorMansDreams <andyroblox14@gmail.com>
2024-07-23 20:37:15 +03:00
PuroSlavKing
5a1f7baaa4 [Tweak] Something about metabolism (#485)
* [Tweak] Something About Metabolism

* up1
2024-07-23 20:36:35 +03:00
Jabak
624e6a9453 Merge remote-tracking branch 'upstream/master' 2024-07-23 19:02:41 +03:00
RavmorganButOnCocaine
003452b8e1 Automatic changelog update 2024-07-23 15:35:17 +00:00
Aviu00
b64eea4b3f - fix: Chameleon projector. (#484) 2024-07-23 18:34:12 +03:00
RavmorganButOnCocaine
541c463098 Automatic changelog update 2024-07-23 02:04:36 +00:00
PointPNG
7c45bd471b Wonder and WhiteMoose update (#482) 2024-07-23 05:03:31 +03:00
RavmorganButOnCocaine
2f998722de Automatic changelog update 2024-07-22 17:07:05 +00:00
Aviu00
f65c2e5c84 Flashbang tweaks. (#478)
* - tweak: Flashbang tweaks.

* - add: More flashbang stuff.
2024-07-22 20:06:02 +03:00
Jabak
2204038ce6 муд хуюд 2024-07-22 19:50:58 +03:00
Jabak
af04e7e75f Merge remote-tracking branch 'upstream/master' into UPS 2024-07-22 19:24:10 +03:00
RavmorganButOnCocaine
96c7a3c4c3 Automatic changelog update 2024-07-22 14:25:03 +00:00
Aviu00
a8ffd3280a - tweak: Thermal tweaks. (#477) 2024-07-22 17:24:00 +03:00
RavmorganButOnCocaine
05e7b356f4 Automatic changelog update 2024-07-22 14:21:20 +00:00