Corvax-Frontier · Zekins3366 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024
diff --git a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
@@ -53,7 +53,9 @@ uplink-security-energysword-desc = Юридически одобренный э
 uplink-security-wt550-name = WT 550
 uplink-security-wt550-desc = Полностью автоматический пистолет-пулемёт. Использует специальные верхние магазины для быстрой перезарядки в пылу битвы. Калибр .35 авто.
 uplink-security-ks23-name = Дробовик KS23
-uplink-security-ks23-desc = Особый дробовик, который из-за специального строения механизма может стрелять как обычными снарядами дробовика, так и светошумовыми и газовыми.
+uplink-security-ks23-desc = Особый дробовик, который может стрелять особыми патронами.
+uplink-security-research-disk-10000-name = Исследовательский диск
+uplink-security-research-disk-10000-desc = Диск для сервера РНД с 10000 очками.
 uplink-security-energygun-name = Энергетическое оружие
 uplink-security-energygun-desc = Полуавтоматический энергопистолет, способный стрелять как несмертельными парализующими, так и смертоносными энергетическими зарядами. Имеет встроенный аккумулятор, но требует подзарядки на специальной станции.
 uplink-security-emprpg-name = РПГ-7

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/fun/toys.ftl
@@ -0,0 +1,2 @@
+ent-HolyPlushieOrangeFox = священная лиса
+    .desc = Милая плюшевая лиса. Хм.. этот нимб..
diff --git a/...urces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/...urces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
@@ -78,3 +78,5 @@ ent-BorgModuleL6C = модуль киборга с L6C ROW
     .desc = Модуль, в который входит пулемёт L6C.
 ent-BorgModuleMartyr = модуль киборга Мученик
     .desc = Модуль, поставляемый со взрывчаткой, с которой вы, скорее всего, не захотите связываться сами.
+ent-BorgModuleWeapon = модуль энергетического оружия киборга
+    .desc = Модуль, с энергокижалом и продвинутым лазерным пистолетом для киборга.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -360,6 +360,7 @@
       - id: BeachBall
       - id: ClothingShoesSkates
       - id: RubberChicken
+      - id: HolyPlushieOrangeFox # Corvax-Frontier
 
 - type: entity
   id: CrateFunBikeHornImplants

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Corvax/Entities/Objects/Fun/toys.yml
@@ -0,0 +1,27 @@
+- type: entity
+  parent: PlushieOrangeFox
+  id: HolyPlushieOrangeFox
+  name: holy fox plushie
+  description: A cute plushie that look like a foxxo! Hmm.. This is very strange.. 
+  components:
+  - type: PointLight
+    color: "#FFD700FF"
+    energy: 5
+    radius: 3
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Effects/hallelujah.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Effects/hallelujah.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Effects/hallelujah.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/hallelujah.ogg
+  - type: Sprite
+    sprite: _NF/Objects/Fun/foxplushie.rsi
+    state: holy
+  - type: UseDelay
+    delay: 2.0
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Corvax/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: BorgModuleWeapon
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: cyborg energy weapon module
+  description: Module with an energy dagger and an advanced laser pistol for a cyborg.
+  components:
+    - type: Sprite
+      layers:
+      - state: syndicate
+      - state: icon-syndicate
+    - type: ItemBorgModule
+      items:
+        - WeaponAdvancedLaser
+        - EnergyDagger
+    - type: StaticPrice
+      vendPrice: 25000
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -52,6 +52,8 @@
     proto: GrenadeFrag
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: GunRequiresWield # Corvax-Frontier
+  - type: Wieldable # Corvax-Frontier
 
 - type: entity
   name: RPG-7
@@ -85,6 +87,8 @@
     steps: 2
     zeroVisible: false
   - type: Appearance
+  - type: GunRequiresWield # Corvax-Frontier
+  - type: Wieldable # Corvax-Frontier
 
 - type: entity
   name: multiple rocket launcher
@@ -152,6 +156,8 @@
       proto: CannonBall
       soundInsert:
         path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    - type: GunRequiresWield # Corvax-Frontier
+    - type: Wieldable # Corvax-Frontier
 
 - type: entity
   name: tether gun

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -65,6 +65,8 @@
     range: 8
     sound:
       path: /Audio/Ambience/Objects/drain.ogg
+  - type: Drink # Corvax-Frontier
+    delay: 4
 
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -65,6 +65,8 @@
   - type: ReagentTank
   - type: Transform
     noRot: true
