Commit graph

2477 commits

Author SHA1 Message Date
Arthur
b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
2022-07-29 17:59:17 +03:00
Leon Friedrich
ebe6093af1
Pulling state handling changes (#9952) 2022-07-29 12:13:43 +10:00
Leon Friedrich
7cf67e1323
Move some default window positions (#10007) 2022-07-29 12:13:22 +10:00
Leon Friedrich
c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
Leon Friedrich
d279f6172a
Fix item/clothing visual & networking bugs (#10116) 2022-07-28 18:02:09 -07:00
Kara
258ec0cac1
Clothing/item ECS & cleanup (#9706) 2022-07-27 03:53:47 -07:00
Flipp Syder
963ddd507b
Fixes issue with camera switching static appearing when it shouldn't be (#10067) 2022-07-26 21:09:32 -07:00
ModeratelyAware
3e28b7f236
Converted FireExtinguisherVisualizer to generic visualizer (#10058) 2022-07-26 17:40:13 -07:00
Morber
61951a84f1
[Resprite] Singularity stuff (#320)
* Update containment field sprite

* Update 1 level singularity sprite

* Update 3 level singularity sprite

* Fix sprite sizes

* Fix sprite state name

* Update 4 level singularity sprite

* Fix sprite size

* Update 5 level singularity sprite

* Update level 6 singularity sprite

* Remove 6 level sprite of singularity

* Remove 6 level meta.json

* Add level 6 singularity custom sprite

* Update containment generator sprites

* Remake emitter with new sprites

* Update collector sprites

* New emitter sprite files

* Update level 6 singularity sprite

* Update license singularity level 6

* Decrease singularity to 20 fps
2022-07-26 20:56:02 +03:00
Leon Friedrich
ce24d16593
Remove more server sprite component uses (#9963) 2022-07-27 02:22:49 +10:00
metalgearsloth
5eb0e62142
Fix do-after flicker (#10020) 2022-07-26 06:57:31 -07:00
Leon Friedrich
5449e7875e
Vending visualizer update (#9962) 2022-07-26 10:35:36 +10:00
metalgearsloth
9eec2268d8
Fix cursor popups (#10016) 2022-07-25 01:58:23 -07:00
metalgearsloth
bff407588e
Clip radar control (#10011)
Forgor to do it. Still need to make the viewport square but at least it won't draw under the display anymore.
2022-07-25 15:42:08 +10:00
metalgearsloth
4a09ef80ad
Scrolling menu parallax + less tiling (#9764)
* Scrolling parallax

* unnecessary field

* Load fastspace
2022-07-25 15:31:19 +10:00
metalgearsloth
bfac53e7bc
Per-map parallax support (#9786)
* Per-map parallax support

* Comments for future sloth

* c

* bet

* Fix exception

* VV support

* Fix parallax

* mem

* weightless sounds

* Gravity stuff

* placeholder coz im too lazy to stash don't @ me son

* decent clouds

* sky

* Fast parallax

* Imagine spelling

* Loicense

* perish

* Fix weightless status

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-07-25 00:10:23 -05:00
Flipp Syder
fab5aed3b8
Fixes power wire action electrocution (#8520) 2022-07-24 21:53:30 -07:00
metalgearsloth
dad26db137
Fix a bunch of mover bugs (#9999)
* Fix a bunch of mover bugs

Just regressions from random things

* Fix vehicle movement I guess
2022-07-25 14:16:24 +10:00
Leon Friedrich
ed068b166f
Gas tile overlay rejig (#9619) 2022-07-24 19:10:18 -07:00
ike709
c65cf5bb1f
Adds the station name to PDAs (#9987)
Co-authored-by: ike709 <ike709@github.com>
2022-07-23 18:58:28 -07:00
Rinkashikachi
6137803891
Various localization fixes (#9860) 2022-07-24 04:44:45 +10:00
Arthur
075299b54d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
2022-07-22 22:45:30 +03:00
Moony
f98df73fae
Adds even more smites and a bunch of tools. (#9825)
* Adds three new smites, headstand, locker stuff, and reptilian species swap.

* Localize all the smites.

* save work

* More smites...

* Final tweaks.

* oops

* !PLEH

* Adds disarm prone and improved hand removal options.

* fix chances.

* take out the trash.

* Add some admin TRICKS instead of more smites.

* oop

* Implements the admin test arena and associated trick.

* Tricks for granting/revoking access.

* e

* mfw

* Implement quick dialogs, for when you don't want to spend 20 minutes writing a simple dialog prompt.

* Forgot the rejuv icon.

* E

* docs

* augh

* Add rename/redescribe buttons.

* Adds objects menu, implements a couple tricks for stations.

* 1984

* Adds a trick for effectively infinite power.

* fixes some icon uggo.

* a

* HALT!

* Pause/unpause buttons.

* Forgor the textures.

* they broke every bone in their body.

* i added more

* more battery actions, touch up battery icon.

* Address reviews.
2022-07-21 17:30:00 -05:00
Chris
e8eaaa2189
Research Servers now have proper IDs, and can be selected in lathe menu (#9949)
* rd servers now increment properly when added

* remove debug message
2022-07-21 17:16:14 -05:00
Alexander Razdelkin
e3c42ffdba
Добавление простой системы целей станции (#268)
* added simple station goal system

* * removed unused code
* fixed localization

* moved corvax specific features to corvax dir

* * moved RoundStartedEvent
* removed unnecessary xml element

* added 'sealed' to classes

* added centcom stamp
changed sprite to paper with words

* fixed stamp information

* добавлена en-US локализация

* Use right CentComm name

* Use paper system to paper goal content

Co-authored-by: Arthur <14136326+Morb0@users.noreply.github.com>
2022-07-21 14:46:59 +03:00
Andreas Kämper
5a6cc0933b
Allow pAIs to play MIDI again (#9921) 2022-07-20 18:08:33 +02:00
Moony
a2d26ac0ca
The nuke must be anchored to arm. (#9898) 2022-07-19 20:57:05 -07:00
Rane
037feb3ad0
Fix blindfold round cleanup bug (#9821)
* Blindness public api

* fix blinding round cleanup bug
2022-07-19 17:10:08 +10:00
metalgearsloth
91adb3edb3
Damage overlay fixes (#9831)
- Fix death overlay showing when returning to body.
- Made the diff non-linear.
2022-07-19 17:09:26 +10:00
Nemanja
f8b8b83657
allow decals to be removed from placement menu (#9843) 2022-07-17 21:02:03 -05:00
metalgearsloth
63b48e05af
Fix docking control size (#9833) 2022-07-17 21:11:54 +10:00
Kara
71984a028c
Order permissions panel admins by username (#9782) 2022-07-17 14:23:26 +10:00
metalgearsloth
b9e876ca92
The real movement refactor (#9645)
* The real movement refactor

* ref events

* Jetpack cleanup

* a

* Vehicles partially working

* Balance tweaks

* Restore some shitcode

* AAAAAAAA

* Even more prediction

* ECS compstate trying to fix this

* yml

* vehicles kill me

* Don't lock keys

* a

* Fix problem

* Fix sounds

* shuttle inputs

* Shuttle controls

* space brakes

* Keybinds

* Fix merge

* Handle shutdown

* Fix keys

* Bump friction

* fix buckle offset

* Fix relay and friction

* Fix jetpack turning

* contexts amirite
2022-07-16 13:51:52 +10:00
Nemanja
7b6de14f12
quickfix nukie uplinks (#9765) 2022-07-16 05:06:05 +10:00
Arthur
6604e68c44 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:48:38 +03:00
Rane
188934a748
Portable scrubbers (#9417) 2022-07-15 05:46:30 -07:00
Arthur
0052df0cf5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Maps/infiltrator.yml
2022-07-15 15:39:41 +03:00
metalgearsloth
8f315321fb
Smooth radar zooming (#9753) 2022-07-15 15:32:48 +10:00
Kevin Zheng
44e4678435
Reduce radar minimap radius (#9673) 2022-07-15 14:50:47 +10:00
Nemanja
06a7d75641
Job-specific traitor items (#9601) 2022-07-15 14:26:06 +10:00
metalgearsloth
1251b3aeda
Add FTL destinations (#9685) 2022-07-15 14:11:41 +10:00
metalgearsloth
2420d281bb
Fix loadbp window perm issue (#9671) 2022-07-15 13:03:18 +10:00
Kara
ad7889e8a9
Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
metalgearsloth
786c8a7c79
Make sure dragdrop doesn't delay by a frame (#9745) 2022-07-14 19:43:39 -07:00
Leon Friedrich
72599e5282
Fix disappearing decals bug (#9608) 2022-07-14 19:33:11 -07:00
Leon Friedrich
21fca0f6e3
Prevent content from overriding sprite shader (#9036) 2022-07-14 19:28:51 -07:00
Leon Friedrich
9541eeb189
Make disposal pipes use generic visualizer (#9672) 2022-07-15 02:04:23 +10:00
metalgearsloth
cd4b7bd85c
Muzzle flash enhancements (#9527) 2022-07-14 23:03:48 +10:00
metalgearsloth
38fc066fb9
Re-implement recoil (#9406)
* Re-implement recoil

Playing around with the values atm

* Update constants

* final tweaks
2022-07-14 22:01:25 +10:00
Rane
83c03b60a1
[2 lines] fix blinding (#9690)
* Adds blinding + blindfolds (#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

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

* resolve merge conflict

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-07-14 06:58:24 -05:00