Commit graph

1634 commits

Author SHA1 Message Date
Morbo
f40e2acdd8
Add Discord round start notifications (#95)
* Add new round Discord role alert

* Add russian locale for Discord alert

* Make Discord role id var optional

* Rename new_round ccvars to just round
2022-02-11 00:09:44 +03:00
Arthur
907e7464ff Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-10 09:27:57 +03:00
Leon Friedrich
706ac6af40
Revert "Revert "epic Respiration Rework"" (#6527) 2022-02-09 21:53:10 -07:00
Leon Friedrich
7549adf2f4
Reduce verb menu pop-in / rearranging (#6611) 2022-02-10 14:27:34 +11:00
Leon Friedrich
1c9ffdc78c
Replace VerbTypes with verb classes (#6525) 2022-02-10 13:30:59 +11:00
metalgearsloth
1182ac19fb
ECS expendable lights (#6370) 2022-02-10 13:01:43 +11:00
Acruid
cd9cc17339
Adds gratuitous logging to AlertsUI for debugging. (#6574) 2022-02-10 12:32:57 +11:00
Leon Friedrich
212c27cd6f
Fix Injector (#6585) 2022-02-10 02:08:59 +11:00
metalgearsloth
70f3c7c7e9
Sprite netsync purge (1st wave) (#6557) 2022-02-10 00:44:29 +11:00
Arthur
68e47a8ac5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Server Info/Rules.txt
2022-02-09 08:40:52 +03:00
WlarusFromDaSpace
50b1af08a2
Adds emergency access to airlocks (#6500) 2022-02-09 14:13:35 +11:00
mirrorcult
31769edf5f
Decal Placer + add new decals for mapping (#6548)
* abomination

* okay its less unabashedly garbage now

* other UI changes

* its britney bitch

* proper greyscale full/half/quarter tiles

* misc cleanup

* rsi

* Add a palette system. It's Kara's problem now.

* oops

* a

* Departmental palette alpha tweaks

* oopy

* so true

* Update Content.Shared/Decals/ColorPalettePrototype.cs

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

* fixes for that

* neutral light color and new warning lines

* dirt

* checkerboards

* oop

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-08 14:54:41 -06:00
Leon Friedrich
bd930de044
Allow a range <= 0 in InRangeUnoccluded (#6440) 2022-02-08 11:08:07 -07:00
TheDarkElites
8c47d6103f
Add PDA Ringtones (#5842)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-02-08 20:39:23 +11:00
wrexbe
425712adea
Removed extra comp name attributes (#6449) 2022-02-08 19:42:49 +11:00
Arthur
f8cf1e29b1 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-08 08:27:12 +03:00
metalgearsloth
310f6e14f1
Portable flasher tweaks (#6517) 2022-02-08 14:08:21 +11:00
metalgearsloth
70c0a502cf
ECS tags (#6504) 2022-02-08 14:08:11 +11:00
Arthur
583caf2d76 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-07 20:31:46 +03:00
Leon Friedrich
6e8c92d13e
Revert "epic Respiration Rework" (#6524) 2022-02-07 18:13:14 +11:00
Pancake
35eb6f8576
Add CVars for vote timers. (#6519)
* Update VoteManager.DefaultVotes.cs

Quick fix to lower map vote time to 90sec.

* Change to CVars
2022-02-06 23:26:19 -06:00
mirrorcult
4ae1c4e332
epic Respiration Rework (#6022) 2022-02-06 21:48:15 -07:00
metalgearsloth
f9e32fb0c1
Revert "Add support for multi-layer in-hand and clothing sprites" (#6521) 2022-02-07 14:59:22 +11:00
Leon Friedrich
470e4f8bdc
Add support for multi-layer in-hand and clothing sprites (#6252) 2022-02-07 14:37:57 +11:00
Arthur
85694b8513 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-07 01:38:12 +03:00
ScalyChimp
3c9328ff99
Adds portable flasher (#4523)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-07 02:59:41 +11:00
metalgearsloth
da1007b7f1
Chem injectors ECS (#6366) 2022-02-07 00:34:13 +11:00
metalgearsloth
627cbba2b6
Crayons ECS (#6364) 2022-02-06 23:32:32 +11:00
mirrorcult
d5b8449edb
Global usings (#6472) 2022-02-05 11:39:36 -07:00
Arthur
01af9d9e15 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
2022-02-05 12:20:28 +03:00
Leon Friedrich
dd61fb46ea
Adjust interaction ordering & interaction conditions (#6387) 2022-02-05 13:39:01 +11:00
Willhelm53
4d3a381962
Mopping Puddle Dilution and Wet Floor Sparkles (#6273) 2022-02-04 19:26:11 -07:00
metalgearsloth
1de18f2821
Flashable cangetstate ref (#6441) 2022-02-04 12:43:58 +11:00
Leon Friedrich
0da74b1bfb
misc optimization (#6436) 2022-02-02 22:40:22 -07:00
metalgearsloth
32a1f6ae93
ECS computers (#6353) 2022-02-03 10:20:17 +11:00
Arthur
d2c978f009 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Maps/game.yml
2022-02-02 21:04:06 +03:00
metalgearsloth
80727f7fa4
ECS cluster nades (#6368) 2022-02-02 18:04:38 +11:00
metalgearsloth
2e5808085d
Set mover velocity via system (#6288) 2022-02-02 17:34:25 +11:00
wrexbe
17db0775c8
Auto comp (#6416) 2022-02-02 14:35:40 +11:00
Morbo
9d0d25a9d8
Decrease default interaction range to 1.2 (#85) 2022-01-31 22:29:30 +03:00
Arthur
9b1ac3a997 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/game.yml
2022-01-31 22:13:14 +03:00
Leon Friedrich
4614bb9877
Move static container helper functions to container system (#6382)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-31 18:08:53 +11:00
Leon Friedrich
af13751600
Fix item actions (#6383) 2022-01-31 18:07:03 +11:00
mirrorcult
a055ec3514
Port the Mass Scanner from OR14 (#6172)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-31 16:38:11 +11:00
Fishfish458
b837b186a5
Attempted Small Vending Machine Refactor (#6157)
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 15:16:41 +11:00
Julian Giebel
305cff2659
Implement ECS alternative for IDragDropOn and fully ECS disposal units (#6380)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-31 03:53:22 +11:00
Leon Friedrich
d40bcc9168
Fix some mispredict reconciliation issues. (#6319)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-31 03:34:48 +11:00
wrexbe
c7a6d2312f
Fix being able to click things through walls sometimes (#6315) 2022-01-31 02:39:59 +11:00
Leon Friedrich
83d29ce38d
Raise an attempt-event when receiving client BUI messages. (#6113) 2022-01-31 02:26:07 +11:00
mirrorcult
fd316c3983
Fire extinguisher/spray refactor (#6314)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-31 01:42:15 +11:00