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

Add NFSD medals, The Glorious Order #1943

Merged
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: 1 addition & 1 deletion Resources/Maps/_NF/POI/nfsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13238,7 +13238,7 @@ entities:
- type: Transform
pos: 18.5,23.5
parent: 1
- proto: MedalCase
- proto: MedalCaseNfsd
entities:
- uid: 72
components:
Expand Down
115 changes: 115 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/medals.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdStarGold
name: star of valor
description: For daring acts of selflessness and devotion to duty in dire circumstances.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/star_gold.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/star_gold.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdShieldGold
name: shield of courage
description: For exemplary courage and leadership beyond expectation in contact with the enemy.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/shield_gold.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/shield_gold.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdShieldSilver
name: shield of gallantry
description: For acts of conspicuous gallantry against enemies of the Frontier.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/shield_silver.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/shield_silver.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdShieldBronze
name: shield of merit
description: For distinguished and meritorious conduct in the line of duty.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/shield_bronze.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/shield_bronze.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdCivStarSilver
name: friend of the frontier
description: In recognition of exceptional and honorable civilian service.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/star_civviesilver.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/star_civviesilver.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdCivShieldGold
name: shieldbearer's medal
description: For extraordinary civilian assistance in the face of danger.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/shield_civviegold.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/shield_civviegold.rsi
- type: Tag
tags:
- Medal

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalNfsdBloodDrop
name: badge of sacrifice
description: For grave wounds obtained in dutiful service.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/blood_drop.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/blood_drop.rsi
- type: Tag
tags:
- Medal

# just a little joke :)
- type: entity
parent: ClothingNeckBase
id: ClothingNeckMedalGloriousOrder
name: the glorious order of the frontier, 1st class
description: For unequivocal entrepreneurship and lugubriosity against incorrigible verisimilitude.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Medals/glorious_order.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Medals/glorious_order.rsi
- type: Tag
tags:
- Medal
- type: Construction
graph: ClothingNeckMedalGloriousOrder
node: GloriousOrder
23 changes: 23 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Misc/nfsd_medal_case.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: MedalCase
id: MedalCaseNfsd
name: nfsd medal case
description: This polished oak case hides medals to be given for distinguished service.
components:
- type: Sprite
sprite: _NF/Objects/Storage/nfsdmedalcase.rsi
- type: Item
sprite: _NF/Objects/Storage/nfsdmedalcase.rsi
- type: Storage
grid:
- 0,0,7,1 # Explicit just in case the parent changes
- type: StorageFill
contents:
- id: ClothingNeckMedalNfsdStarGold
- id: ClothingNeckMedalNfsdShieldGold
- id: ClothingNeckMedalNfsdShieldSilver
- id: ClothingNeckMedalNfsdShieldBronze
- id: ClothingNeckMedalNfsdBloodDrop
- id: ClothingNeckMedalNfsdBloodDrop # intentional duplicate
- id: ClothingNeckMedalNfsdCivStarSilver
- id: ClothingNeckMedalNfsdCivShieldGold
46 changes: 46 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Crafting/Graphs/medals_graphs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: constructionGraph
id: ClothingNeckMedalGloriousOrder
start: start
graph:
- node: start
edges:
- to: GloriousOrder
steps:
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: Clothing/Neck/Medals/gold.rsi
state: icon
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: Clothing/Neck/Medals/medicalmedal.rsi
state: icon
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: _NF/Clothing/Neck/Medals/shield_gold.rsi
state: icon
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: Clothing/Neck/Medals/cargomedal.rsi
state: icon
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: Clothing/Neck/Medals/sciencemedal.rsi
state: icon
- tag: Medal
name: any medal
doAfter: 2
icon:
sprite: _NF/Clothing/Neck/Medals/blood_drop.rsi
state: icon
- node: GloriousOrder
entity: ClothingNeckMedalGloriousOrder
12 changes: 12 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Crafting/medals.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: construction
name: glorious order of the frontier, 1st class
id: GloriousOrder
graph: ClothingNeckMedalGloriousOrder
startNode: start
targetNode: GloriousOrder
category: construction-category-utilities
objectType: Item
description: Surely more medals means more achievements.
icon:
sprite: _NF/Clothing/Neck/Medals/glorious_order.rsi
state: icon
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": "Made by Whatstone (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "icon/equipped-NECK components: gold medal taken from tg git at https://github.com/tgstation/tgstation/blob/master/icons/obj/clothing/accessories.dmi",
"copyright": "science, medical, cargo medal made by AsikKEsel, gold shield made by GhostPrince (Discord), blood drop made by Whatstone (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station, edited by Whatstone (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station, edited by Whatstone (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by GhostPrince (Discord) for Frontier Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
25 changes: 25 additions & 0 deletions Resources/Textures/_NF/Objects/Storage/nfsdmedalcase.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c, edited by Whatstone (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "closed"
},
{
"name": "open"
},
{
"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