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

респрайт очков + вейпа #1246

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
description: A pair of spectacular spectacles with prescription lenses.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/glasses.rsi
sprite: Corvax/Clothing/Eyes/Glasses/glasses.rsi # Corvax-Resprite
- type: Clothing
sprite: Clothing/Eyes/Glasses/glasses.rsi
sprite: Corvax/Clothing/Eyes/Glasses/glasses.rsi # Corvax-Resprite
- type: VisionCorrection
- type: Tag
tags:
Expand All @@ -100,9 +100,9 @@
description: Useful both for security and cargonia.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
sprite: Corvax/Clothing/Eyes/Glasses/sunglasses.rsi # Corvax-Resprite
- type: Clothing
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
sprite: Corvax/Clothing/Eyes/Glasses/sunglasses.rsi # Corvax-Resprite
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/beergoggles.rsi
sprite: Corvax/Clothing/Eyes/Hud/beergoggles.rsi # Corvax-Resprite
- type: Clothing
sprite: Clothing/Eyes/Hud/beergoggles.rsi
sprite: Corvax/Clothing/Eyes/Hud/beergoggles.rsi # Corvax-Resprite
- type: ShowThirstIcons

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
description: "Like a cigar, but for tough teens. (WARNING:Pour only water into the vape)"
components:
- type: Sprite
sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi
sprite: Corvax/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi # Corvax-Resprite
state: icon
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Lathes/chemistry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
- type: latheRecipe
id: Vape
icon:
sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi
sprite: Corvax/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi # Corvax-Resprite
state: icon
result: Vape
completetime: 2
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Mozinov",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}
Loading