-
-
Notifications
You must be signed in to change notification settings - Fork 526
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
Makes Vegan rations actually Vegan #3408
Conversation
the vegan part was specifically the first two items. |
While I've actually participated in snack trading because of this, I haven't gotten the opportunity to do it very often. Usually, a vegan character of mine ends up ripping open another ration pack or two and stealing the non-meat products in those rations, instead, in the same form of someone drinking from a gallon of milk with their mouth, instead of using a cup. |
While I still think that it's a slightly silly inconsistency, what if, instead, the name of the pizza crackers were changed so as to make it clear that it has meat? Something like "pepperoni pizza crackers"? |
<!-- 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 Exchanges the pizza crackers snack, which is a meat foodtype, with fruit puree, in the vegan chili ration. ## Why It's Good For The Game It always felt like a really minor and silly oversight that pizza crackers weren't actually vegan, which, in turn, made the _vegan ration_ not actually entirely vegan. This isn't really a gamebreaking change, but I thought it might help with consistency. ## Changelog :cl: add: Added fruit puree to vegan rations del: Removed pizza crackers from vegan rations /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: 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. -->
commit 943006f Author: Changelogs <[email protected]> Date: Sat Sep 28 01:01:54 2024 +0000 Automatic changelog compile [ci skip] commit 771b608 Author: Changelogs <[email protected]> Date: Fri Sep 27 18:59:30 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3450 [ci skip] commit c830d5f Author: Theos <[email protected]> Date: Fri Sep 27 19:48:33 2024 -0400 Fixes some stuff with legion infections (shiptest-ss13#3450) <!-- 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. --> homeless skulls no longer complain about not being fed <!-- 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. --> 🆑 fix: legion skulls will no longer check if they should rise up and consume their owner if they are ownerless /🆑 <!-- 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. --> Signed-off-by: Theos <[email protected]> commit 8665942 Author: Changelogs <[email protected]> Date: Fri Sep 27 18:22:03 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3402 [ci skip] commit 8bec073 Author: Sadhorizon <[email protected]> Date: Sat Sep 28 01:11:18 2024 +0200 Adds a fax machine to the Dwayne. (shiptest-ss13#3402) <!-- 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. --> ![obraz](https://github.com/user-attachments/assets/79430ae8-1e33-4d11-8dd5-1d687790a261) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> - Communication with the outpost is fun. - NT is like, THE tcomm company, even if the ship is meant to be their civ market garbage, it should still get one. <!-- 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. --> 🆑 add: Added a fax machine to the Dwayne-class. /🆑 <!-- 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. --> commit a358a4d Author: Changelogs <[email protected]> Date: Fri Sep 27 01:02:14 2024 +0000 Automatic changelog compile [ci skip] commit 1543835 Author: Changelogs <[email protected]> Date: Thu Sep 26 15:16:55 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3440 [ci skip] commit 96c4fa9 Author: Jedi-Toothpaste <[email protected]> Date: Thu Sep 26 21:06:07 2024 +0100 valor map fixes (shiptest-ss13#3440) <!-- 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. --> So, currently the Valor is awaiting a remap, but this should fix a few problems that it currently has, most notably, the large areas, lack of firelocks and lack of lighting in some rooms. What's changed: - Added firelocks to every door, no more mid-corridor firelocks which don't do much. - Added firelocks across the cargo-bay door. Similar to the Mudskipper. - _I understand this may be a contentious change but i'm happy to remove it if the danger of the holofield falling would still like to be realised_. ![image](https://github.com/user-attachments/assets/48d83b56-7fec-4fb7-9917-337f7f41d78f) - Added lighting to the Corpsman prep room, and the EVA Room as it currently does not spawn with a light at all. (with this, I have also added extra light switches to said rooms). - Seperated the large area at the bottom of the ship. At the moment, the Surgery Room, Morgue Room, Corridor, Corpsman prep, and post-op area all share the same area. I have given each one a seperate area so you can control the lighting in each room. ![image](https://github.com/user-attachments/assets/29ed4c5c-d67a-407a-9ff9-587135f92483) - Similar to the above, I have added seperate areas for the Janitor Closet, EVA prep, Toilet and Laundry Room as well. ![image](https://github.com/user-attachments/assets/ee47bf9b-b07b-4794-911d-e310cc8db933) Being able to turn the lights off in the Morgue seperatly from the entire medbay's is a bit of a no-brainer, and helps enhance the roleplay. It is a little bit immerssion breaking to go to turn off the lights in the patient-care area and suddenly you've plunged the surgery into pitch-darkness. As for the firelocks, having consistent firelocks that are actually present on every door, is also a no brainer; but this change brings the Valor in-line with other IRMG ships in actually having fire-locks on every door. 🆑 add: Firelocks to the Valor-Class' Doors add: Lighting to dark areas on the Valor-Class' Doors add: New areas on the Valor-Class to seperate rooms add: Added APC for the Surgical Area /🆑 <!-- 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. --> commit 58eb610 Author: Changelogs <[email protected]> Date: Thu Sep 26 10:59:29 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3443 [ci skip] commit d67e5e2 Author: Imaginos16 <[email protected]> Date: Thu Sep 26 08:48:25 2024 -0700 Makes a Slight Cosmetic Edit to Normal Rabbit Ears (shiptest-ss13#3443) <!-- 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. --> It's subtle but I did it mostly because the current version was bothering me for some god forsaken reason and I guess I'm a perfectionist. ![image](https://github.com/user-attachments/assets/f9fdfe82-d59e-40bd-94a3-4e19b678e2d6) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> I hate creating characters <!-- 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. --> 🆑 PositiveEntropy imageadd: Adjusts the inner part of the normal rabbit ears. /🆑 <!-- 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. --> commit 3d06139 Author: Changelogs <[email protected]> Date: Thu Sep 26 01:01:48 2024 +0000 Automatic changelog compile [ci skip] commit 3f86931 Author: Changelogs <[email protected]> Date: Wed Sep 25 15:43:55 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3424 [ci skip] commit ddbcb28 Author: Jedi-Toothpaste <[email protected]> Date: Wed Sep 25 21:32:46 2024 +0100 kilo remap fixes (shiptest-ss13#3424) <!-- 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. --> Kilo remap was good, asides the fact there was not a reinforced window on the thrusters to stop it being spaced if you open the blast doors. However, this problem was self-solving as the blast doors were not connected to the new button. This fixes both issues by adding windows to the thrusters, and linking the button correctly. ![image](https://github.com/user-attachments/assets/852855b1-98a7-4850-bf05-f327c809913e) ![image](https://github.com/user-attachments/assets/1066b7e4-5bb2-41dd-be5f-aa1101df9a00) 🆑 fix: Fixed the lack of windows for the Kilo's Thrusters, and fixed the broken link for the new blast doors. /🆑 <!-- 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. --> commit ce35cdd Author: Changelogs <[email protected]> Date: Wed Sep 25 10:57:35 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3320 [ci skip] commit eb41937 Author: FalloutFalcon <[email protected]> Date: Wed Sep 25 08:58:42 2024 -0500 Partial port of tg points of intrest and improved orbit menu (shiptest-ss13#3320) <!-- 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. --> Squash of shiptest-ss13#3219 rebased ontop of a revert of shiptest-ss13#3218 cause i fucked up the commit history - [x] Fix admin menu - [x] Fix auto-observe <!-- 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 massively improves the readability of the orbit menu. You can now add custom points of interest pretty easily as it uses an element now. <!-- 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. --> 🆑 add: You can now see ships in the orbit menu and its alot prettier! code: ported tg points of interest and a much improved orbit menu /🆑 <!-- 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. --> --------- Signed-off-by: FalloutFalcon <[email protected]> commit 8332853 Author: Changelogs <[email protected]> Date: Wed Sep 25 10:44:41 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3352 [ci skip] commit 065b41d Author: FalloutFalcon <[email protected]> Date: Wed Sep 25 08:52:29 2024 -0500 blank ammo (shiptest-ss13#3352) <!-- 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. --> pending sprites! <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- 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. --> 🆑 add: Added new blank shells for training drills! refactor: Minor refactor of design disks to reduce repeated code /🆑 <!-- 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. --> commit 8839b3e Author: Changelogs <[email protected]> Date: Wed Sep 25 10:31:47 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3346 [ci skip] commit 06cc8b6 Author: FalloutFalcon <[email protected]> Date: Wed Sep 25 08:52:11 2024 -0500 Ship joining starts on locked (shiptest-ss13#3346) <!-- 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. --> Ship's start on locked instead of open Idea from shiptest-ss13#772 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> No longer can an assistant join your ship faster then you can, rejoice in time to write your memo and change your ships name. <!-- 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. --> 🆑 fix: ships now start closed. shiptesters be writing there memos and ship names. /🆑 <!-- 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. --> commit 12f73cb Author: Changelogs <[email protected]> Date: Wed Sep 25 10:18:15 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3330 [ci skip] commit 7e9752a Author: FalloutFalcon <[email protected]> Date: Wed Sep 25 08:51:41 2024 -0500 minimum recoil for ballistics (shiptest-ss13#3330) <!-- 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. --> gives a very small kick to all ballistics, not enough to affect your aim but makes them feel alot better to use. atomization of shiptest-ss13#3094 currently debating what the value should be.. 0 https://github.com/user-attachments/assets/1630a089-bf9f-4ec5-8853-c2728f420f4e .1 https://github.com/user-attachments/assets/2064b49b-37f5-4860-b273-1f28274724f7 .175 https://github.com/user-attachments/assets/6baba2ad-8100-403e-b6c4-d4e958ad21d6 .25 https://github.com/user-attachments/assets/ca3bdf37-bf30-493e-bb24-ae452cbc6481 a bit of an extreme case being a fast firing auto but it happens to be a gun with a recoil of 0 rn so it will be affected by the change <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> without it, a surprising amount of ballistics get 0 recoil just but wielding them which feels really jarring. <!-- 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. --> 🆑 add: Ballistics now have a minimum recoil, not enough to mess up your shot! /🆑 <!-- 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. --> commit af77144 Author: generalthrax <[email protected]> Date: Wed Sep 25 08:47:38 2024 -0500 Adds .38 Hearth and .38 Chilled ammo boxes, to the Black Market (shiptest-ss13#3425) Adds ammo boxes for hotshot and iceblox variants of .38 Special, and puts them in the black market. Slightly reflavoured to imply infusion of trickwines by black market elements. Sprites courtesy of @rye-rice ![stuff](https://github.com/user-attachments/assets/3c29840f-e46a-4780-ad92-091c5f5f81d1) Cute little thing to maybe make .38 attractive to some as a gimmicky cartridge 🆑 add: Adds .38 Hearth and .38 Chilled specialty ammo boxes to the black market /🆑 commit 14a4b8c Author: Changelogs <[email protected]> Date: Wed Sep 25 09:50:32 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3420 [ci skip] commit 4009cd5 Author: generalthrax <[email protected]> Date: Wed Sep 25 08:47:03 2024 -0500 Exosuit Recharger Equipment in Cargo (shiptest-ss13#3420) Adds the exosuit recharger machine and computer boards to cargo You can't get them outside of ruins or RND and they're Way Cooler than cell-swapping 🆑 add: Exosuit Recharger machines are now available from cargo /🆑 commit 9aab7f2 Author: Changelogs <[email protected]> Date: Wed Sep 25 09:37:14 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3418 [ci skip] commit de480f8 Author: generalthrax <[email protected]> Date: Wed Sep 25 08:46:49 2024 -0500 Pants Accessories (shiptest-ss13#3418) Most accessories fit on pants now I should be able to pin my captain's medal on the turtleneck I'm wearing with my black pants. 🆑 balance: Most common accessories now fit on pants /🆑 commit b103897 Author: Changelogs <[email protected]> Date: Wed Sep 25 09:24:04 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3398 [ci skip] commit bad3045 Author: Gristlebee <[email protected]> Date: Wed Sep 25 06:46:02 2024 -0700 Fixes deconstructing walls causing runtimes (shiptest-ss13#3398) <!-- 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. --> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Fixes the while loops so they dont do silly shit and call procs on turfs they shouldnt. <!-- 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. --> Kill 9 billion runtimes. 🆑 fix: fixes wall deconstruction causing runtimes /🆑 <!-- 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. --> commit 053a7ba Author: Changelogs <[email protected]> Date: Wed Sep 25 09:10:35 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3408 [ci skip] commit f93fa2a Author: zimon9 <[email protected]> Date: Wed Sep 25 09:45:50 2024 -0400 Makes Vegan rations actually Vegan (shiptest-ss13#3408) <!-- 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. --> Exchanges the pizza crackers snack, which is a meat foodtype, with fruit puree, in the vegan chili ration. It always felt like a really minor and silly oversight that pizza crackers weren't actually vegan, which, in turn, made the _vegan ration_ not actually entirely vegan. This isn't really a gamebreaking change, but I thought it might help with consistency. 🆑 add: Added fruit puree to vegan rations del: Removed pizza crackers from vegan rations /🆑 <!-- 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. --> commit 5549055 Author: Changelogs <[email protected]> Date: Wed Sep 25 08:56:47 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3423 [ci skip] commit 975debf Author: generalthrax <[email protected]> Date: Wed Sep 25 08:44:46 2024 -0500 More Rust Reds (shiptest-ss13#3423) Increases rust reds on the black market from maximum 1 to a maximum of 3 Makes them about as available as the other suits on the market. They Suck, shouldn't really matter 🆑 balance: Rust Reds on the blackmarket are now available to a maximum of 3 /🆑 commit d0171aa Author: Changelogs <[email protected]> Date: Wed Sep 25 01:03:35 2024 +0000 Automatic changelog compile [ci skip] commit fcdc0c0 Author: Changelogs <[email protected]> Date: Tue Sep 24 18:55:45 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3427 [ci skip] commit d52f36b Author: Theos <[email protected]> Date: Tue Sep 24 19:44:59 2024 -0400 Sawn variants for the illestren and improvised shotgun now properly have their stats set (shiptest-ss13#3427) <!-- 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. --> If the illestren's sawn off accuracy is unreasonably high I'd like to know because it's TERRIBLE 🆑 fix: sawn off illestren/improvised shotgun stats are now consistent if they are spawned in /🆑 <!-- 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. --> --------- Signed-off-by: Theos <[email protected]> commit 5a7fcb3 Author: Changelogs <[email protected]> Date: Tue Sep 24 17:57:55 2024 -0500 Automatic changelog generation for PR shiptest-ss13#3426 [ci skip] commit de14f00 Author: Jedi-Toothpaste <[email protected]> Date: Tue Sep 24 23:47:10 2024 +0100 mudskipper and shetland window fix (shiptest-ss13#3426) <!-- 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. --> Added windows to the mudskipper and shetland's engines as well for consistency see shiptest-ss13#3434 for the Kilo fixes too. Also seperated the Shetland's engine rooms so both buttons don't open both sides. Now the button in each engine room will open only it's respective side. 🆑 fix: Added windows to the mudskipper and shetland's engines. fix: Adjusted the blast doors which open on the Shetland's engines. /🆑 <!-- 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. -->
About The Pull Request
Exchanges the pizza crackers snack, which is a meat foodtype, with fruit puree, in the vegan chili ration.
Why It's Good For The Game
It always felt like a really minor and silly oversight that pizza crackers weren't actually vegan, which, in turn, made the vegan ration not actually entirely vegan. This isn't really a gamebreaking change, but I thought it might help with consistency.
Changelog
🆑
add: Added fruit puree to vegan rations
del: Removed pizza crackers from vegan rations
/:cl: