diff --git a/Resources/Locale/ru-RU/info/rules.ftl b/Resources/Locale/ru-RU/info/rules.ftl index 5ce4242460..01739a00dd 100644 --- a/Resources/Locale/ru-RU/info/rules.ftl +++ b/Resources/Locale/ru-RU/info/rules.ftl @@ -1,6 +1,6 @@ # Rules -ui-rules-header = Правила сервера Honk Station -ui-rules-header-rp = Правила сервера Honk Station +ui-rules-header = Правила сервера Amour +ui-rules-header-rp = Правила сервера Amour ui-rules-accept = Я ознакомился и согласен следовать правилам ui-rules-wait = Кнопка принятия будет разблокирована через { $time } секунд. diff --git a/Resources/Prototypes/_Honk/tags.yml b/Resources/Prototypes/_Honk/tags.yml deleted file mode 100644 index 6f3185242f..0000000000 --- a/Resources/Prototypes/_Honk/tags.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: Tag - id: EnergyCellСarbine - -- type: Tag - id: EnergyCellDisabler - -- type: Tag - id: EnergyCellDisablerSmg - -- type: Tag - id: EnergyCellLaserCannon - -- type: Tag - id: EnergyCellLaserRetro - -- type: Tag - id: EnergyCellMakeshift - -- type: Tag - id: MagazineKalashLightRifleBox diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png index c6be930514..fea89e7ca6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png index 5ea2f509cc..c50bf189db 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png index 05c20a2d02..99d7e73193 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png index 82b872e3e6..be58210ecd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png index efc78a8fff..91cf2141e7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png index 43571e5eb5..c8fc471c45 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png index c54296ff50..115e28885a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png deleted file mode 100644 index 10b6bb3754..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png index 885037dfbd..e021aae704 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png index 0a051aae14..fd7847d16f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png index fd7847d16f..efa7d9ea52 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index fe8dde1b89..2b374ec4dd 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -7,44 +7,47 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "mag-unshaded-5" - }, - { - "name": "mag-unshaded-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - }] + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png deleted file mode 100644 index 2131365766..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png deleted file mode 100644 index 33443f1755..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index 33443f1755..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png deleted file mode 100644 index c69510f238..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json deleted file mode 100644 index e4d8847bc0..0000000000 --- a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", - "size": { - "x": 48, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "bolt-open" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png deleted file mode 100644 index 9c5bafd2f9..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png deleted file mode 100644 index 86d5a9b3a7..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json deleted file mode 100644 index 95ab2ba002..0000000000 --- a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png deleted file mode 100644 index 33443f1755..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index 33443f1755..0000000000 Binary files a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json deleted file mode 100644 index eef8805607..0000000000 --- a/Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/manifest.yml b/Resources/manifest.yml index e5b6925e7f..8f389acd1b 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,4 +1,4 @@ -defaultWindowTitle: Honk Station +defaultWindowTitle: "Giedi Prime: Amour" windowIconSet: /Textures/Logo/icon splashLogo: /Textures/Logo/logo-ru.png