Skip to content
Merged
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Omu/recipes/tags.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
construction-graph-tag-chem-hud = chemical analysis goggles
construction-graph-tag-medichem-hud = medichem goggles
construction-graph-tag-jamjar-glasses = jamjar glasses
construction-graph-tag-mesons = meson goggles
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
tags:
- PetWearable
- WhitelistChameleon
- GogglesMeson # Omu - for crafting recipe

- type: entity
parent: ClothingEyesBase
Expand Down Expand Up @@ -248,6 +249,7 @@
tags:
- HamsterWearable
- WhitelistChameleon
- JamjarGlasses #Omu, for recipe

- type: entity
parent: ClothingEyesBase
Expand Down
101 changes: 101 additions & 0 deletions Resources/Prototypes/_Omu/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,104 @@
- type: Tag
tags:
- WhitelistChameleon

- type: entity
parent: [ClothingEyesBase, ShowMedicalIcons]
id: ClothingEyesGlassesMedJamjar
name: medical jamjar glasses
description: Jamjar glasses installed with a medical HUD.
components:
- type: Sprite
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_med.rsi
- type: Clothing
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_med.rsi
- type: Construction
graph: ClothingEyesGlassesMedJJ
node: gogglesJamJarMed
- type: Tag
tags:
- WhitelistChameleon
- HamsterWearable

- type: entity
parent: [ClothingEyesBase]
id: ClothingEyesGlassesDiagJamjar
name: diagnostic jamjar glasses
description: Jamjar glasses installed with a diagnostic HUD.
components:
- type: Sprite
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_diag.rsi
- type: Clothing
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_diag.rsi
- type: Construction
graph: ClothingEyesGlassesDiagJJ
node: gogglesJamJarDiag
- type: Tag
tags:
- WhitelistChameleon
- HamsterWearable
- type: ShowHealthBars
damageContainers:
- Inorganic
- Silicon
- SiliconRadiation

- type: entity
parent: [ClothingEyesBase]
id: ClothingEyesGlassesMesonJamjar
name: meson jamjar glasses
description: Jamjar glasses installed with welding protection.
components:
- type: Sprite
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_meson.rsi
- type: Clothing
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_meson.rsi
- type: Construction
graph: ClothingEyesGlassesMesonJJ
node: gogglesJamJarMeson
- type: Tag
tags:
- WhitelistChameleon
- HamsterWearable
- type: EyeProtection

- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, ClothingEyesGlassesSunglasses, BaseSecurityContraband]
id: ClothingEyesGlassesSecJamjar
name: security jamjar glasses
description: Jamjar glasses installed with a security HUD and flash protection.
components:
- type: Sprite
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_sec.rsi
- type: Clothing
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_sec.rsi
- type: Construction
graph: ClothingEyesGlassesSecJJ
node: gogglesJamJarSec
- type: Tag
tags:
- WhitelistChameleon
- HamsterWearable

- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons, BaseCentcommContraband]
id: ClothingEyesGlassesCentComJamjar
name: central command jamjar glasses
description: Actshually, it's not a sin if you're nerdier than them..!
components:
- type: Sprite
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_centcom.rsi
- type: Clothing
sprite: _Omu/Clothing/Eyes/Glasses/jamjar_centcom.rsi
- type: FlashImmunity
- type: EyeProtection
- type: ShowHealthBars
damageContainers:
- Biological
- Inorganic
- type: ShowHungerIcons
- type: ShowThirstIcons
- type: Tag
tags:
- WhitelistChameleon
- HamsterWearable
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
- type: constructionGraph
id: ClothingEyesGlassesMedJJ
start: start
graph:
- node: start
edges:
- to: gogglesJamJarMed
steps:
- tag: JamjarGlasses
name: construction-graph-tag-jamjar-glasses
icon:
sprite: Clothing/Eyes/Glasses/jamjar.rsi
state: icon
doAfter: 5
- tag: HudMedical
name: construction-graph-tag-medical-hud
icon:
sprite: Clothing/Eyes/Hud/med.rsi
state: icon
doAfter: 5
- material: Cable
amount: 5
doAfter: 5
- tag: Radio
name: construction-graph-tag-radio
icon:
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5

