Skip to content

Commit

Permalink
Mirror: Fix Decoy Bomb Uplink Category (#254)
Browse files Browse the repository at this point in the history
## Mirror of PR #26205: [fix decoy bomb uplink
category](space-wizards/space-station-14#26205)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `21c527d6d09847a742202613d8aefce62c79b334`

PR opened by <img
src="https://avatars.githubusercontent.com/u/57039557?v=4"
width="16"/><a href="https://github.com/Ilya246"> Ilya246</a> at
2024-03-17 10:11:15 UTC

---

PR changed 1 files with 10 additions and 10 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> moves the decoy syndicate bomb from explosives category to deception
category
> 
> ## Why / Balance
> PR was made before the uplink categories update so the bomb ended up
miscategorised
> 
> ## Technical details
> this is a webedit but it should be sufficiently simple to be fine
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> not tested
> 
> - [ ] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase


</details>

---------

Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
SimpleStation14 and VMSolidus authored Jul 10, 2024
1 parent 6720f78 commit 83d6633
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/store/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ store-category-implants = Implants
store-category-job = Job
store-category-armor = Armor
store-category-pointless = Pointless
store-category-deception = Deception
# Revenant
store-category-abilities = Abilities
24 changes: 13 additions & 11 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,6 @@
tags:
- NukeOpsUplink

- type: listing
id: UplinkSyndicateBombFake
name: uplink-exploding-syndicate-bomb-fake-name
description: uplink-exploding-syndicate-bomb-fake-desc
productEntity: SyndicateBombFake
cost:
Telecrystal: 4
categories:
- UplinkExplosives

- type: listing
id: UplinkClusterGrenade
name: uplink-cluster-grenade-name
Expand Down Expand Up @@ -787,7 +777,19 @@
cost:
Telecrystal: 6
categories:
- UplinkBundles
- UplinkBundles

- type: listing
id: UplinkSyndicateBombFake
name: uplink-exploding-syndicate-bomb-fake-name
description: uplink-exploding-syndicate-bomb-fake-desc
productEntity: SyndicateBombFake
cost:
Telecrystal: 4
categories:
- UplinkDeception

# Disruption

- type: listing
id: UplinkAmmoBundle
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Store/categories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
name: store-category-pointless
priority: 9

- type: storeCategory
id: UplinkDeception
name: store-category-deception
priority: 10

#revenant
- type: storeCategory
id: RevenantAbilities
Expand Down

0 comments on commit 83d6633

Please sign in to comment.