Skip to content

Commit

Permalink
Mirror: Added cheap sunglasses into ClothesMate (#209)
Browse files Browse the repository at this point in the history
## Mirror of PR #25479: [Added cheap sunglasses into
ClothesMate](space-wizards/space-station-14#25479)
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)

###### `d370f16e04fc12c8fa2b89c41c3fce12225334b4`

PR opened by <img
src="https://avatars.githubusercontent.com/u/140359015?v=4"
width="16"/><a href="https://github.com/shampunj"> shampunj</a> at
2024-02-22 21:58:13 UTC

---

PR changed 3 files with 15 additions and 7 deletions.

The PR had the following labels:
- No C#
- Status: Needs Review
- Merge Conflict


---

<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
> <!-- What did you change in this PR? -->
> Added cheap sunglasses that wasnt protect against flashing into
ClothesMate
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> To replace removed regular sunglasses in ClothesMate
space-wizards/space-station-14#25221
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> n/a
> ## 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]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
![Screenshot_53](https://github.com/space-wizards/space-station-14/assets/140359015/7799a6e3-45e5-4b1b-b403-7c8675ec1b3b)
>
![Screenshot_54](https://github.com/space-wizards/space-station-14/assets/140359015/5d48f59f-8b62-4874-bb66-6a7c582ac213)
> 
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> - add: Added cheap sunglasses that wasnt protect against flashing into
ClothesMate
> 


</details>

---------

Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
SimpleStation14 and VMSolidus authored May 5, 2024
1 parent 6b236e4 commit 9b8441f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 7250 #DeltaV
category: Service
cost: 7245
category: cargoproduct-category-name-service
group: market

- type: cargoProduct
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
ClothingHandsGlovesColorGreen: 2
ClothingHandsGlovesColorOrange: 2
ClothingHandsGlovesColorPurple: 2
ClothingEyesGlassesCheapSunglasses: 3
contrabandInventory:
ClothingMaskNeckGaiter: 2
ClothingUniformJumpsuitTacticool: 1
Expand Down
19 changes: 13 additions & 6 deletions Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,14 @@

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesSunglasses
name: sun glasses
description: A pair of black sunglasses.
id: ClothingEyesGlassesCheapSunglasses
name: cheap sunglasses
description: A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
- type: Tag
tags:
- HamsterWearable
Expand All @@ -148,6 +145,16 @@
- type: IdentityBlocker
coverage: EYES

- type: entity
parent: ClothingEyesGlassesCheapSunglasses
id: ClothingEyesGlassesSunglasses
name: sun glasses
description: A pair of black sunglasses.
components:
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesSecurity
Expand Down

0 comments on commit 9b8441f

Please sign in to comment.