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

Update from Shiptest on 2024-02-19 #36

Merged
merged 154 commits into from
Feb 22, 2024
Merged

Conversation

blinkdog
Copy link
Collaborator

@blinkdog blinkdog commented Feb 20, 2024

About The Pull Request

Brings in the changes from Shiptest upstream until 2024-02-19

Local Differences

Why It's Good For The Game

Bug fixes and new features improve the codebase.

SomeguyManperson and others added 30 commits January 22, 2024 20:05
<!-- 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

Arcane machine tried to smelt up to 10 sheets of material but the alloy
smelting proc didn't get a smelting number passed so it just spawned 1
sheet and called it a day.

## Why It's Good For The Game

fixes #2647

## Changelog

:cl:
fix: ore smelter no longer obliterates materials when smelting alloys
/: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

Changes the prefixes on Syndicate ships to reflect subfaction more
strongly.

- 2nd Battlegroup uses NGRV (New Gorlex Republic Vessel)
- Hardliners use ISV (They don't have a unique registration because they
aren't an organized group and aren't officially part of Cybersun. this
puts them in a similar position to non-Frontiersman pirates, using ISV
while not being normal independents.)
- Cybersun uses CSSV (CyberSun Space Vessel)
- SUNS uses SUNS (SUNS, lol)
- ACLF still uses SSV
- The Lugol, as GEC's only ship and an adminspawn ship, uses XSV
(Experimental Space Vessel)

## Why It's Good For The Game

the syndicate kind of Isn't anymore and pushing faction distinctions is
good, especially between the gorlex splinters

## Changelog

:cl:
tweak: Changed prefixes on Syndicate ships to reflect subfaction
/: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

adds the key to the crusher loot list since the default loot list is
overridden by that

## Why It's Good For The Game

Dragon lair could be locked off without admin intervention if the dragon
is killed with a crusher

## Changelog

:cl:
fix: you can no longer lock yourself out of the icemoon dragon lair by
killing the dragon with a crusher
/: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
Removes chem bees from the jungle and beach spawn pools, replacing them
with normal bees.

<!-- 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 The Game
Walking off of a ship onto one of the relatively "peaceful" planets,
only to be loaded up with admin chemicals was a pretty awful experience.

We inherited these little guys from Voidcrew, honestly that should be
enough reason to remove them.
<!-- 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. -->

## Changelog

:cl:
balance: planetary chem bees have been replaced with the garden variety
/: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. -->
## About The Pull Request

Updates a few Vox sprites, mostly backpacks. Adds a proper icon for the
tail hold action.

## Why It's Good For The Game

We love vox in this house

## Changelog

:cl:
imageadd: Added vox sprites & a tailhold icon.
/: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

Reverts an unintended buff to some ruins with syndicate hard suits and
makes them the lesser hard suit again
Cleans up some redundant code
Fixes the description for the Ramzi Clique hardsuit
Kills the owl suit cause he looked at my funny (and also cruft)
<!-- 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 The Game

Blood red hard suit should mostly be reserved for its faction.

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

## Changelog

:cl:
balance: reverts some blood red hard suits back to ramzi
/: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. -->
## About The Pull Request
some little fixes.

## Why It's Good For The Game
yeah it's some little tweaks and fixes.

## Changelog

:cl:
tweak: Added more light switches to the Mudskipper.
fix: The Mudskipper bridge now has proper access applied.
/:cl:

Co-authored-by: spockye <[email protected]>
Co-authored-by: meem <[email protected]>
## About The Pull Request

Adds poster printers. Currently unmapped, so there's no way to get them
at the moment, and I recommend one gets added to the outpost.
HOW TO USE:
get a sheet of paper and a printer

