Merge pull request #26 from Corvax-Frontier/Zekins3366-patch-1

Респрайтинг и прочие мелкие изменения
Corvax-Frontier · Apr 12, 2024 · 98effb1 · 98effb1
2 parents 0927c3f + eca864e
commit 98effb1
Show file tree

Hide file tree

Showing 55 changed files with 150 additions and 40 deletions.
diff --git a/Resources/Prototypes/Corvax/lobbyscreens.yml b/Resources/Prototypes/Corvax/lobbyscreens.yml
@@ -172,4 +172,12 @@
 
 - type: lobbyBackground
   id: MimesInTechs
-  background: /Textures/Corvax/LobbyScreens/mimes-in-techs.png
+  background: /Textures/Corvax/LobbyScreens/mimes-in-techs.png
+
+- type: lobbyBackground
+  id: NukieWar
+  background: /Textures/Corvax/LobbyScreens/nukie-war.png
+
+- type: lobbyBackground
+  id: Love
+  background: /Textures/Corvax/LobbyScreens/love.png
diff --git a/Resources/Prototypes/_NF/radio_channels.yml b/Resources/Prototypes/_NF/radio_channels.yml
@@ -1,13 +1,13 @@
 - type: radioChannel
   id: Traffic
   name: chat-radio-traffic
-  keycode: 'd'
+  keycode: 'д' # Corvax-Localization
   frequency: 1022
   color: "#CC6633"
 
 - type: radioChannel
   id: NFSD
   name: chat-radio-nfsd
-  keycode: 's'
+  keycode: 'ф' # Corvax-Localization
   frequency: 1023
   color: "#fffdd0"
diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml
@@ -8,64 +8,64 @@
 - type: radioChannel
   id: CentCom
   name: chat-radio-centcom
-  keycode: 'y'
+  keycode: 'ц' # Corvax-Localization
   frequency: 1337
   color: "#2681a5"
   longRange: true
 
 - type: radioChannel
   id: Command
   name: chat-radio-command
-  keycode: 'c'
+  keycode: 'к' # Corvax-Localization
   frequency: 1353
   color: "#fcdf03"
 
 - type: radioChannel
   id: Engineering
   name: chat-radio-engineering
-  keycode: 'e'
+  keycode: 'и' # Corvax-Localization
   frequency: 1357
   color: "#f37746"
 
 - type: radioChannel
   id: Medical
   name: chat-radio-medical
-  keycode: 'm'
+  keycode: 'м' # Corvax-Localization
   frequency: 1355
   color: "#57b8f0"
 
 - type: radioChannel
   id: Science
   name: chat-radio-science
-  keycode: 'n'
+  keycode: 'н' # Corvax-Localization
   frequency: 1351
   color: "#c68cfa"
 
 - type: radioChannel
   id: Security
   name: chat-radio-security
-  keycode: 'g'
+  keycode: 'о' # Corvax-Localization
   frequency: 1359
   color: "#dd3535"
 
 - type: radioChannel
   id: Service
   name: chat-radio-service
-  keycode: 'v'
+  keycode: 'с' # Corvax-Localization
   frequency: 1349
   color: "#6ca729"
 
 - type: radioChannel
   id: Supply
   name: chat-radio-supply
-  keycode: 'u'
+  keycode: 'п' # Corvax-Localization
   frequency: 1347
   color: "#b88646"
 
 - type: radioChannel
   id: Syndicate
   name: chat-radio-syndicate
-  keycode: 't'
+  keycode: 'т' # Corvax-Localization
   frequency: 1213
   color: "#8f4a4b"
   longRange: true
@@ -81,7 +81,7 @@
 - type: radioChannel
   id: Binary
   name: chat-radio-binary
-  keycode: 'b'
+  keycode: 'b' 
   frequency: 1001
   color: "#2ed2fd"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms

diff --git a/Resources/Textures/Corvax/LobbyScreens/attributions.yml b/Resources/Textures/Corvax/LobbyScreens/attributions.yml
@@ -171,4 +171,14 @@
 - files: ["mimes-in-techs.png"]
   license: "CC-BY-NC-SA-4.0"
   copyright: "zdhh(504340262344982529) on discord"
