13 Commits

Author SHA1 Message Date
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
Aviu00
d3cd3c430a Upstream upstream 2024-01-27 09:34:07 +03:00
HitPanda
7c9bd1d934 [Feat] Респект и уважуха (#476)
* db

* wd comment

* manager & commands

* system & round end results

* raise ban event

* client manager & cached values

* role pick tweak

* tweak last commit

* more fixes

* weights fix

* Fix for short rounds

* tweak in cached dictionary

* reva pick system

* fix last commit

* cult role pick

* nukeops role picking

* fix cache in async & show command

* ooc msg show value

* move pick method to manager & traitor pick fix
2024-01-25 08:05:48 +03:00
Nemanja
736b9dd7df Cryogenic Sleep Units (#24096)
* Cryogenic sleep units

* pause map support

* no more body deletion

* Cryogenic Storage Units

* boowomp

* no more emag, no more dropping present people
2024-01-14 23:35:28 -07:00
coolmankid12345
9df5ded9ad Revolutionaries (#18477)
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2023-10-04 18:47:33 -07:00
Sailor
b38685622e Merge pull request #19223
* Change manifesto to manifest
2023-08-16 15:20:09 -07:00
Arimah Greene
3e464cd1f0 Add CVar for customizing round restart time (#19136)
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
2023-08-16 04:36:50 +03:00
Kevin Zheng
5ba034ad36 Add automatic emergency shuttle call (#12473)
* Add automatic emergency shuttle call

This adds a cvar shuttle.auto_call_time which is an integer N, that
calls the emergency shuttle automatically without intervention after N
minutes. This can be disabled by setting N to 0.

After a vote to extend, the shuttle will be called automatically every
shuttle.auto_call_extension_time minutes.

* Update Resources/Locale/en-US/round-end/round-end-system.ftl

Co-authored-by: theashtronaut <112137107+theashtronaut@users.noreply.github.com>

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: theashtronaut <112137107+theashtronaut@users.noreply.github.com>
2022-11-09 22:20:36 -06:00
Morber
4cceface6f Localize ETA units (#9267) 2022-06-29 13:13:36 +10:00
metalgearsloth
521ed99766 Evac shuttle (#8931)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-26 15:20:45 +10:00
ShadowCommander
a57e0ca199 Add round id to lobby and round end summary (#7547) 2022-04-14 13:40:26 -05:00
T-Stalker
613afb64bb Makes round-end-eta tell the restart time in minutes (#6777) 2022-02-19 17:42:16 -07:00
Galactic Chimp
392b820796 Removed old Loc.GetString() use instances (#4155)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00