]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b23465) | patch
Branded lighters addition (#35514)
authorSmugman <85798843+Smugman@users.noreply.github.com>
Mon, 7 Jul 2025 18:53:17 +0000 (20:53 +0200)
committerGitHub <noreply@github.com>
Mon, 7 Jul 2025 18:53:17 +0000 (14:53 -0400)
commitf1902ad0e2e9b9026594b6a95d8d0697432f9772
tree1887d33052439adb0789dc4e887c17c0e2d6e2cetree | snapshot
parent7b2346563f1d98243cea4f8c4ba3070988855d42commit | diff
Branded lighters addition (#35514)

* newlighters

* port complete

* donk pocket box addition

* should fix test fail, proper credit

* captalisation issue

* fixed

* typo corrected

* removed accidental change to combat bakery

* fixed lock message, made NT flippo start fueled.

* Requested changes

* fixed discount dan

* moved matchbox

* requested changes, discount dan more broken than ever (somehow)

* unbungle

* uhhhhh

* maybe fixes?

* changed inheritance

* fixed enum?

* nevermind

* finally fixed

* breaking changes

* inheritance unbungled
137 files changed:
Content.Shared/Lock/ItemToggleRequiresLockComponent.cs [new file with mode: 0644] blob
Content.Shared/Lock/LockSystem.cs diff | blob | history
Resources/Locale/en-US/store/uplink-catalog.ftl diff | blob | history
Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml diff | blob | history
Resources/Prototypes/Catalog/uplink_catalog.yml diff | blob | history
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Tools/lighters.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Tools/matches.yml diff | blob | history
Resources/Prototypes/Objectives/stealTargetGroups.yml diff | blob | history
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json [moved from Resources/Textures/Objects/Tools/lighters.rsi/meta.json with 97% similarity] diff | blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png [moved from Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png with 100% similarity] blob | history
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский