faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
Nemanja
0604c93d50
Defibrillator ( #15922 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:10:19 +10:00
Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
DrSmugleaf
07c5a844c7
Make the admin menu openable in the lobby ( #15444 )
2023-04-16 16:06:01 +10:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Morb
a3661b0fe8
Change windows size ( #515 )
2022-11-04 08:20:44 -07:00
Jezithyr
571dd4e6d5
Hud refactor ( #7202 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
wrexbe
b6fdce0cd9
Fix admin menu window size ( #11534 )
2022-09-25 21:52:27 -07: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
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
wrexbe
cea1b21832
Fixing some warnings ( #6250 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
Paul Ritter
e74301a856
refactors adminmenu a timid amount ( #5095 )
...
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-11-10 23:26:25 +11:00
Paul Ritter
6fdb364497
Admin overlay ( #4728 )
...
* adds admin overlay
* fixes things
2021-10-03 13:34:36 +02:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances ( #4155 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
