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

Few Nikko Changes #375

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 7 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
Binary file added Resources/Audio/Announcements/RoundEnd/oney.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
ClothingHeadHatPumpkin: 2
ClothingHeadHatShrineMaidenWig: 2
ClothingOuterSuitShrineMaiden: 2
ClothingHeadHatWitch1: 2 # Floof - Witch
ClothingHeadHatWitch: 2 # Floof - Witch
ClothingOuterSuitWitchRobes: 2 # Floof - Witch
Gohei: 2
ClothingHeadHatRedRacoon: 2
ClothingOuterRedRacoon: 2
Expand Down Expand Up @@ -90,6 +93,7 @@
ClothingMaskNeckGaiterRed: 2
ClothingNeckBellCollar: 2
ClothingOuterUnathiRobe: 1
ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak
# Floofstation - Departmental Socks ect
ClothingUniformMusicianThong: 2
ClothingUnderSocksMusician: 2
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoodRedHood
name: Red Hood
description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun.
components:
- type: Sprite
sprite: Floof/Clothing/Head/Hoods/redhood.rsi
- type: Clothing
sprite: Floof/Clothing/Head/Hoods/redhood.rsi
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
16 changes: 16 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakRedHood
name: Red Cloak
description: A cloak made for travel and comfort. Slightly smells of cherry pie?
components:
- type: Sprite
sprite: Floof/Clothing/Neck/Cloaks/redhood.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodRedHood
requiredSlot:
- neck
slot: head
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity # From Upstream
parent: ClothingOuterBase
id: ClothingOuterSuitWitchRobes
name: witch robes
description: Magic is all about the spell power, ZE!
components:
- type: Sprite
sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi
- type: Clothing
sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi
15 changes: 15 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/Jobs/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,21 @@
jobs:
- Janitor

- type: loadout
id: LoadoutClothingNeckCloakJanitor
category: JobsServiceUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- Janitor
- !type:CharacterPlaytimeRequirement
tracker: JobJanitor
min: 36000 # 10 hours
items:
- ClothingNeckCloakJanitor

#TO BE ADDED - Botanist
#TO BE ADDED - Reporter

Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/neck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@
- !type:CharacterItemGroupRequirement
group: LoadoutNeck2

- type: loadout
id: LoadoutItemsNeckRedHood
category: Neck
cost: 1
exclusive: true
items:
- ClothingNeckCloakRedHood
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck2

# Generic collars
- type: loadout
id: LoadoutItemsNeckBlueCollar
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/outerClothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,13 @@
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter2

- type: loadout
id: LoadoutClothingOuterSuitWitchRobes
category: Outer
cost: 1
items:
- ClothingOuterSuitWitchRobes
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter2
14 changes: 14 additions & 0 deletions Resources/Prototypes/SoundCollections/announcements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,17 @@
- /Audio/Announcements/RoundEnd/susguyeatscrew.ogg
- /Audio/Announcements/RoundEnd/this_drink.ogg
- /Audio/Announcements/RoundEnd/truth_imagination.ogg
- /Audio/Announcements/RoundEnd/oney.ogg
# Floof added sounds
- /Audio/Floof/Announcements/RoundEnd/bangindonk.ogg
- /Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg
- /Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg
- /Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg
- /Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg
- /Audio/Floof/Announcements/RoundEnd/filledwith.ogg
- /Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg
- /Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg
- /Audio/Floof/Announcements/RoundEnd/lottawords.ogg
- /Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg
- /Audio/Floof/Announcements/RoundEnd/whatashame.ogg
- /Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg
37 changes: 37 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakJanitor
name: janitor's cloak
description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof!
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
- type: ItemSlots
slots:
item:
name: Plunger
# insertVerbText: cloak-insert-verb
# ejectVerbText: cloak-eject-verb
whitelist:
tags:
- Plunger
- type: ItemMapper
mapLayers:
plunger:
whitelist:
tags:
- Plunger
sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
- type: Appearance

- type: entity
id: ClothingNeckCloakJanitorFilled
parent: ClothingNeckCloakJanitor
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- Plunger
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": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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,33 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, edited by dvir001 on github",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "plunger"
},
{
"name": "plunger-equipped-NECK",
"directions": 4
},
{
"name": "equipped-NECK",
"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.
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 270 files
Loading