-  source: "https://discord.com/channels/919301044784226385/1073603532898435183/1200152390578470932"
+  source: "https://discord.com/channels/919301044784226385/1073603532898435183/1200152390578470932"
+
+- files: ["nukie-war.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "slvtr455(1181587899590922260) on discord"
+  source: "https://github.com/space-syndicate/space-station-14"
+
+- files: ["love.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "werkas(684260199015514125) on discord"
+  source: "https://discord.com/channels/919301044784226385/1073603532898435183/1200488927346299051"
diff --git a/Resources/Textures/Corvax/LobbyScreens/love.png b/Resources/Textures/Corvax/LobbyScreens/love.png
diff --git a/Resources/Textures/Corvax/LobbyScreens/love.png.yml b/Resources/Textures/Corvax/LobbyScreens/love.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: false
diff --git a/Resources/Textures/Corvax/LobbyScreens/nukie-war.png b/Resources/Textures/Corvax/LobbyScreens/nukie-war.png
diff --git a/Resources/Textures/Corvax/LobbyScreens/nukie-war.png.yml b/Resources/Textures/Corvax/LobbyScreens/nukie-war.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: false
diff --git a/Resources/Textures/_NF/Clothing/Masks/arcadia.rsi/equipped-MASK-reptilian.png b/Resources/Textures/_NF/Clothing/Masks/arcadia.rsi/equipped-MASK-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Masks/arcadia.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/arcadia.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Nimfar11 (GitHub) for Space Station 14 | Modified by AjexRose for NewFrontier",
+  "copyright": "Resprite created by svarshiksatanist",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-MASK",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...s/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi/equipped-MASK-reptilian.png b/...s/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi/equipped-MASK-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise Station",
+  "copyright": "Resprite created by svarshiksatanist",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-MASK",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/equipped-MASK-reptilian.png b/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/equipped-MASK-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/equipped-MASK-vulpkanin.png
diff --git a/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/pilot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | Resprited for SS14 NF Pilot Job by erhardsteinhauer (discord/github)",
+  "copyright": "Resprite created by svarshiksatanist",
   "size": {
     "x": 32,
     "y": 32
@@ -15,7 +15,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-MASK-vulpkanin",
+      "name": "equipped-MASK-reptilian",
       "directions": 4
     },
     {

diff --git a/...uterClothing/Hardsuits/maxim_prototype.rsi/equipped-OUTERCLOTHING-reptilian.png b/...uterClothing/Hardsuits/maxim_prototype.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/maxim_prototype.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/maxim_prototype.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d",
+  "copyright": "Resprite created by svarshiksatanist",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-reptilian",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
@@ -23,4 +27,4 @@
       "directions": 4
     }
   ]
-}
+}
diff --git a/...hing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING-reptilian.png b/...hing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34 | Resprited for mercenary by erhardsteinhauer (discord)",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...g/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING-reptilian.png b/...g/OuterClothing/Hardsuits/nfsd_brigmed.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...ng/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING-reptilian.png b/...ng/OuterClothing/Hardsuits/nfsd_bronze.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...erClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING-reptilian.png b/...erClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by Bing Guss for Frontier Server",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...hing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING-reptilian.png b/...hing/OuterClothing/Hardsuits/nfsd_gold.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...g/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING-reptilian.png b/...g/OuterClothing/Hardsuits/nfsd_sheriff.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Resprite creayed by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...ng/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING-reptilian.png b/...ng/OuterClothing/Hardsuits/nfsd_silver.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Resprite created by svarshiksatanist",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-reptilian",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/...Clothing/OuterClothing/Hardsuits/pilot.rsi/equipped-OUTERCLOTHING-reptilian.png b/...Clothing/OuterClothing/Hardsuits/pilot.rsi/equipped-OUTERCLOTHING-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/pilot.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/pilot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14 | Resprited for pilot by erhardsteinhauer (discord)",
+  "copyright": "Resprite created by svarshiksatanist",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-reptilian",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4

diff --git a/..._NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi/equipped-INNERCLOTHING-reptilian.png b/..._NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi/equipped-INNERCLOTHING-reptilian.png