Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boots #572

Merged
merged 8 commits into from
Dec 21, 2023
Merged

Boots #572

merged 8 commits into from
Dec 21, 2023

Conversation

IamVelcroboy
Copy link
Member

About the PR

Adds the rest of the winter boots Wizden turned down. Donated graciously by Kilk. Thanks!

Why / Balance

Winter drip be cozy

Technical details

n/a

Media

Was discussed in Discord but let me know if you really need to see them again.

  • I have added screenshots/videos to this PR showcasing its changes in-game, or this PR does not require an in-game showcase

Breaking changes

n/a

Changelog
🆑 Velcroboy and Kilk

  • add: Added departmental winter boots!

@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Dec 18, 2023
Copy link
Contributor

github-actions bot commented Dec 18, 2023

RSI Diff Bot; head commit 64a3835 merging into 9989602
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 64a3835

Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Boots! Boots! Moving up and down again!

@Colin-Tel Colin-Tel merged commit ae879df into DeltaV-Station:master Dec 21, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Dec 21, 2023
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
* Remove non-salvage testing map from pool

* Revert "Remove non-salvage testing map from pool"

This reverts commit 2e1c7ce.

* Adds departmental winter boots from Kilk

* Directory->DeltaV

* Arbitrage

---------

Co-authored-by: Jeff <>

(cherry picked from commit ae879df)
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
…ltaV-Station#572)

# Description
For reasons unknown, AdminManager has two command permission managers:
_commandPermissions and _toolshedCommandPermissions. It used to load
normal command permissions into the former, and toolshed command
permissions into the latter. Since _toolshedCommandPermissions is NEVER
actually used in checking whether a player can execute a command, all
toolshed commands remained unavailable to anyone without +HOST.

This PR provides a bandaid fix for that: it makes it so that the same
permissions are loaded into both managers at the same time. It's
necessary to load them into _commandPermissions in order to allow
regular players to execute them, and it's also necessary to load them
into _toolshedCommandPermissions because otherwise the ToolshedManager
will complain about those commands lacking permission flags.

This should also fixes some commands such as `spawn`, `pos`, `comp`
being inaccessible to admins with +DEBUG and more.

<details><summary><h1>Media</h1></summary><p>


![image](https://github.com/user-attachments/assets/12afedef-0db3-43f2-8335-e95582a4a3f9)


![image](https://github.com/user-attachments/assets/f23ae98a-1e1b-4d28-8446-ca60e8239a03)

Admin-only commands are unaffected:


![image](https://github.com/user-attachments/assets/d64a5a8d-f184-4a9d-bc71-ae80635df626)


</p></details>

---

# Changelog

:cl:
- fix: Fixed toolshed command permissions. This will mostly affect
admins who don't have full host access.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants