diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8c9644f20c..01d5adf20c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -377,6 +377,7 @@ - HolofanProjector - BluespaceBeaker - SyringeBluespace + - BlueSpacePillCanister # WD - WeaponForceGun - WeaponLaserSvalinn - WeaponProtoKineticAccelerator @@ -1024,6 +1025,7 @@ - CryostasisBeaker - BluespaceBeaker - SyringeBluespace + - BlueSpacePillCanister # WD - SyringeCryostasis - ClothingEyesHudMedical - type: BluespaceStorage diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index f028cbd5fd..5870f299a1 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -242,3 +242,4 @@ recipeUnlocks: - BluespaceBeaker - SyringeBluespace + - BlueSpacePillCanister # WD diff --git a/Resources/Prototypes/_White/Entities/Objects/Instruments/instruments_string.yml b/Resources/Prototypes/_White/Entities/Objects/Instruments/instruments_string.yml new file mode 100644 index 0000000000..62467de17c --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Instruments/instruments_string.yml @@ -0,0 +1,39 @@ +- type: entity + parent: BaseHandheldInstrument + id: PunkGuitar + name: рок-гитара + description: Вот это топор! + components: + - type: Instrument + program: 25 + - type: SwappableInstrument + instrumentList: + "Clean": {27: 0} + "Jazz": {25: 0} + "Muted": {28: 0} + - type: Sprite + sprite: White/Objects/Fun/Instruments/seguitar.rsi + state: icon + - type: Item + size: Normal + sprite: White/Objects/Fun/Instruments/seguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: White/Objects/Fun/Instruments/seguitar.rsi + - type: Tag + tags: + - StringInstrument + - type: MeleeWeapon + wideAnimationRotation: 45 + damage: + types: + Blunt: 6 + Slash: 2 + - type: Wieldable + - type: IncreaseDamageOnWield #they don't call it an axe for nothing + damage: + types: + Blunt: 4 + Slash: 2 diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/chemistry.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/chemistry.yml new file mode 100644 index 0000000000..84f5a9bf19 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Chemical/chemistry.yml @@ -0,0 +1,24 @@ +- type: entity + name: блюспейс баночка для таблеток + id: BlueSpacePillCanister + parent: BaseStorageItem + description: Вмещает до 100 таблеток. + components: + - type: Item + size: Tiny + sprite: White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi + - type: Sprite + sprite: White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi + state: bluespace_pill_canister + - type: Tag + tags: + - PillCanister + - type: Storage + grid: + - 0,0,10,10 + quickInsert: true + areaInsert: true + areaInsertRadius: 1 + storageInsertSound: /Audio/Effects/pill_insert.ogg + storageRemoveSound: /Audio/Effects/pill_remove.ogg + - type: Dumpable diff --git a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml index 1b8ccfb3b7..3fe77073a5 100644 --- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml +++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml @@ -354,3 +354,13 @@ Plastic: 3000 Silver: 100 Gold: 100 + +- type: latheRecipe + id: BlueSpacePillCanister + result: BlueSpacePillCanister + completetime: 2 + materials: + Steel: 300 + Plastic: 300 + Plasma: 100 + Silver: 50 diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a61a4254d5 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/icon.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/icon.png new file mode 100644 index 0000000000..0867c5ef40 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-left.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-left.png new file mode 100644 index 0000000000..ce154408c2 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-right.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-right.png new file mode 100644 index 0000000000..31aef42049 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/meta.json b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/meta.json new file mode 100644 index 0000000000..e69f1b7e68 --- /dev/null +++ b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Discord: @SoFCute", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..ce154408c2 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..31aef42049 Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/Instruments/seguitar.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/bluespace_pill_canister.png b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/bluespace_pill_canister.png new file mode 100644 index 0000000000..51234d57f1 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/bluespace_pill_canister.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-left.png b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-left.png new file mode 100644 index 0000000000..a6282520e8 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-right.png b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-right.png new file mode 100644 index 0000000000..5ed9cf5dc5 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/meta.json b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/meta.json new file mode 100644 index 0000000000..0dcbe3b4bc --- /dev/null +++ b/Resources/Textures/White/Objects/Specific/Chemistry/bluespace_pill_canister.rsi/meta.json @@ -0,0 +1,64 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi , and resprite discord user: Neko Dar#8948 (445213683279200279)", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bluespace_pill_canister", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ] + ] + } + ] +} \ No newline at end of file