Morb0
84c143160a
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# SpaceStation14.sln
2023-11-24 12:58:41 +03:00
metalgearsloth
d4bed09cdc
Revert the other arch changes ( #21871 )
2023-11-24 11:19:46 +11:00
Morb0
43a5b73f4e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# SpaceStation14.sln
2023-11-23 18:28:34 +03:00
metalgearsloth
0c4e2650dd
Minor decal change ( #21860 )
2023-11-24 00:35:49 +11:00
metalgearsloth
76fe97b7c2
Use GetHashCode for client construction ( #21857 )
2023-11-24 00:19:30 +11:00
metalgearsloth
93bd9972f1
Content arch ( #20107 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-11-23 14:34:37 +11:00
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
metalgearsloth
985da52191
Decal fix ( #21761 )
...
- Don't send stale chunks for deleted grid as client just errors it anyway.
- Store some allocations in fields.
2023-11-21 21:35:57 -07:00
Chronophylos
e24e0bdaf5
add localization for pda footer text ( #21749 )
2023-11-21 20:06:43 -05:00
Velcroboy
a698a85f34
Make shuttle walls/windows constructable ( #19255 )
2023-11-20 17:20:24 -08:00
Leon Friedrich
c46bad59fa
Rename SpriteView field ( #21794 )
2023-11-20 17:37:57 +11:00
Leon Friedrich
4c09e645f3
Make T-ray entity query use lookup flags ( #21793 )
2023-11-20 16:09:06 +11:00
Nemanja
de5319737e
ok final actions fixes fr this time ( #21683 )
2023-11-16 00:12:47 -05:00
metalgearsloth
816ee2e1ab
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-14 19:23:40 -07:00
Nemanja
2727f63bf3
small action bar fixes ( #21655 )
2023-11-14 18:35:43 -07:00
Morb0
3cb4017c90
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Announcements/license.txt
# Resources/Audio/Effects/Shuttle/licenses.txt
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-11-14 16:35:33 +03:00
Nemanja
4e84961ef8
Minimalist Action Bar ( #21352 )
2023-11-13 22:27:14 -05:00
Leon Friedrich
eb0c86f803
Storage CanInsert() tweaks ( #21623 )
2023-11-13 23:43:03 +11:00
Leon Friedrich
355e16f470
fix implant action icon bug ( #21597 )
2023-11-12 16:29:46 -07:00
Leon Friedrich
c9e2a91f13
Fix ghost FOV bug ( #21614 )
2023-11-13 05:36:00 +11:00
Leon Friedrich
9af95742df
Fix replay spectating bugs ( #21573 )
2023-11-10 23:45:46 -07:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager ( #21314 )
2023-11-11 13:08:10 +11:00
Nemanja
ac5e9cd70b
Fix borg mobstates ( #21307 )
...
* Add dead states to borgs
* this?
* ack
2023-11-09 16:14:06 -07:00
Vasilis
2f2d237f86
LOOC will appear on top of your head ( #21514 )
...
* Oh well
* Minor fixing up
* HOLY BINGLE I DID IT
* TOGGLE!
2023-11-09 02:18:58 -07:00
themias
cf6eb200be
Remove need to toggle vending machine button ( #21543 )
2023-11-08 18:42:07 -07:00
Morb0
7d7c9e5f4c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png
2023-11-09 01:09:14 +03:00
PixelTK
52af546267
Arachnid 2: Episode 2 ( #19984 )
...
* Shield
* minor sprite changes and buffs
* structure buff
* Crafting stuff
* tweaks
* 88-88
* Better web pocket sprites.
* yeah it's fine now.
2023-11-08 12:18:52 -08:00
Morb0
7a328a7635
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-11-08 14:28:45 +03:00
Nemanja
94368f1f00
Speed Boots [Tier 3 Civ-Service] ( #21438 )
...
* Speed Boots
* validate
* monkey
2023-11-07 18:25:43 -07:00
Morb0
611bfea5ff
Merge remote-tracking branch 'upstream/master' into update-sposnors
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Packaging/ContentPackaging.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Resources/Audio/Weapons/Guns/Gunshots/license.txt
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
DrSmugleaf
dc3b6e31b2
Fix Client RoleSystem not inheriting SharedRoleSystem, network job component ( #21436 )
2023-11-07 14:44:53 -08:00
Nemanja
4729024d3e
Convert ItemSize to prototypes ( #21481 )
...
* item sizes are prototypes
* eek
2023-11-06 00:20:50 -07:00
IntegerTempest
615f15e8a9
Nukeops hud ( #21260 )
...
* a
* a
* a2
* syndi visor
* left icon
* a3
2023-11-05 19:36:08 -07:00
Leon Friedrich
6a8023cf8b
Fix admin verb PVS issue ( #21406 )
2023-11-05 02:58:26 +11:00
Morb0
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
Ed
aa713ea7e6
Candles ( #21087 )
...
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-11-03 22:53:51 -07:00
keronshb
3a788dd8d4
Mind Action Container ( #21336 )
2023-11-03 19:55:32 -04:00
Morb
e0e990549b
[Sponsor] Add info window & implement ghost themes ( #1549 )
2023-11-03 16:29:40 +03:00
TemporalOroboros
19614453d9
Makes thieving gloves sneakier ( #21398 )
...
* Hidden DoAfters
* Fix formatting warnings
* Hide progress bar and pickup animation
* Copy Hidden field in copy constructor
2023-11-02 22:10:58 -04:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
Nemanja
85f09cae86
More Storage Rebalancing ( #21373 )
...
* the changes...
* eek
2023-11-01 17:19:41 -06:00
Nemanja
0c329ed661
Storage Standardization [Take 2] ( #21270 )
2023-10-30 20:55:55 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
Repo
e0f3bf0a06
User accessible playtime ( #21242 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-28 12:01:11 +00:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
Artjom
6ce75ccec9
Health analyzer UI improve ( #17280 )
2023-10-28 16:54:18 +11:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
Nemanja
0670b56205
A return to foam (foam rework) ( #20831 )
2023-10-27 13:52:11 +11:00
metalgearsloth
c08349a947
Revert "Storage TEST MERGE" ( #21258 )
2023-10-26 00:46:22 -07:00
