diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e625ebe507..ade6ae5883 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -237,6 +237,12 @@ itemId: Pen price: 2 +- type: uplinkListing + id: UplinkCigarettes + category: Misc + itemId: CigPackSyndicate + price: 2 + - type: uplinkListing id: UplinkSoapSyndie category: Misc diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index 25fcc1b637..3b14f98b8a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -22,3 +22,19 @@ - type: Construction graph: smokeableCigarette node: cigarette + +- type: entity + id: CigaretteSyndicate + suffix: syndicate + parent: Cigarette + name: cigarette + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Omnizine + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 24b80a6e0b..44984e2c1e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -92,3 +92,22 @@ - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi size: 6 + +- type: entity + id: CigPackSyndicate + parent: CigPackBase + name: Syndicate Smokes packet + description: Elite cigarettes for elite agents. Infused with medicine for when you need to do more than calm your nerves. + components: + - type: StorageFill + contents: + - id: CigaretteSyndicate + amount: 6 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + size: 6 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png new file mode 100644 index 0000000000..2b2cb8acf7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png new file mode 100644 index 0000000000..fa238f8de7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png new file mode 100644 index 0000000000..263f797355 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json new file mode 100644 index 0000000000..bd6e6c3748 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from sprite taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png new file mode 100644 index 0000000000..be3d377807 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png new file mode 100644 index 0000000000..89222ad9b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png differ