- node: gogglesJamJarMed
entity: ClothingEyesGlassesMedJamjar

- type: constructionGraph
id: ClothingEyesGlassesDiagJJ
start: start
graph:
- node: start
edges:
- to: gogglesJamJarDiag
steps:
- tag: JamjarGlasses
name: construction-graph-tag-jamjar-glasses
icon:
sprite: Clothing/Eyes/Glasses/jamjar.rsi
state: icon
doAfter: 5
- tag: HudDiagnostic
name: construction-graph-tag-diagnostic-hud
icon:
sprite: Clothing/Eyes/Hud/diag.rsi
state: icon
doAfter: 5
- material: Cable
amount: 5
doAfter: 5
- tag: Radio
name: construction-graph-tag-radio
icon:
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5

- node: gogglesJamJarDiag
entity: ClothingEyesGlassesDiagJamjar

- type: constructionGraph
id: ClothingEyesGlassesMesonJJ
start: start
graph:
- node: start
edges:
- to: gogglesJamJarMeson
steps:
- tag: JamjarGlasses
name: construction-graph-tag-jamjar-glasses
icon:
sprite: Clothing/Eyes/Glasses/jamjar.rsi
state: icon
doAfter: 5
- tag: GogglesMeson
name: construction-graph-tag-mesons
icon:
sprite: Clothing/Eyes/Glasses/meson.rsi
state: icon
doAfter: 5
- material: Cable
amount: 5
doAfter: 5
- tag: Radio
name: construction-graph-tag-radio
icon:
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5


- node: gogglesJamJarMeson
entity: ClothingEyesGlassesMesonJamjar

- type: constructionGraph
id: ClothingEyesGlassesSecJJ
start: start
graph:
- node: start
edges:
- to: gogglesJamJarSec
steps:
- tag: JamjarGlasses
name: construction-graph-tag-jamjar-glasses
icon:
sprite: Clothing/Eyes/Glasses/jamjar.rsi
state: icon
doAfter: 5
- tag: HudSecurity
name: construction-graph-tag-security-hud
icon:
sprite: Clothing/Eyes/Hud/sec.rsi
state: icon
doAfter: 5
- material: Cable
amount: 5
doAfter: 5
- tag: Radio
name: construction-graph-tag-radio
icon:
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5

- node: gogglesJamJarSec
entity: ClothingEyesGlassesSecJamjar
32 changes: 32 additions & 0 deletions Resources/Prototypes/_Omu/Recipes/Construction/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,35 @@
targetNode: glassesMedChem
category: construction-category-clothing
objectType: Item

- type: construction
id: GlassesJamJarMed
graph: ClothingEyesGlassesMedJJ
startNode: start
targetNode: gogglesJamJarMed
category: construction-category-clothing
objectType: Item

- type: construction
id: GlassesJamJarMeson
graph: ClothingEyesGlassesMesonJJ
startNode: start
targetNode: gogglesJamJarMeson
category: construction-category-clothing
objectType: Item

- type: construction
id: GlassesJamJarSec
graph: ClothingEyesGlassesSecJJ
startNode: start
targetNode: gogglesJamJarSec
category: construction-category-clothing
objectType: Item

- type: construction
id: GlassesJamJarDiag
graph: ClothingEyesGlassesDiagJJ
startNode: start
targetNode: gogglesJamJarDiag
category: construction-category-clothing
objectType: Item
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Omu/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@

- type: Tag
id: Magazine

- type: Tag
id: GogglesMeson

- type: Tag
id: JamjarGlasses
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.
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,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"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.
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,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"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.
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
Loading