#4 Перенос обновлений с Beta на Alpha сервер #524
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- 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 Overhauls our Nanotrasen sprites via the work of Imaginos This may need some work as well as descriptions. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Changelog :cl: imageadd: Nanotrasen outfits have a new coat of paint /: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. -->
<!-- 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 The Nanotrasen resprite was mistakenly merged without any item descriptions written. This PR fixes that. ## Why It's Good For The Game descriptive text is good and is also the only way to actually put in representation for the new Nanotrasen factions. ## Changelog :cl: fix: fixed missing object descriptions on nanotrasen uniforms /: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. -->
* Новый корабль и мелкие фиксы прошлых * Снегирь полетел в щитспавн
Fix After Megre
Use default return in honk emote
Signed-off-by: Yata <[email protected]>
## About The Pull Request - Hides invisimin users from HUDs - Hides invisimin users from ghosts ## Why It's Good For The Game It makes eventmaking better. ## Changelog :cl:SuhEugene admin: made invisimin admins invisible for HUDs and ghosts /:cl:
<!-- 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 Adjusts pure soulus dust to not require system cleaner, and output is 20u. It already requires 2 very hard to get reagents on shiptest anyways. ## Why It's Good For The Game It's a nice chem, but holy/hollow water are super duper rare, on top of needing to collect legion cores. It doesn't need to be this hard. In a hilarious sense...... straight applying legion cores is better pre-PR ## Changelog :cl: balance: pure soulus dust now makes 20u per reaction, and system cleaner is not required. /: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. -->
…t into their user's foot (shiptest-ss13#2944) <!-- 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 Nothing is stopping the only person in ricochet range from being the person shooting the gun. Which looks really stupid if you are trying to do something funny and shoot yourself in the foot 6 times. ## Why It's Good For The Game "bullet that shoots the person who shot it" isn't an ammo type ## Changelog :cl: tweak: match rounds will no longer consider the person firing them as a viable target when ricocheting /: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. --> Signed-off-by: Theos <[email protected]>
<!-- 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 As it says, the mags and ammo were already buyable before so not much fancy here!! ## Why It's Good For The Game The candor oughta be viable!! it's the hot new thing!! everyone's rockin it!! it's the trusty sidearm of every spacer!! Also requested by Apogee and Ryerice. ## Changelog :cl: add: The Candor may now be bought from the outpost. /: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. -->
<!-- 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 Not much more to say, makes the detective's revolver Small instead of Normal so that it can fit in pockets and whatnot, and changes it's price to 600 (as opposed to 1000 of before or the 750 of the flaming arrow) ## Why It's Good For The Game The detective revolver as it currently stands is completely outclassed by the Flaming Arrow and other pistols, this gives it a niche as a backup weapon and or the cheapest handgun in the handgun easy to equip to a large crew. ## Changelog :cl: balance: The detective's revolver is now priced at 600 credits instead of 1000. balance: The detective's revolver size is now Small. /: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. -->
<!-- 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 EXO Request A quantum superposition around the name of the EXO mining company has been isolated and destroyed by the shiptest reality force. From hence on, all shall know only the name **EXOCOM**, rather than also, sometimes, EXOCON. **EXOCON is not, and was never real.** <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For EXOCON (Which is not real) EXOCON is not real. Please report any sightings of EXOCON personnel or equipment for immediate termination. EXOCON is not real. <!-- 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. --> ## Nothing Has Changed. Please Remain Calm. :cl: fix: weird uncertainty around the name of EXOCOM. EXOCON is not real. /: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. -->
<!-- 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 PR fixes this bug  ## Why It's Good For The Game Bugfixes are good ## Changelog 🆑SuhEugene fix: Fixed a bug when robotic emote would say that emote is unusable even if it has been successfully used. /🆑 <!-- 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. -->
…ntinue to default to off. (shiptest-ss13#2924) <!-- 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 This turns Intercomms, widebands, and headsets defaults to on again. HANDHELDS REMAIN OFF! ## Why It's Good For The Game Wideband doesn't record if listening is not on. Intercomms are basically useless now unless you run around the ship turning them on. Headsets don't have a listening range, so these shouldn't default to off either. Fixes shiptest-ss13#2923 ## Changelog :cl: tweak: intercomms, widebands, and headsets default speaker on again. Handhelds remain off by default. /: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. -->
Небольшой ремапп
Configs fix
FaF and new pirate ship
* added main code * fixed duplicate def * spell fix * fixed mistake * changed code cuz koshka wants it * forgot to stage change... * fixed merge confilct * deleted line --------- Co-authored-by: Yata9arasu <[email protected]>
* Finnaly! It's over * Микро фикс. Забыл пару труб. * Ещё один фикс * Окончательные изменения
Символика на обшивку кораблей и мелкие фиксы
Внесена кошка в билд
* Fix .308 caliber ammo Исправление путаницы с патронами .308 и невозможностью зарядить их в мориту. * Update rifle.dm - убираем дубли Signed-off-by: Mirag1993 <[email protected]> --------- Signed-off-by: Mirag1993 <[email protected]>
3 реворк, чисто офы, поехали
No more rotate junker
Cutting out the NT symbols
* Вносим дефайны для будущего модпака на FOV * Добавляем модпак на FOV * Включаем хелпер для работы FOV * Добавляем новые костюмы
* main code nd icons added * readme --------- Co-authored-by: Yata9arasu <[email protected]>
* added module "wideband" * fixed issues --------- Co-authored-by: Yata9arasu <[email protected]>
Возвращаем обратно значения
* Executer, add light * New Ship - Krait, minor fixes * Datum merge * Datum changes Jet Lancer * PGF NEVER MORE * Krait fix
Signed-off-by: Mr_DarkBladeS <[email protected]>
MrCat15352
added
🏭 Github 🏭
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[Перенос #3] - (https://github.com/MysticalFaceLesS/Shiptest/pull/484)