Merge pull request #651 from Ratyyy/mechs

радость ГМов + перенос шприцемета к мехам + пару текстур
AdventureTimeSS14 · Apr 27, 2024 · 5a1785a · 5a1785a
2 parents 0cb6160 + afddba2
commit 5a1785a
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 70 deletions.
diff --git a/Resources/Audio/Mecha/mecha_drill.ogg b/Resources/Audio/Mecha/mecha_drill.ogg
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -24,6 +24,6 @@ ent-WeaponSubMachineGunWt550 = WT550
 ent-SyringeGun = шприцевый пистолет
     .desc = Пистолет-шприцемет, разработанный организацией Синдиката. Использует шприцевые картриджи.
     .suffix = Медицинский пистолет
-ent-DnaSyringeGun = шприцемет
-    .desc = Однозарядный шприцемет, предоставляемый НТ специально для медиков. Использует шприцевые картриджи
+ent-DnaSyringeGun = навесной шприцемет
+    .desc = Многозарядный шприцемет, предоставляемый НТ специально для экзоскелета "Одиссей". Использует шприцевые картриджи
     .suffix = Медицинский пистолет
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/dart.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/dart.yml
@@ -43,40 +43,3 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
-
-- type: entity
-  name: Syringe gun
-  parent: BaseWeaponSubMachineGun
-  id: DnaSyringeGun
-  description: Syringe gun provided by NT specifically for medics. Can store two cartridges. Uses syringe cartridges
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/dnasyringegun.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: mag-0
-        map: ["enum.GunVisualLayers.Mag"]
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/SMGs/dnasyringegun.rsi
-  - type: Gun
-    fireRate: 2
-    selectedMode: FullAuto
-    availableModes:
-    - FullAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/syringeproj.ogg
-  - type: ItemSlots
-    slots:
-      gun_chamber:
-        name: Chamber
-        startingItem: Syringecartridge
-        priority: 1
-        whitelist:
-          tags:
-            - Syringecartridge
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: true
-  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: AmbientSoundSourceFlies
-  noSpawn: true
   components:
   - type: AmbientSound
     volume: -5

diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: EffectFlashBluespace
-  noSpawn: true
   components:
   - type: PointLight
     radius: 10.5
@@ -9,5 +8,5 @@
   - type: TimedDespawn
     lifetime: 1
   - type: EmitSoundOnSpawn
-    sound: 
-      path: /Audio/Effects/Lightning/lightningbolt.ogg
+    sound:
+      path: /Audio/Effects/Lightning/lightningbolt.ogg
diff --git a/Resources/Prototypes/Entities/Effects/emp_effects.yml b/Resources/Prototypes/Entities/Effects/emp_effects.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: EffectEmpPulse
-  noSpawn: true
   components:
   - type: TimedDespawn
     lifetime: 0.8
@@ -17,7 +16,7 @@
     tags:
       - HideContextMenu
   - type: EmitSoundOnSpawn
-    sound: 
+    sound:
       path: /Audio/Effects/Lightning/lightningbolt.ogg
   - type: AnimationPlayer
 

diff --git a/Resources/Prototypes/Entities/Effects/exclamation.yml b/Resources/Prototypes/Entities/Effects/exclamation.yml
@@ -1,7 +1,6 @@
 - type: entity
   id: Exclamation
   name: exclamation
-  noSpawn: true
   save: false
   components:
     - type: Transform
@@ -17,12 +16,11 @@
     - type: Tag
       tags:
         - HideContextMenu
-        
-        
+
+
 - type: entity
   id: WhistleExclamation
   name: exclamation
-  noSpawn: true
   components:
     - type: Sprite
       sprite: Structures/Storage/closet.rsi
@@ -36,4 +34,4 @@
       lifetime: 0.8
     - type: Tag
       tags:
-        - HideContextMenu
+        - HideContextMenu
diff --git a/Resources/Prototypes/Entities/Effects/explosion_light.yml b/Resources/Prototypes/Entities/Effects/explosion_light.yml
@@ -1,5 +1,4 @@
 - type: entity
-  noSpawn: true
   id: ExplosionLight
   name: explosion light
   components:

diff --git a/Resources/Prototypes/Entities/Effects/hearts.yml b/Resources/Prototypes/Entities/Effects/hearts.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: EffectHearts
-  noSpawn: true
   components:
   - type: TimedDespawn
     lifetime: 0.85
@@ -13,4 +12,4 @@
   - type: Tag
     tags:
       - HideContextMenu
-  - type: AnimationPlayer
+  - type: AnimationPlayer
diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml
@@ -33,7 +33,6 @@
   name: lightning
   id: Lightning
   parent: BaseLightning
-  noSpawn: true
   components:
     - type: Lightning
       canArc: true
@@ -112,7 +111,6 @@
   name: supercharged lightning
   id: SuperchargedLightning
   parent: ChargedLightning
-  noSpawn: true
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi

diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: EffectSparks
-  noSpawn: true
   components:
   - type: TimedDespawn
     lifetime: 0.5
@@ -23,7 +22,6 @@
 
 - type: entity
   id: EffectTeslaSparks
-  noSpawn: true
   components:
   - type: TimedDespawn
     lifetime: 0.5

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -337,7 +337,6 @@
       - ClothingEyesHudSecurity #Sirena T4 add
       - ADTClothingEyesHudAdvanced #Sirena T4 add
       - ADTPowerCellHyper
-      - DnaSyringeGun
       - LedLightTubeViolet
       - LedLightTubeYellow
       - LedLightTubeBlue

diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -12,17 +12,6 @@
   materials:
     Glass: 200
 
-- type: latheRecipe
-  id: DnaSyringeGun
-  result: DnaSyringeGun
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 350
-    Glass: 200
-    Plasma: 100
-    Silver: 100
-
 - type: latheRecipe
   id: Syringecartridge
   result: Syringecartridge

diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml
@@ -99,7 +99,6 @@
   recipeUnlocks:
   - ChemMasterMachineCircuitboard
   - ChemDispenserMachineCircuitboard
-  - DnaSyringeGun
   - Syringecartridge
   - BorgModuleAdvancedTreatment
   technologyPrerequisites:

diff --git a/...rces/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_diamond_drill.png b/...rces/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_diamond_drill.png
diff --git a/...urces/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_humanstealer.png b/...urces/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_humanstealer.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json
@@ -150,6 +150,9 @@
     },
     {
       "name": "mecha_kineticgun"
+    },
+    {
+      "name": "mecha_humanstealer"
     }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,9 @@ @@
         },
         {
           "name": "mecha_kineticgun"
+        },
+        {
+          "name": "mecha_humanstealer"
         }
       ]
     }