Commit Graph
132 Commits
Author SHA1 Message Date
Kuki-konoandGitHub 7ff90e0275 Update gladiator.dm 2023-09-26 00:28:38 +01:00
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
Tsurupeta 07034d2ec0 sand 2023-08-08 14:01:15 +03:00
BongaTheProto cdd5bb87d8 Merge remote-tracking branch 'upstream/master' 2023-08-08 01:42:46 -05:00
SandPoot 6fb4267b56 upload 2023-08-04 23:26:33 -03:00
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03:00
PhazeJump 971bcbf4c6 more tail fixes
this time I've managed to fix:
-Downward Fennec Tail- humans and mammals
-Zorgoia
2023-05-03 12:46:14 +02:00
BongaTheProto ac5b28c6c9 Merge remote-tracking branch 'upstream/master' 2023-04-05 20:15:22 -05:00
SandPoot 7033839c5a nice 2023-04-05 17:06:37 -03:00
CloverIsLuckyandGitHub fc0ed12307 Why would we need two mining points card? 2023-03-29 07:28:41 -06:00
BongaTheProto df95b9fa51 Merge remote-tracking branch 'upstream/master' 2023-03-28 20:52:02 -05:00
Fennec82 d1243008b5 Add sprite accessories from ARFS
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## About The Pull Request
Adds tails and ears from ARFS
<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
This PR adds the Zorgoia tail and ears plus the downward fennec/Zorren tail from ARFS-Coyote. That's all.
## Why It's Good For The Game
More anthro species options are always good for furry servers.
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## A Port?
Yes, from ARFS
<!-- Just say if it is a port of something and link the original pr/commit/whatever. -->

## Changelog
🆑 Arrhythmia_V
add: Added Zorgoia tails and ears
add: Added alt Fennec tail
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
2023-03-28 15:06:18 -04:00
BongaTheProto ffb387b096 Merge remote-tracking branch 'upstream/master' 2023-03-23 19:37:34 -05:00
BongaTheProto 09e336118f Merge remote-tracking branch 'upstream/master' 2023-03-09 22:15:43 -05:00
Darius 05db5f8997 Add robotics production restrictions
This commit updates the production machinery restrictions to include mech fabricators. Old production check code has been updated for use with generic machines, and some checks have been moved.
2023-03-09 20:46:51 -05:00
Darius f30815b889 Production topic restrictions rework
- Production access checks now use the `allowed` proc before attempting normal ID checks.
- Each successful return case now uses a unique DEFINE to allow future control over access types.
- Topic checks use a separate function
- Feedback messages have been moved out of the access check procs
2023-03-07 20:51:05 -05:00
Darius 720b4be2c1 Allow material access from protolathes
Allows crew with `ACCESS_MINERAL_STOREROOM` access to use production machinery in 'mineral only' mode when normal access isn't found.
2023-03-07 16:39:03 -05:00
BongaTheProto 2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -05:00
SandPoot 11a06b1686 pixelshift + layering 2023-02-21 14:27:10 -03:00
SandPoot 992d25ea08 Revert "pixelshift + layering"
This reverts commit 51818478c5.
2023-02-21 14:25:29 -03:00
SandPoot 51818478c5 pixelshift + layering 2023-02-21 14:20:48 -03:00
BongaTheProto 5ec4443259 Merge remote-tracking branch 'upstream/master' 2023-02-20 11:36:04 -05:00
50e0ed8105 Job Restricted Protolathes (#303)
* Block protolathe use without job access

Prevents opening the UI for any R&D production machinery without proper job access on the mob's mind. This change impacts protolathes and circuit imprinters.

* Check protolathe access using face and ID

Changes the protolathe access check to use ID card or face name, instead of mind.

* Always allow Captain protolathe use

Allows the captain to use any protolathe or circuit imprinter.

* Check protolathe access using only ID

Updates the RND production machine access checks to only use the ID card, instead of checking face or security records.

* Lock RND console by default

Sets the R&D console locked variable to TRUE by default to prevent unauthorized access exploits.

* Use req_access for RND production machines

Converts the ID check used by RND production machines to use req_access flags.

* Check Topic for protolathe restrictions

Moves protolathe access checks into a mob proc, and checks Topic call the same way UI open is checked.

* Production restriction low-population improvements

This commit fixes potential problems for low-population servers using production machinery restrictions. The following changes are made:

- Allow skeleton crew to ignore research machinery restrictions
- Option to check all living crew IDs for access (disabled by default)
- Configuration options for using global ID checks and skeleton crew access

* Production machine locking feedback commit

This commit makes changes requested by Sandpoot:
- Renames 'nonmin' to 'lowpop'
- Removes all global ID check code

* Fix improper configuration defines

Fixes an oversight that caused some variable names to not be updated.

* Remove obsolete mob defines

Removes the obsolete PROTOLOCK_CHECK_ALL_IDS define, which related to a removed feature.

* Reverse protolock check ordering

Reverses the configuration check order for PROTOLOCK_DURING_LOWPOP and JOB_MINIMAL_ACCESS at the request of SandPoot.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2023-02-19 15:05:44 -03:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 04eb7226e6 general better handling of code + interaction screen tip 2023-02-15 23:26:59 -03:00
BongaTheProto a65cd6c96b Merge remote-tracking branch 'upstream/master' 2023-02-11 21:26:36 -05:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot 243e7ea02f safety i guess, people are afraid that someone is SOMEHOW gonna manage to open their menu without being admin 2023-02-11 21:54:20 -03:00
SandPootandGitHub 117919fe2b Componentizes Interaction menu + prepares it for screentips by adding a shortcut (#301)
* files

* let's just use our own parent

* necessary

* two istypes on a row
2023-02-11 14:39:29 -03:00
BongaTheProto 86a1bb06b0 Merge remote-tracking branch 'upstream/master' 2023-02-02 18:56:02 -05:00
DariusandGitHub 2ae20de930 Port estrous quirks from SPLURT (#298)
* Port estrous quirks from SPLURT

This commit ports quirks related to the animal breeding cycle from the downstream server SPLURT.

* Add null check for ashwalker round_season

Adds a null value check for round_id in ashwalker estrous code to prevent possible runtime issues.
2023-02-02 20:29:18 -03:00
BongaTheProto 3ae8edf803 Merge remote-tracking branch 'upstream/master' 2023-01-22 01:06:28 -05:00
DariusandGitHub 3c4f222e40 Disable thirst for robotic species (#291)
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
2023-01-21 20:43:11 -03:00
SandPootandGitHub 79c8c61459 Makes skirt peeking into an element (#292) 2023-01-21 19:30:59 -03:00
zeroisthebiggayandGitHub c44a7e4f97 Update examine.dm 2023-01-16 19:17:25 -05:00
BongaTheProto 596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPoot 8cf9db4faa lack of spess 2023-01-15 18:47:57 -03:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
BongaTheProto 606391308f Merge remote-tracking branch 'upstream/master' 2023-01-14 21:18:11 -05:00
SandPootandGitHub 0507960150 Does some skirt peeking optimization (#282) 2023-01-14 19:09:20 -03:00
BongaTheProtoandGitHub 36198f2b8c Merge branch 'Sandstorm-Station:master' into master 2022-10-16 17:49:02 -05:00
SandPootandGitHub b854771d79 Lets lizards have ears (#267) 2022-10-16 16:22:06 -03:00
BongaTheProto ae6a6b70e5 Merge remote-tracking branch 'upstream/master' 2022-10-09 12:57:48 -05:00
SandPoot 92f8d3debc i love invisible conflicts 2022-10-09 11:52:03 -03:00
BongaTheProto 054f2aa52d follow-up 2022-09-28 16:08:29 -05:00
BongaTheProto f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
NullFagandGitHub 723d2c8d0f Adds jumpskirt peeking (#264) 2022-09-28 16:16:06 -03:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00