Commit graph

2491 commits

Author SHA1 Message Date
Morbo
228c19c52c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/white.png
2022-10-28 17:19:32 +03:00
metalgearsloth
6b6d52850a
Deprecate entitylookupcomponent (#12159)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-27 23:37:55 +11:00
Rane
6577532adf
Make #11647 actually function (#12229) 2022-10-26 16:22:12 -07:00
metalgearsloth
f38bef562c
Fix gun ItemStatus (#12225) 2022-10-26 07:46:13 -07:00
rolfero
9bbe0fec06
Add description tooltips to traits, jobs and antagonists (#11661)
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
2022-10-26 22:52:21 +11:00
0x6273
dfdad0ffe5
Refactor ReagentGrinder (#11751)
* Refactor ReagentGrinder

- It can now process partial stacks. (Before it would do nothing if the entire stack's solution didn't fit in the output container)
- Get rid of `SharedReagentGrinderComponent`, move shared stuff to `SharedReagentGrinder.cs`.
- Subscribe to events instead of massive switch/case.
- Get rid of update queue thing.
- Change `DoWork` so it's less duplicate code for grinding/juicing.
- Get rid of `ExtractableScalingEvent` and just scale directly based on item stack count.
- Add message for when you try to put something into the reagent grinder that doesn't fit.
- Fix obsolescence warnings.

* Use a timer on component instead of SpawnTimer

* s/StorageCap/StorageMaxEntities
2022-10-25 23:34:56 -07:00
Leon Friedrich
c0b657ca18
Remove InteractedWithEvent and friends. (#11939) 2022-10-26 12:15:48 +11:00
Rane
c3a92f26e6
network adding/removing StealthOnMove (#12203) 2022-10-25 14:09:16 +11:00
metalgearsloth
70cf361caa
Don't predict body init (#12163)
* Don't predict body init

Client doesn't handle predicted entity spawning so the organs hang around.

* Just use init

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-24 17:08:41 -07:00
Leon Friedrich
92e92dceb0
Unrevert #10934 2022-10-25 11:06:00 +11:00
Emisse
80fd37041f
Revert "Fix unintentional inventory relayed event handling " (#12182) 2022-10-24 17:06:04 +02:00
Leon Friedrich
145471be2d
Fix unintentional inventory relayed event handling (#10934)
* Add InventoryRelayedEvent<TEvent>

* implement relays

* typos

* a
2022-10-24 01:04:49 -07:00
Leon Friedrich
0b8622e9e7
Misc content xform changes (#12166) 2022-10-24 00:19:51 -07:00
Morbo
a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/hydro.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/laundry.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/Textures/Tiles/white.png
2022-10-23 17:55:21 +03:00
DrSmugleaf
f323fb7644
ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-10-22 15:46:28 -07:00
Leon Friedrich
7d276d1101
Remove server/client clothing components. (#11981) 2022-10-22 15:30:37 -07:00
Rane
916c4f9522
Unhardcode species age ranges (#11979) 2022-10-22 15:13:46 -07:00
Rane
a2a895de4e
seperate Stealth and StealthOnMove (#12035) 2022-10-22 15:06:55 -07:00
metalgearsloth
15029b8410
Optimise mob moverment a little bit (#12136) 2022-10-22 14:50:25 -07:00
Leon Friedrich
19586ea46c
Reset movement on player (de)attach (#12073) 2022-10-22 10:50:14 +11:00
Morbo
8ffba84896 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-21 19:51:57 +03:00
Kara
169ba3106b
Fix #12075 (#12118) 2022-10-21 01:54:18 -07:00
metalgearsloth
ebe79def58
Fix admin freeze attacks (#12072) 2022-10-21 01:09:52 +11:00
Flipp Syder
0fe9f38968
Actual randomized humanoids (#11574) 2022-10-21 00:46:05 +11:00
metalgearsloth
2a2434dbea
Fix wallmount interactions (#12013) 2022-10-21 00:20:52 +11:00
Nemanja
7cc1eba181
Mining Tweaks (#11468) 2022-10-21 00:16:29 +11:00
Francesco
9727cc0da0
FlashLightVisualizer refactor + low power handheld light light radius fix (#11768)
* refactor: Removes FlashLightVisualizer (based on obsolete code) in favor or merging its functionality with HandheldLightComponent
fix: Low power lighting radius animations for lanterns, floodlights and flashlights now properly restore the original light radius when going back to full power

* refactor: Use the LightBehaviour component to animate HandheldLights
refactor: Remove unneeded HandheldLight definitions in some yaml files (already inherited by parents)
fix: Properly change the server side PointLightComponent Enabled property when turning HandheldLights on/off
feat: ReverseWhenFinished property on Fade light behaviours

* Empty commit to rerun CI with the new engine PR

* fix: Restore the correct HandheldLight addPrefix property, whoops

* refactor: blinkingBehaviourID -> blinkingBehaviourId, radiatingBehaviourID -> radiatingBehaviourId
2022-10-19 13:34:36 -05:00
Leon Friedrich
f12d4a13d6
Misc action fixes (#12046)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-10-19 14:02:38 +02:00
Kara
3fd226d9f0
Extended rework & ramping event scheduler (#11362) 2022-10-18 19:51:47 -07:00
Kara
7ad867fa0f
Slight localization func cleanup (#11380) 2022-10-18 19:51:18 -07:00
Paul Ritter
78a139edb5
Predicts pulling (#12029) 2022-10-19 10:06:44 +11:00
Morbo
3af5b83703 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
2022-10-18 21:23:46 +03:00
Leon Friedrich
3aeba9a63e
Fix chat sanitization and entity name escaping (#12015) 2022-10-17 23:59:09 -07:00
Flipp Syder
a3dafd88dc
Oldchat (#11913)
* attempt at moving MainViewport to UIWidget

* oldchat (prototype)

* separate oldchat and default ss14 HUD into their own files

* restores original default game screen logic and adds that logic into separated chat game screen

* hand reloading, several tweaks to port oldchat to main ss14 branch

oldchat is currently not selectable

* screen type cvar, gameplay state screen reloading/loading

* reload screen on ui layout cvar change

* fixes up basic reloading (HUD switching is still very bad)

* some UI widget reloading for main UI screen switching

* alert sync on screen change

* inventory reload

* hotbar margin fix

* chat bubbles above viewport

* whoops

* fixes ordering of speech bubble root

* should fix the chat focus issue (at least in-game, not lobby yet)

* should fix up the lobby/game chat focus

* fixes chat for lobby, turns lobby into a UI state

* viewport UI controller

* viewport ratio selection

* whoops

* adds the /tg/ widescreen ratio

* removes warning from inventory UI controller, adds background to separated chat game screen's chat portion

* menu button reload

* unload menu buttons only from gameplay state shutdown

* bugfix

* character button fix

* adds config options for viewport width/UI layout

* variable naming changes, get or null instead of get to avoid exceptions

* moves entity system get into controller
2022-10-17 17:13:41 -05:00
Vera Aguilera Puerto
27d41b3a5b
Shutdown cleanup for stack type handler (#11996) 2022-10-17 17:49:38 +02:00
Vera Aguilera Puerto
f83f16df16
Add "count" to stack comp's type handler. (#11917) 2022-10-17 14:17:59 +02:00
metalgearsloth
123a9dbf02
Lag compensation for melee (#11885)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-17 15:54:31 +11:00
Leon Friedrich
bb61eb7f54
Move board spawning out of DoorSystem (#11772) 2022-10-17 03:43:33 +11:00
metalgearsloth
1782eb6ad7
Fix even more warnings (#11968)
Also more instances of someone using TryComp instead of HasComp

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 08:49:22 -07:00
metalgearsloth
5373fec641
Fix a bunch of warnings (#11965)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 08:44:23 -07:00
metalgearsloth
d1c1c8ada3
Fix canDisarm datafield (#11963)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 23:23:44 +11:00
Mervill
15a772fb96
Cleanup for ChargerComponent (#11907) 2022-10-16 21:21:54 +11:00
metalgearsloth
3d8a2adbf8
Hotfix buckle teleports (#11950) 2022-10-16 17:38:04 +11:00
Leon Friedrich
1c013f826d
Make stripping corpses faster. (#11945) 2022-10-16 16:26:28 +11:00
Leon Friedrich
243876474c
Fix inventory containers (#11944) 2022-10-16 15:16:27 +11:00
Leon Friedrich
6e6ddc0cb8
Fix crew monitor for rotated eyes (#11931) 2022-10-16 11:07:42 +11:00
Morbo
04fdbe539e Use gender distinguish for last names 2022-10-16 02:06:09 +03:00
Morbo
57d8a459bb Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Sex.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
Rane
c70e423ff6
Let species prototypes define valid sexes (Sex Refactor) (#11520) 2022-10-15 14:45:47 -07:00
Leon Friedrich
fd5b624a76
Ahelp / player list changes (#11392) 2022-10-15 14:26:29 -07:00