+  - type: Drink # Corvax-Frontier
+    delay: 8
 
 # For highcap tanks
 - type: entity

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -22,6 +22,7 @@
         - MobLayer
   - type: Body
     prototype: Felinid
+  - type: OwOAccent # Corvax-Frontier
   - type: Damageable
     damageModifierSet: Felinid
   - type: SlowOnDamage

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
@@ -1,6 +1,29 @@
 - type: vendingMachineInventory
   id: ContraVendInventory
   startingInventory:
+    CigPackSyndicate: 8
+    Stimpack: 6
+    StimkitFilled: 4
+    SyndicateJawsOfLife: 4
+    ToolboxSyndicateFilled: 4
+    RadioJammer: 8
+    PowerSink: 2
+    BoxEncryptionKeySyndie: 8
+    AgentIDCard: 8
+    StealthBox: 6
+    ClothingMaskGasVoiceChameleon: 6
+    ClothingBackpackChameleonFill: 4
+    HypopenBox: 4
+    Emag: 2
+    StorageImplanter: 4
+    ClothingShoesBootsMagSyndie: 4
+    ClothingShoesChameleonNoSlips: 8
+    ClothingBackpackDuffelSyndicateEVABundle: 12
+    BoxHoloparasite: 2
+    VestineChemistryVial: 2
+    HoverbikeSyndicateFlatpack: 3
+    SpaceBladeContra: 1
+    BorgModuleWeapon: 3 # Corvax-Frontier
     CrateSyndicateSurplusBundle: 1
   emaggedInventory:
-    CrateSyndicateLightSurplusBundle: 1
+    CrateSyndicateLightSurplusBundle: 1
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -421,7 +421,7 @@
       whitelist:
         - Sheriff
 
-- type: listing
+- type: listing # Corvax-Frontier
   id: UplinkSecurityKS23
   name:  uplink-security-ks23-name
   description: uplink-security-ks23-desc
@@ -584,7 +584,7 @@
         tags:
           - SecurityUplink
 
-- type: listing
+- type: listing # Corvax-Frontier
   id: UplinkSecurityKS23Flashbang
   name: uplink-security-magazineks23flashbang-name
   description: uplink-security-magazineks23flashbang-desc
@@ -600,7 +600,7 @@
         tags:
           - SecurityUplink
 
-- type: listing
+- type: listing # Corvax-Frontier
   id: UplinkSecurityKS23Smoke
   name: uplink-security-magazineks23smoke-name
   description: uplink-security-magazineks23smoke-desc
@@ -1362,3 +1362,24 @@
     - !type:BuyerJobCondition
       whitelist:
         - Sheriff
+
+- type: listing # Corvax-Frontier
+  id: UplinkSecurityResearchDisk10000
+  name:  uplink-security-research-disk-10000-name
+  description: uplink-security-research-disk-10000-desc
+  productEntity: ResearchDisk10000
+  icon: { sprite: Objects/Specific/Research/researchdisk.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 5
+  categories:
+    - UplinkSecurityUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff
diff --git a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/holy.png b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/holy.png
diff --git a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json
@@ -1,38 +1,41 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2",
+  "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, Holy fox created by FireFoxPhoenix",
   "size": {
     "x": 32,
     "y": 32
   },
-    "states": [
-        {
-            "name": "black"
-        },
-        {
-            "name": "blue"
-        },
-        {
-            "name": "coffee"
-        },
-        {
-            "name": "crimson"
-        },
-        {
-            "name": "marble"
-        },
-        {
-            "name": "orange"
-        },
-        {
-            "name": "pink"
-        },
-        {
-            "name": "purple"
-        },
-        {
-            "name": "red"
-        }
-    ]
-}
+  "states": [
+    {
+      "name": "black"
+    },
+    {
+      "name": "blue"
+    },
+    {
+      "name": "coffee"
+    },
+    {
+      "name": "crimson"
+    },
+    {
+      "name": "marble"
+    },
+    {
+      "name": "orange"
+    },
+    {
+      "name": "pink"
+    },
+    {
+      "name": "purple"
+    },
+    {
+      "name": "red"
+    },
+    {
+      "name": "holy"
+    }
+  ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-HolyPlushieOrangeFox = священная лиса
		.desc = Милая плюшевая лиса. Хм.. этот нимб..