Skip to content

Commit

Permalink
Adds Cohiba Robusto Cigars (#1455)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

Adds Cohiba Robusto cigars from SS13 for our heavy smoker HoS.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

I'll think something up one day

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/4093972f-a421-4912-903f-f8fc67730c6a)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added Cohiba Robusto cigars
- tweak: Tweaked nicotine amounts in cigars, smoke longer
  • Loading branch information
VMSolidus authored Jan 19, 2025
2 parents 61511ec + 8fe7608 commit 8fb5dcb
Show file tree
Hide file tree
Showing 16 changed files with 171 additions and 3 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/loadouts/itemgroups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@ character-item-group-LoadoutHeadOfSecurityMask = Head Of Security Masks
character-item-group-LoadoutHeadOfSecurityOuter = Head Of Security Outerwear
character-item-group-LoadoutHeadOfSecurityShoes = Head Of Security Shoes
character-item-group-LoadoutHeadOfSecurityUniforms = Head Of Security Uniforms
character-item-group-LoadoutHeadOfSecurityTrinkets = Head Of Security Trinkets
# Security - Security Officer
character-item-group-LoadoutSecurityOfficerBackpacks = Security Officer Backpacks
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
- id: ClothingHeadsetAltSecurity
- id: ClothingEyesGlassesSunglasses
- id: ClothingShoesBootsJack
- id: CigarGoldCase
- id: CigarRobustCase
prob: 0.50
- id: DoorRemoteSecurity
- id: RubberStampHos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,11 @@
id: LoadoutCommandHOSJumpskirtParade
- type: loadout
id: LoadoutCommandHOSJumpskirtFormal

- type: characterItemGroup
id: LoadoutHeadOfSecurityTrinkets
maxItems: 2
items:
- type: loadout
id: LoadoutHoSCigarCase
# TBD
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,54 @@
contents:
- id: CigarGold
amount: 8

- type: entity
id: CigarRobustCase
parent: CigarCase
name: Cohiba Robusto cigar case
description: "A case of imported Cohiba cigars, renowned for their strong flavor."
components:
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/case_robust.rsi
layers:
- state: closed
- state: open
map: ["openLayer"]
- state: cigar1
map: ["cigar1"]
visible: false
- state: cigar2
map: ["cigar2"]
visible: false
- state: cigar3
map: ["cigar3"]
visible: false
- state: cigar4
map: ["cigar4"]
visible: false
- state: cigar5
map: ["cigar5"]
visible: false
- type: Storage
grid:
- 0,1,4,1
- type: Item
sprite: Objects/Consumable/Smokeables/Cigars/case_robust.rsi
size: Normal
shape:
- 0,0,2,1
storedRotation: 90
- type: StorageFill
contents:
- id: CigarRobust
amount: 5
- type: ItemCounter
count:
tags: [Cigar]
composite: true
layerStates:
- cigar1
- cigar2
- cigar3
- cigar4
- cigar5
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
tags:
- Cigar
- Trash
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 50
reagents:
- ReagentId: Nicotine
Quantity: 25
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
slots: [ mask ]
Expand All @@ -33,7 +40,7 @@
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 20
maxVol: 50
- type: Tag
tags:
- Cigar
Expand All @@ -55,6 +62,15 @@
equippedPrefix: unlit
- type: Item
size: Tiny
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 50
reagents:
- ReagentId: Nicotine
Quantity: 25
- ReagentId: Gold
Quantity: 5

- type: entity
id: CigarGoldSpent
Expand All @@ -68,4 +84,41 @@
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 20
maxVol: 50

- type: entity
id: CigarRobust
parent: Cigar
name: Cohiba Robusto cigar
description: There's little more you could want from a cigar.
components:
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
state: unlit-icon
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
slots: [ mask ]
equippedPrefix: unlit
- type: Item
size: Tiny
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 50
reagents:
- ReagentId: Nicotine
Quantity: 40 # infinite cancer works

- type: entity
id: CigarRobustSpent
parent: CigarRobust
suffix: spent
components:
- type: Sprite
state: burnt-icon
- type: Smokable
state: Burnt
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 50
15 changes: 15 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Head of Security Weapon Selection
# Most of these mirror the unique weapons that were previously map-specific items placed in the HoS Office.
# Or are weapons that fit a similar theme of "Rare weapons not normally seen by Security"

- type: loadout
id: LoadoutCommandHoSPulsePistol
category: JobsSecurityHeadOfSecurity
Expand Down Expand Up @@ -392,3 +393,17 @@
- HeadOfSecurity
items:
- ClothingUniformJumpskirtHosFormal

# Trinkets
- type: loadout
id: LoadoutHoSCigarCase
category: JobsSecurityHeadOfSecurity
cost: 0
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutHeadOfSecurityTrinkets
- !type:CharacterJobRequirement
jobs:
- HeadOfSecurity
items:
- CigarRobustCase
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.
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,40 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from NSV13 https://github.com/BeeStation/NSV13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "cigar1"
},
{
"name": "cigar2"
},
{
"name": "cigar3"
},
{
"name": "cigar4"
},
{
"name": "cigar5"
},
{
"name": "open"
},
{
"name": "closed"
},
{
"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.

0 comments on commit 8fb5dcb

Please sign in to comment.