From 8f827062af256524049e835651be0963ef6e29e3 Mon Sep 17 00:00:00 2001 From: FireFoxPhoenix Date: Sun, 15 Sep 2024 15:04:10 +1000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=88=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/_NF/store/uplink-catalog.ftl | 4 +- .../entities/objects/devices/flatpack.ftl | 2 + .../Entities/Objects/Devices/flatpack.yml | 14 ++- .../_NF/Catalog/pirate_uplink_catalog.yml | 16 +++ .../Objects/Devices/flatpack.rsi/meta.json | 101 +++++++++--------- .../Devices/flatpack.rsi/pirate-gun.png | Bin 0 -> 1028 bytes 6 files changed, 86 insertions(+), 51 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/pirate-gun.png diff --git a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl index 2f54c01b4c2..db3ea873964 100644 --- a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl @@ -200,4 +200,6 @@ uplink-pirate-redgrenade-desc = Граната, горячая на ощупь. uplink-pirate-greengrenade-name = Зелёная граната uplink-pirate-greengrenade-desc = Граната с отвратным газом, от которой в голове становится мутно. uplink-pirate-graygrenade-name = Серая граната -uplink-pirate-graygrenade-desc = Тяжёлая граната, словно пушечное ядро в руке. \ No newline at end of file +uplink-pirate-graygrenade-desc = Тяжёлая граната, словно пушечное ядро в руке. +uplink-pirate-shuttle-cannon-pirate-flatpack-name = Упаковка пушки пиратского карабля +uplink-pirate-shuttle-cannon-pirate-flatpack-desc = Кабум! Новая пушка на ваш корабль! Ну разве не здорово? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl index c728fcde004..77eed4006b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl @@ -26,3 +26,5 @@ ent-SpaceHeaterFlatpack = упаковка термостата .desc = Универсально-сборная упаковка, используемая для сборки термостата. ent-FaxMachineFlatpack = упаковка факса .desc = Универсально-сборная упаковка, используемая для сборки факса. +ent-ShuttleGunPirateCannonFlatpack = упаковка пушки пиратского корабля + .desc = Упакованная пушка пиратского коробля. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 5fb81aa6d48..710c275a7d2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -215,4 +215,16 @@ layers: - state: fax-machine - type: Flatpack - entity: FaxMachineBase \ No newline at end of file + entity: FaxMachineBase + +- type: entity + parent: BaseFlatpack + id: ShuttleGunPirateCannonFlatpack + name: pirate shuttle gun flatpack + description: This is a packaged pirate ship cannon. + components: + - type: Sprite + layers: + - state: pirate-gun + - type: Flatpack + entity: ShuttleGunPirateCannon \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index 8780923d223..3d5a3905191 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -383,3 +383,19 @@ whitelist: tags: - PirateUplink + +- type: listing # Frontier + id: UplinkShuttleGunPirateCannonFlatpack + name: uplink-pirate-shuttle-cannon-pirate-flatpack-name + description: uplink-pirate-shuttle-cannon-pirate-flatpack-desc + productEntity: ShuttleGunPirateCannonFlatpack + icon: { sprite: Objects/Devices/flatpack.rsi, state: pirate-gun } + cost: + Doubloon: 8 + categories: + - UplinkPirateWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index bb5b49e1850..8face759e16 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -1,50 +1,53 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - }, - { - "name": "overlay" - }, - { - "name": "icon-default" - }, - { - "name": "solar-assembly-part" - }, - { - "name": "ame-part" - }, - { - "name": "singularity-generator" - }, - { - "name": "tesla-generator" - }, - { - "name": "radiation-collector" - }, - { - "name": "tesla-coil" - }, - { - "name": "grounding-rod" - }, - { - "name": "containment-field-generator" - }, - { - "name": "emitter" - }, - { - "name": "fax-machine" - } - ] -} + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "overlay" + }, + { + "name": "icon-default" + }, + { + "name": "solar-assembly-part" + }, + { + "name": "ame-part" + }, + { + "name": "singularity-generator" + }, + { + "name": "tesla-generator" + }, + { + "name": "radiation-collector" + }, + { + "name": "tesla-coil" + }, + { + "name": "grounding-rod" + }, + { + "name": "containment-field-generator" + }, + { + "name": "emitter" + }, + { + "name": "fax-machine" + }, + { + "name": "pirate-gun" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/pirate-gun.png b/Resources/Textures/Objects/Devices/flatpack.rsi/pirate-gun.png new file mode 100644 index 0000000000000000000000000000000000000000..505d044d82b2f753ff1660bc863e2e81ba4ad3ff GIT binary patch literal 1028 zcmV+f1pE7mP)Px&zDYzuR9HvtmTPR2RUC(()2_Rewe&LBrL%79HpXQ)w=r-m5EW1+ z;|DeJK@wx4$n+DzglLR$qQwhabS7wU3k(qFVmBNSGS@j7yRy2qUANA)-MaF=rhtH7 zoGBs1q$fGao1ByLd-9x||Nj--=OONMK2dEtvuyN~p^Er<%!~;oMBsrY(&!JQZhMitC@k$gzpx3DR z;7lKxI=cI(DTo*#7iwyseE2()L5HoUm)7%x#Kzt@E=(@Tpb#)O4_itz*jT)VK8KT* zjvjVxE9b4FXWP86F=BvCX-e0lRhyE!x_h|l@uQB9B@~iS2#HBw66IMw?2b9&W0eFK zLU{c_o~^FnMElQF6t3iGldXLODkBD{v8bnh8S?9LG7Y@3vkI4YmIqS}Ty|R6_4bKae;YrmUy`6ddo%~+dk9iy;5Vt{QH_0*u#uQR0@*|T*mOP6ZU z#A&JA@DbvX-N>>PAr5h^p^L_LFGo&yGUAwImBmD1wmEE|YXr(72B^+Va9?o;jH$^w z>UM8O8|$ZNUjnjx3?a54%NpQogjkKsTEUJ3U-5@)>K1^t$##Ae$|DBYU}V%8Bs~o9 z`qR~vq)Vjion$WX1oFar2$2S)BfCE4+e0t%PSfX%P22`J-fZjb_OmKtfYL-pX9VfV z%XL`yK7-|jHVO($$SYaLm!C?=3(vz35{Ex~g;I-y*N(I>=Jeb$&~nPw)irY$S5TVB z@QlE0SeC`H9Rp+@+>Fp~rzoQrd;b8z*<^mKOJHi&jZv@V)%p`S?f_^$X}fgcPl_To zP^M*UB1l?}*}(p%9;0&qMP%8C5FR}BIgCz+7;r&+oQj$0S?XIm=^JwMP~MGK(A;YK z{eqVj5d##fnJ8bIyZn3mRo>lGLt?B3lkXGcjF%X4PhKxZDwUEEhnp0Gmgn9-&gRu- zu8eyqUz5wJb3YAsy2-j5fbr}+Q}U7o75(GW_=6Jj*Yw1QaQN*iu23jYs|4ApdVGN( zGl3vg<@tQraQ5ZP^Bj&C0BAT+TUl%GA0#L%xcJ)$s&M