NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
24588 commits 14 branches 0 tags 2.9 GiB
Commit graph

611 commits

Author SHA1 Message Date
Morb0
8ba54ec466 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Audio/ContentAudioSystem.cs
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
 2023-12-29 16:58:52 +03:00
metalgearsloth
4023134cf0
Add UI click sounds (#22410) 
* Add UI click sounds

* tweaks

* Significant cleanup

* Audio options and numerous fixes

* Fix the remaining UI elements

* new click sound

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2023-12-29 15:43:36 +11:00
Nemanja
a4d36d408d
Better hover coloring for inventory (#23148) 2023-12-29 12:46:51 +11:00
Leon Friedrich
35ba42af9c
Add some tests and fix some miscellaneous bugs (#22836) 
* Add some tests and fix some bugs

* Add more helper methods

* remove submodule

* fix merge

* also fix DirtyAll()

* poke
 2023-12-28 10:05:20 +11:00
Morb0
c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
 2023-12-24 20:02:16 +03:00
Nemanja
681f9a2c85
Ion law visuals (#22908) 2023-12-23 23:58:02 -07:00
Nemanja
9b18357a88
Corner Clothing UI (#22883) 
* Corner clothing (save point)

* IT WORKS. YIPPEE

* the last of it

* template rejigs
 2023-12-22 23:32:23 -07:00
Morb0
4426394d78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
 2023-12-23 02:53:18 +03:00
LordCarve
7d69055291
Use different chatbox placeholder when dependent keys unbound (#22747) 2023-12-22 11:39:29 -08:00
Leon Friedrich
b6bd82caa6
Use ECS prototype-reload events (#22613) 
* Use ECS prototype-reload events

* better constructors

* Maybe this fixes tests?
 2023-12-23 01:13:45 +11:00
Kara
ee0c3c4a69
Fix glorfcode for real (#22838) 
Fix glorfcode
 2023-12-21 16:23:22 -08:00
DrSmugleaf
0273bbcbf3
Fix right click not showing the context menu in AHelps, players tab and objects tab (#22798) 
* Fix right clicks in AHelp window

* Fix player tab right click

* Fix objects tab right click
 2023-12-20 23:32:52 -07:00
Morb0
e3f6082c58 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
#	Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
#	Tools/actions_changelogs_since_last_run.py
 2023-12-21 03:03:30 +03:00
qwerltaz
289aab768f
Improve gas analyzer interface (#22779) 2023-12-20 09:56:57 -08:00
Morb0
7d4b894002 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
 2023-12-16 03:05:40 +03:00
keronshb
2d692f47da
Action Upgrade System (#22277) 
* Adds uses before delay so actions can be used multiple times before cooldown

* adds methods to get remaining charges, to set uses before delay, and to set use delay

* adds method to change action name

* moves set usedelay

* action upgrade ECS

* adds method to reset remaining uses

* adds upgrade events

* refactors action upgrade event and adds logic to parse it

* fix serialization issue

* adds level up draft method

* adds action commands and a command to upgrade an action

* more warning lines to help

* Gets action to upgrade properly

* Removes unneeded fields from the action upgrade component and now properly raises the level of the new action

* Cleans up dead code and comments

* Fixes punctuation in actions-commands and adds a TryUpgradeAction method.

* removes TODO comment

* robust fix

* removes RT

* readds RT

* update RT to 190

* removes change name method

* removes remaining uses & related fields and adds that functionality to charges

* Adds Charges to action tooltips that require it
 2023-12-15 02:41:44 -07:00
Morb0
33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
 2023-12-14 00:57:14 +03:00
DrSmugleaf
77e872fe8b
Add ahelp bwoink sound cvar (#22439) 2023-12-13 01:51:30 -07:00
Pieter-Jan Briers
16bd6802df
More UI fixes (#22431) 
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
 2023-12-12 19:02:19 -07:00
KP
17270bb321
Fix glorfcode again (#22420) 2023-12-12 13:57:54 -08:00
Morb0
f22b645ff6 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
 2023-12-12 11:00:46 +03:00
Nemanja
9de4c40c29
Miscellaneous inventory tweaks (#22371) 
* pt 1

* Miscellaneous gridinv UX
 2023-12-12 00:49:37 -07:00
Morb0
29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
 2023-12-11 21:56:43 +03:00
Nemanja
b37b988ce3
Even spaced hotbar (#22252) 
* Fix spacing on hotbar

* more tweaksies
 2023-12-11 04:37:51 -07:00
KP
1b5e5032f4
Fix Glorfcode (#22271) 2023-12-11 19:53:10 +11:00
Morb0
6b2c649308 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Resources/Textures/Tiles/attributions.yml
 2023-12-10 10:43:49 +03:00
Pieter-Jan Briers
995f506aaf
Fix being unable to open chat channel drop-down. (#22255) 2023-12-09 13:15:06 +11:00
Nemanja
8112f84c33
Mark the last item stored in storage for smart-equip (#22236) 
* mark the last item stored in grid inventory

* shift
 2023-12-08 12:43:57 -06:00
Nemanja
736300d505
keybinds for opening bag/belt & context logic for opening storage window (#22238) 
* keybinds for opening bag/belt & context logic for opening storage window

* no error por favor
 2023-12-08 12:43:37 -06:00
Morb0
caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
 2023-12-08 13:54:31 +03:00
Nemanja
b01f0b5f82
add tooltip with entity name on inventory hover (#22203) 2023-12-07 21:38:07 -05:00
Nemanja
c047f19fdc
Inventory sprite rotation (#22201) 2023-12-07 11:59:16 +11:00
TemporalOroboros
f98322ad5d
T shaped pickaxe and grid UI fix (#22197) 2023-12-06 19:52:57 -05:00
Nemanja
9ca84ac3fb
Grid inventory fixes (#22161) 
* Gridinv fixes

* eek

* oh yeah this too

* eek
 2023-12-05 16:38:10 -07:00
Arthur Asimov
3da699ad32 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
 2023-12-05 07:42:45 +03:00
deathride58
e32ede5882
Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999) 2023-12-04 16:10:49 -07:00
Nemanja
cc8984d096
Grid Inventory (#21931) 
* Grid Inventory

* oh boy we keep cracking on

* auto insertion is kinda working? gross, too!

* pieces and proper layouts

* fix the sprites

* mousing over grid pieces... finally

* dragging deez nuts all over the screen

* eek!

* dragging is 90% less horrendous

* auto-rotating

* flatten

* Rotation at last

* fix rotation and change keybind for removing items.

* rebinding and keybinding

* wow! look at that! configurable with a button! cool!

* dragging is a bit cooler, eh?

* hover insert, my beloved

* add some grids for storage, fix 1x1 storages, fix multiple inputs at once

* el navigation

* oh yeah some stuff i forgor

* more fixes and QOL stuff

* the griddening

* the last of it (yippee)

* sloth review :)
 2023-12-04 16:04:39 -07:00
Arthur Asimov
f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
 2023-12-03 15:10:26 +03:00
metalgearsloth
3423f11f79
Fix ahelps (#21921) 2023-11-28 00:42:03 +11:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +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
Leon Friedrich
c46bad59fa
Rename SpriteView field (#21794) 2023-11-20 17:37:57 +11:00
Nemanja
de5319737e
ok final actions fixes fr this time (#21683) 2023-11-16 00:12:47 -05: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
355e16f470
fix implant action icon bug (#21597) 2023-11-12 16:29:46 -07:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager (#21314) 2023-11-11 13:08:10 +11: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
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