VigersRay
b07e5eb660
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-13 09:47:00 +03:00
Leon Friedrich
d38ad12262
Fix playtime_addrole command printing the wrong time ( #28783 )
2024-06-12 23:31:21 -07:00
VigersRay
5f10d21fa6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Commands/PlayTimeCommands.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Events/BreakerFlipRule.cs
# Content.Shared/Roles/JobPrototype.cs
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
Nemanja
68992735d8
Clean up command perms ( #28451 )
...
* Change BanExemption command to AdminFlags.Ban permissions
* Change LOOC to check for Moderator permission
* Change ListVerbs from Admin to Debug AdminFlags
* Change RunVerbAs from Admin to Fun AdminFlags
* More permission changes
* Change GhostKick to Moderator perm
* Clean up command perms
* fuck
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-01 01:14:43 -07:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
Moony
6fe29d1c66
Update PlayTimeCommands.cs ( #10596 )
...
pjb forgor to make it possible to actually use the command.
2022-08-14 13:16:47 -07:00
Moony
a2d8e96a53
Fix localization for playtime. ( #10389 )
2022-08-08 08:43:27 +10:00
Pieter-Jan Briers
e852ada6c8
Play time tracking: Job timers 3: more titles: when the ( #9978 )
...
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-07 16:00:42 +10:00
