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

[MIRROR] Puts an extra set of gear into the Detective Locker. Yippee! #1005

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25436

About The Pull Request

It's finally been done. What detectives have been awaiting, maybe even the admins that have to spawn in an extra Det locker every few rounds. This PR should add a second set of gear into det lockers on all maps, and replace the second det locker on Blueshift with a filing cabinet, since that would mean there'd be 4 sets of det gear.

However, this does not prevent greytiders from stealing. Sorry!

How This Contributes To The Skyrat Roleplay Experience

Roleplay wise? Detectives don't have to fight anymore on who gets the flak vest
Quality of Life wise? It makes sense for 2 sets to exist, since there are 2 det slots

Proof of Testing

Screenshots/Videos

temp
temp2

Changelog

🆑 KannaLisvern
del: removes a detective cabinet from blueshift
qol: puts an extra set of gear into the det locker on all maps
/:cl:

* Fixed typo in synth liver emp_act proc

* makes PopulateContents proc twice for det lockers

* removes the extra det locker from blueshift

* actually ticks the security.dm file

* Update modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm

Co-authored-by: Bloop <[email protected]>

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 00ed22b into master Dec 7, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25436 branch December 7, 2023 11:10
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 17, 2024
Fixes blocking movement being weird

Co-authored-by: LemonInTheDark <[email protected]>
Co-authored-by: Mal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants