Commit Graph
378 Commits
Author SHA1 Message Date
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -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
PhazeJump defdf2f6b2 FIXING MY OWN SHIT CODE MAKES ME FUCKING SCREAM
anyways
techpriest robes are now un-shitty-fixed and fixed again. Should be working properly now. No idea how to get the naga taur sprite working because it was supposed to be added in sand modular but sand modular was the one breaking it all so 🤷
2023-07-07 11:22:42 +02:00
BongaTheProtoandGitHub 46cb8b3252 Merge branch 'Sandstorm-Station:master' into master 2023-07-05 00:37:01 -05:00
Fennec82 3297cf11c7 Blasted Reference to SPLURT Port 2023-07-02 01:34:33 +00:00
Fennec82 d1883e892b Ports MODsuit Engineer Alt Title from SPLURT 2023-07-02 01:20:50 +00:00
Fennec82 8fb1f17a40 I'm dumb 2023-07-02 01:13:43 +00:00
Fennec82 ec718a7e66 Adds New Alt Titles 2023-07-02 00:57:25 +00:00
Vhariik 294571aa36 Merge remote-tracking branch 'upstream/master' into pr/861 2023-06-26 21:48:33 -03:00
Vhariik 50abbe62d5 Merge remote-tracking branch 'upstream/master' into pr/861 2023-06-21 23:15:38 -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
BongaTheProtoandGitHub 3b4673d1db Merge branch 'Sandstorm-Station:master' into master 2023-06-17 01:02:57 -05:00
PhazeJump f1862cb499 SS13 CODE MAKES ME FUCKING SCREAM
enables anthro characters to wear techpriest robes and Virginkiller without the suits breaking
2023-06-08 13:48:09 +02:00
BongaTheProto 8c42034e40 only 16 pixels??? Bruh?????
Reinstates the original pixelshift range and also makes the viewport shifting a config so people don't get vertigo from the sliding sprites
2023-05-19 23:35:56 -05:00
BongaTheProto 635fc04860 Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift 2023-05-19 17:32:38 -05:00
SandPoot 9ab5c245bb shocking 2023-05-14 03:03:16 -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
BongaTheProtoandGitHub 92bcccd779 Merge branch 'Sandstorm-Station:master' into master 2023-04-18 11:20:14 -05:00
SandPoot d566cd4a26 ref 2023-04-15 20:26:20 -03: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
SandPoot 4b35fc212e bichop 2023-03-25 02:07:24 -03:00
BongaTheProto ffb387b096 Merge remote-tracking branch 'upstream/master' 2023-03-23 19:37:34 -05:00
SandPootandGitHub 32644fa56e Merge pull request #317 from DeDrascol/production-restrictions-robotics
Add robotics production restrictions
2023-03-23 12:44:00 -03:00
Fennec82 fb2cddbaa0 Space Romans
<!-- 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 new, Roman Republic themed alt-titles for the Captain, Head of Security, and the Chaplain.
<!-- 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 pull request ports the Senator alt title for the captain from Splurt, and also adds a "Consul" Alt title. The HoS gets a new title, "Praetor", and the chap gets "Pontiff". Roma Invitca, even in space!
## Why It's Good For The Game

<!-- 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. -->

Given that Splurt has a senator alt-title and has a bunch of meme alt titles in general, what's wrong with a bit of harmless RP? (Yes, I get we are HRP, but still)
## A Port?

Partially
<!-- Just say if it is a port of something and link the original pr/commit/whatever. -->

## Changelog
🆑 Arrhythmia_V
Code/Add: Alt Titles
/🆑

<!-- 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-17 03:28:14 +00:00
BongaTheProto 1213be13b6 Merge remote-tracking branch 'upstream/master' 2023-03-13 21:42:07 -05:00
Darius 15d31031d9 Revert RnD console locks
This commit reverts the change causing R&D consoles to be locked by default upon creation, as it had unintended consequences.
2023-03-13 21:23:34 -04:00
BongaTheProto 09e336118f Merge remote-tracking branch 'upstream/master' 2023-03-09 22:15:43 -05:00
Darius 36c8bbb024 Remove alternate mech fabricator locks
This commit removes access requirements from the `maint` and `offstation` variants of the mech fabricator.
2023-03-09 20:57:47 -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 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot 46df70dd73 not a quick fix. 2023-03-05 18:32:12 -03:00
SandPootandGitHub c1c1083b30 Merge pull request #315 from DeDrascol/fix-cargo-production-access
Fix cargo production access
2023-03-04 12:32:24 -03:00
4fbc8c22b2 Alternative fix for Cargo production access
Updates the Cargo production machines to use either `ACCESS_CARGO` or `ACCESS_MINING`.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2023-03-04 04:00:41 +00:00
Darius efbdb42874 Fix cargo techfab access
Makes an associated fix from protolathe access to techfab access.
2023-03-03 16:13:18 -05:00
Darius 816dbcd364 Fix cargo production access
Changes the production machinery access requirement for cargo from `ACCESS_CARGO` to `ACCESS_MAILSORTING` to fix an issue that prevented Shaft Miners from using the machine.
2023-03-03 16:10:58 -05:00
BongaTheProto d0fa6c842e Merge remote-tracking branch 'upstream/master' 2023-03-01 14:58:31 -05:00
SandPoot 6e55b682a7 touch ups, polychromic not working 2023-02-27 23:13:43 -03:00
SandPoot d422d1a5e7 solve a couple things, put on loadout 2023-02-27 22:19:58 -03:00
Koboboldic f6198de83d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into snax 2023-02-28 05:39:28 +05:00
FurryDog 00bb5159d5 Stirrups! 2023-02-28 04:58:15 +05:00