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.

Sign up for GitHub

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

[TWEAK] В пачку сигарет и портсигар снова можно класть зажигалки #1013

Merged
merged 2 commits into from
Jan 26, 2025
Merged

[TWEAK] В пачку сигарет и портсигар снова можно класть зажигалки #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bdbe4a
В пачку сигарет и портсигар снова можно класть зажигалки.
Schrodinger71 Jan 26, 2025
cb13e2e
Merge branch 'master' into sigarss
Schrodinger71 Jan 26, 2025
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/ADT/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,3 +460,5 @@
- type: Tag
id: LavaDungeonBloodMiner

- type: Tag
id: ADTLighter
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
whitelist:
tags:
- Cigarette
- ADTLighter
# ADT Tweak END
- type: StorageFill
contents:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
tags:
- Cigar
- ADTMedipen
- ADTLighter
# ADT Tweak END
- type: Item
sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/lighters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
# ADT Tweak Start
- type: StaticPrice
price: 80
- type: Tag
tags:
- ADTLighter
# ADT Tweak END

- type: entity
Expand Down Expand Up @@ -218,6 +221,11 @@
- type: UseDelay
- type: IgnitionSource
ignited: false
# ADT Tweak Start
- type: Tag
tags:
- ADTLighter
# ADT Tweak END

- type: entity
name: flippo engraved lighter
Expand Down
Loading