-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #269 from Schrodinger71/kotiki
Котики
- Loading branch information
Showing
13 changed files
with
164 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,8 @@ | ||
ent-ADTEvidanceBag = пакетик для улик | ||
.desc = создан для хранения улик, а не наркотиков. | ||
.desc = Cоздан для хранения улик, а не наркотиков. | ||
ent-ADTPillExperimental = космическая трава | ||
.desc = Зелёная измельчённая трава, интересно что же это такое... | ||
ent-ADTPillExter = экстэриал витамины | ||
.desc = На вид обычные разноцветные витаминки. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 108 additions & 6 deletions
114
Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,116 @@ | ||
- type: Tag | ||
id: ADTPillExperimental | ||
|
||
- type: Tag | ||
id: ADTPillExter | ||
|
||
- type: entity | ||
id: ADTEvidanceBag | ||
name: Evidance Bag | ||
parent: BaseStorageItem | ||
parent: BaseItem | ||
description: Designed to store evidence, not drugs | ||
components: | ||
- type: Appearance | ||
- type: Sprite | ||
sprite: ADT/Objects/Misc/Evidance.rsi | ||
state: icon | ||
scale: 0.7, 0.7 | ||
- type: Storage | ||
grid: | ||
- 0,0,10,7 | ||
maxItemSize: Small | ||
scale: 0.6, 0.6 | ||
- type: ItemSlots | ||
slots: | ||
place: | ||
name: Place | ||
#startingItem: null | ||
priority: 1 | ||
whitelist: | ||
tags: | ||
- ADTPillExperimental | ||
- ADTPillExter | ||
- type: ItemMapper | ||
mapLayers: | ||
place_number: | ||
whitelist: | ||
tags: | ||
- ADTPillExperimental | ||
place_number2: | ||
whitelist: | ||
tags: | ||
- ADTPillExter | ||
sprite: ADT/Objects/Misc/Evidance.rsi | ||
- type: ContainerContainer | ||
containers: | ||
place: !type:ContainerSlot | ||
|
||
- type: entity | ||
name: pill | ||
parent: FoodInjectableBase | ||
id: ADTPillExperimental | ||
description: It's not a suppository. | ||
components: | ||
- type: SliceableFood | ||
count: 2 | ||
- type: Sprite | ||
sprite: ADT/Objects/Misc/pill_ex.rsi | ||
state: trava_ent | ||
scale: 0.6, 0.6 | ||
- type: Item | ||
size: Tiny | ||
- type: Tag | ||
tags: | ||
- ADTPillExperimental | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: SpaceDrugs | ||
Quantity: 15 | ||
- ReagentId: Nocturine | ||
Quantity: 15 | ||
|
||
- type: entity | ||
name: pill | ||
parent: FoodInjectableBase | ||
id: ADTPillExter | ||
description: It's not a suppository. | ||
components: | ||
- type: SliceableFood | ||
count: 2 | ||
- type: Sprite | ||
sprite: ADT/Objects/Misc/pill_ex.rsi | ||
state: extezi_ent | ||
scale: 0.6, 0.6 | ||
- type: Item | ||
size: Tiny | ||
- type: Tag | ||
tags: | ||
- ADTPillExter | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Stimulants | ||
Quantity: 15 | ||
- ReagentId: SpaceDrugs | ||
Quantity: 15 | ||
|
||
#Stimulants SpaceDrugs Nocturine | ||
# - type: SolutionContainerManager | ||
# solutions: | ||
# smokable: | ||
# maxVol: 45 | ||
# reagents: | ||
# - ReagentId: Nicotine | ||
# Quantity: 40 | ||
# - ReagentId: Omnizine | ||
# Quantity: 5 | ||
# - type: SolutionContainerManager | ||
# solutions: | ||
# food: | ||
# maxVol: 20 | ||
# reagents: | ||
# - ReagentId: Bicaridine | ||
# Quantity: 10 | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,12 @@ | |
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "place_number" | ||
}, | ||
{ | ||
"name": "place_number2" | ||
} | ||
] | ||
} |
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:yamato_no_orochi8 by Adveture Time", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "trava_ent" | ||
}, | ||
{ | ||
"name": "extezi_ent" | ||
} | ||
] | ||
} | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.