![image](https://github.com/shiptest-ss13/Shiptest/assets/64121399/44bf348e-3971-4bba-8f90-8166ca893ece)
put the paper in the printer

![image](https://github.com/shiptest-ss13/Shiptest/assets/64121399/7b157f7d-35f0-4d7b-a3aa-1a66c734c75b)
click on the printer and select the kind of poster you want to print

![image](https://github.com/shiptest-ss13/Shiptest/assets/64121399/ecab5df3-9536-464b-a0db-b3dc4ae49320)
print the poster, and then remove it

![image](https://github.com/shiptest-ss13/Shiptest/assets/64121399/b59950ab-a68a-4fd2-921b-f0baeeb0f0f0)
tada! free* poster!

![image](https://github.com/shiptest-ss13/Shiptest/assets/64121399/ba917741-2b3a-494a-923f-bee6aec7ea5a)

*actually uses some toner with each use, as well as a sheet of paper

## Why It's Good For The Game

A lot of people were complaining about how there's no easy way to get
posters at the moment, so I made a convenient printing device.

## Changelog

🆑
add: Added a poster printer. Please map this later, I didn't want to
mess with mapping for now so
/🆑

---------

Signed-off-by: Moon <[email protected]>
Signed-off-by: meem <[email protected]>
Co-authored-by: meem <[email protected]>
## About The Pull Request
Updates shotgun ammo boxes in ships to the new version. Hyena,
Halftrack, Cepheus and Twinkleshine.

## Why It's Good For The Game
The new version is a lot better to use and this probably overdue.
## Changelog

:cl:
fix: updated ship shotgun ammo boxes
/: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

If you have a cigarette equipped, and someone else has an un-lit
cigarette equipped, you can light theirs via help intent+target mouth


![image](https://github.com/shiptest-ss13/Shiptest/assets/24857008/c1a352a4-5ae5-41e3-91c7-37780cbb8535)

## Why It's Good For The Game

New co-op interaction

## Changelog

:cl:
add: If you are smoking a cigarette, you can light someone else's
cigarette via help intent while targeting the mouth
/: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
Kills mutation toxin. Simple as.
<!-- 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 The Game
1. Xenobio content. Ew.
2. I've only seen this used for griefing or accidentally.
3. Admins already have a dedicated species change button if need be.
<!-- 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. -->

## Changelog

:cl:
del: mutation toxin
/: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
Continuation of #2628, which was merged without a testmerge. This fixes
some ERT outfits, adds a Syndicate Inspector ERT (which had the outfit
defined but not the ERT), and fixes the independent sechud background.
Also messes with the CMM Inspector's icon.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/a3ac82d6-e5c2-4028-9992-f2565604ac0b)


<!-- 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 The Game
blame zephyr

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

## Changelog

:cl:
add: ACLF Syndicate Inspector ERT
fix: Independent background icons
fix: ERT Outfits not having access and proper names
/: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. -->
## About The Pull Request

Adds a bunch of new socks and shirts for Kepori, and digitigrade
versions of the pride and grayscale thigh-highs.
I also updated some of the already existing socks (like bee and bisexual
socks) to use the sprites of their grayscale counterparts as a base so
they're not just a flat sprite.
On top of this I noticed Kepori their left arms and legs also had right
arm and leg sprites and vice versa when facing east/west, so I removed
the extra parts from those. In practice there will be no noticeable
difference in this outside of amputees now showing their sides
correctly.

## Why It's Good For The Game

Now you can express your pride as a Kepori or with digitigrade legs!

## Images
Kepori with the tank top and the bee socks

![image](https://github.com/shiptest-ss13/Shiptest/assets/43698041/413f292b-10c2-4423-9fa2-fec28ace4efb)
Kepori with a polo shirt and nonbinary socks

![image](https://github.com/shiptest-ss13/Shiptest/assets/43698041/750a5ce0-e162-4d5a-9507-47f026e7cc59)
Lizard with the trans socks

![image](https://github.com/shiptest-ss13/Shiptest/assets/43698041/c296e97a-e636-4257-b50a-6743b60dc4c3)

## Changelog

:cl:
imageadd: Added more Kepori socks
imageadd: Added more Kepori shirts
imageadd: Added digitigrade pride thigh-highs
fix: Fixed Kepori arms having both left and right sprites per single arm
/:cl:
actions-user and others added 15 commits February 15, 2024 00:02
<!-- 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
See title, might possibly lead to more interesting things, might just be
something nice to have. Maybe both.

## Why It's Good For The Game
The voting subsystem was old and flawed, and this gives it a new coat of
paint

## Changelog

:cl: MrMelbert, san7890, lessthnthree, ZephyrTFA, MarkSuckerberg
admin: You can now create a custom approval-type vote
admin: You can now manually start a transfer vote in the vote menu
config: Removes the player mode voting setting as we don't use modes
/: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: Mark Suckerberg <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: lessthanthree <[email protected]>
Nobody tell me power creep isn't real and tangible

<!-- 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
Removes space adaptation
<!-- 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:
del: Removes space adaptation.
/: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
title

<!-- 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 The Game

this thing does not work and i do not recall a single instance of it
ever working.

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

## Changelog

:cl:
del: Removed mentorfollow
/: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
Title, the SUNS graduate outfit did not have the alt jumpsuit set to the
alt jumpsuit
<!-- 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 The Game
Outfits working properly is good
<!-- 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. -->

## Changelog

:cl:
fix: Fixed a minor issue with SUNS outfits
/🆑

<!-- 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. -->
@blinkdog blinkdog requested a review from lectronyx February 20, 2024 03:36
@blinkdog blinkdog self-assigned this Feb 20, 2024
@github-actions github-actions bot added Code change Watch something violently break. Config Watch us shake head admins violently until this gets merged. DME Edit GitHub Our very own Babylon. Map Change Tile placing is hard. Thank you for your service. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. TGUI labels Feb 20, 2024
@blinkdog blinkdog merged commit 5eab19d into master Feb 22, 2024
10 of 13 checks passed
@blinkdog blinkdog deleted the shiptest-update-20240219 branch February 22, 2024 05:57
@lectronyx
Copy link
Contributor

awesome! Got a hunch I'll have to remove more Kalixcis references, get things better fit into our lore, but that's fine - we're caught up and up to date.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Config Watch us shake head admins violently until this gets merged. DME Edit GitHub Our very own Babylon. Map Change Tile placing is hard. Thank you for your service. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.