Bugfixes 10/23 Round Two (#6114)

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

1. **Fixes Survival Knife Collapse Bug.**
2. **Repaths and Redistributes KA Upgrades.**
3. **Fixes On-Mob Collapsible Baton Icons.**
4. **Fixes Broken Donator Uniform Render.**
5. **Renames Restricted Role Gear for Bridge Officer.**
6. **Adds Cat Themed Emotes to Catborgs.**
7. **Reverts Station Engineer Title Change.**
8. **Removes Brand Name from Root Beer in Soda Dispenser.**
9. **Adds Ginger Ale to Soda Dispenser.**

## Why It's Good For The Game

1. _Due to an oversight in the code, Exploration survival knives can be
collapsed into cardboard sheets. Corrects that issue._
2. _Repaths KA Upgrades to a bespoke path, and updates Cyborg intake
procs to account for the change. In tandem, removes one AOE upgrade from
the mining vendor and moves all AOE upgrades to R&D as higher tier
upgrades._
3. _The collapsible baton wasn't rendering on-mob. Fixes that._
4. _Player's donator uniform broke. Updates it to the new render
system._
5. _After the removal/repath of various titles, role restricted gear
items weren't loading. This corrects that, but the fix is a bandaid. We
need to adjust the way these items check jobs._
6. _Player request, and just logical in general. Catborgs should have
cat emotes._
7. _Station Engineers were renamed to Engineers, causing a plethora of
issues. This PR reverts the check to Station Engineer at fellow
Maintainer silicon's request._
8. _People were complaining that it's not alphabetical or something. I
dunno._
9. _This should be accessible somewhere other than vendors._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
fix: Fixes Cardboard Collapse Bug For Survival Knives.
tweak: Repaths and Redistributes KA Upgrades.
fix: Fixes Collapsible Baton Mob Render.
fix: Fixes Broken Donator Uniform Render.
fix: Fixes the Restricted Role Loadout Job Path.
add: Adds Cat Emotes to Catborgs.
fix: Reverts Engineer Job to Station Engineer.
tweak: Removes Root Beer Brand Name from Soda Dispenser
add: Adds Ginger Ale to Soda Dispenser.
/🆑

<!-- 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. -->
This commit is contained in:
Captain277
2023-11-05 19:17:00 -05:00
committed by GitHub
parent 9eb6892949
commit eb192d3d41
20 changed files with 209 additions and 98 deletions
+4 -4
View File
@@ -1482,21 +1482,21 @@
*/
//InterroLouis - Kai Highlands
/obj/item/borg/upgrade/modkit/chassis_mod/kai
/obj/item/ka_modkit/chassis_mod/kai
name = "kai chassis"
desc = "Makes your KA green. All the fun of having a more powerful KA without actually having a more powerful KA."
cost = 0
denied_type = /obj/item/borg/upgrade/modkit/chassis_mod
denied_type = /obj/item/ka_modkit/chassis_mod
chassis_icon = "kineticgun_K"
chassis_name = "Kai-netic Accelerator"
var/chassis_desc = "A self recharging, ranged mining tool that does increased damage in low temperature. Capable of holding up to six slots worth of mod kits. It seems to have been painted an ugly green, and has a small image of a bird scratched crudely into the stock."
var/chassis_icon_file = 'icons/vore/custom_guns_vr.dmi'
/obj/item/borg/upgrade/modkit/chassis_mod/kai/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
/obj/item/ka_modkit/chassis_mod/kai/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
KA.desc = chassis_desc
KA.icon = chassis_icon_file
..()
/obj/item/borg/upgrade/modkit/chassis_mod/kai/uninstall(obj/item/gun/energy/kinetic_accelerator/KA)
/obj/item/ka_modkit/chassis_mod/kai/uninstall(obj/item/gun/energy/kinetic_accelerator/KA)
KA.desc = initial(KA.desc)
KA.icon = initial(KA.icon)
..()