dq-update (#2257)

Resources/Audio/SS220/Weapons/Guns/Gunshots/attributions.yml

@@ -1,4 +1,4 @@
-- files: ["nar_shot.ogg", "plasma_mlg.ogg", "plasma_mlg_load.ogg", "pkt_shot.ogg"]
+- files: ["nar_shot.ogg", "plasma_mlg.ogg", "plasma_mlg_load.ogg", "pkt_shot.ogg", "rifle.ogg", "hidg_rifle.ogg"]
   license: "Custom"
   copyright: "Made by MIXnikita for SS220. Licensed under EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt"
   source: "https://github.com/SerbiaStrong-220/space-station-14"

Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pinpointer.ftl

@@ -0,0 +1,3 @@
+ent-PinpointerNuclearBomb = пинпоинтер ядерной боеголовки
+    .desc = { ent-PinpointerBase.desc }
+    .suffix = Ядерная боеголовка, Эскадрон смерти, dq

Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml

@@ -112,6 +112,7 @@
         - id: ToolDebug
         - id: WelderExperimental
         - id: PinpointerNuclear
+        - id: PinpointerNuclearBomb
         - id: EmergencyMedipenDQ
           amount: 2
 
@@ -136,5 +137,6 @@
         - id: ToolDebug
         - id: WelderExperimental
         - id: PinpointerNuclear
+        - id: PinpointerNuclearBomb
         - id: EmergencyMedipenDQ
           amount: 6

Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -78,6 +78,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.0
   - type: TemperatureProtection
     heatingCoefficient: 0.001
     coolingCoefficient: 0.001

Resources/Prototypes/SS220/Entities/Objects/Devices/pinpointer.yml

@@ -0,0 +1,22 @@
+- type: entity
+  parent: PinpointerBase
+  id: PinpointerNuclearBomb
+  name: nuclear bomb pinpointer
+  description: A handheld tracking device that leads to the direction of any nearby station.
+  suffix: Nuclear Bomb, dq, Death Squad
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Devices/pinpointer.rsi
+    layers:
+    - state: pinpointer-nuclear
+      map: ["enum.PinpointerLayers.Base"]
+    - state: pinonnull
+      map: ["enum.PinpointerLayers.Screen"]
+      shader: unshaded
+      visible: false
+  - type: Icon
+    sprite: SS220/Objects/Devices/pinpointer.rsi
+    state: pinpointer-nuclear
+  - type: Pinpointer
+    component: Nuke
+    targetName: ядерная боеголовка

Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -30,10 +30,11 @@
     - proto: Pulsekill
       name: firemode-name-kill
       fireCost: 1
+      soundGunshot:  /Audio/SS220/Weapons/Guns/Gunshots/rifle.ogg
     - proto: PulseDESTROY
       name: firemode-name-destroy
       fireCost: 5
-      soundGunshot:  /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+      soundGunshot:  /Audio/SS220/Weapons/Guns/Gunshots/rifle.ogg
 
 - type: entity
   name: pulse shotgun
@@ -47,7 +48,7 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
-    - state: mag-unshaded-4
+    - state: pulse-mag-unshaded-4
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Clothing
@@ -63,10 +64,10 @@
     - proto: BulletLaserDestroy
       name: firemode-name-kill
       fireCost: 10
-      soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg
-      magState: mag
+      soundGunshot: /Audio/SS220/Weapons/Guns/Gunshots/hidg_rifle.ogg
+      magState: pulse-mag
     - proto: BulletLaserHeal
       name: firemode-name-heal
       fireCost: 17.5
-      soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+      soundGunshot: /Audio/SS220/Weapons/Guns/Gunshots/hidg_rifle.ogg
       magState: heal-mag

Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -180,13 +180,18 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
-    impactEffect: BulletImpactEffectOrangeDisabler
+    impactEffect: BulletImpactEffectBlue
     damage:
       types:
         Heat: 44
         Structural: 800
+  - type: Sprite
+    sprite: SS220/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: pulseheavylaser
+      shader: unshaded
   - type: ProjectileSpread
-    proto: BulletLaser
+    proto: BulletLaserDestroy
     count: 5
     spread: 15
 
@@ -201,7 +206,7 @@
     layers:
       - state: greenlaser
   - type: Projectile
-    impactEffect: BulletImpactEffectGreenDisabler
+    impactEffect: BulletImpactEffectGreen
     damage:
       types:
         Blunt: -10
@@ -217,7 +222,7 @@
     spread: 10
 
 - type: entity
-  id: BulletImpactEffectGreenDisabler
+  id: BulletImpactEffectGreen
   categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
@@ -234,3 +239,22 @@
   - type: Tag
     tags:
     - HideContextMenu
+
+- type: entity
+  id: BulletImpactEffectBlue
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TimedDespawn
+    lifetime: 0.2
+  - type: Sprite
+    drawdepth: Effects
+    layers:
+    - shader: unshaded
+      map: ["enum.EffectLayers.Unshaded"]
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+      state: impact_laser_greyscale
+      color: blue
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+    - HideContextMenu

Resources/Prototypes/SS220/ai_factions.yml

@@ -4,6 +4,7 @@
   id: BloodCult
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - Syndicate
   - Passive
   - PetsNT
@@ -17,6 +18,7 @@
   id: Revolutionary
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - Zombie
   - SimpleHostile
   - Dragon
@@ -35,6 +37,7 @@
   id: SpiderQueen
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - Syndicate
   - Passive
   - Zombie
@@ -48,6 +51,7 @@
   id: SpiderHostile
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - Syndicate
   - Passive
   - PetsNT

Resources/Prototypes/ai_factions.yml

@@ -2,6 +2,7 @@
   id: Dragon
   hostile:
     - NanoTrasen
+    - DeathSquad #SS220 dq update
     - Syndicate
     - Xeno
     - PetsNT
@@ -54,6 +55,7 @@
   id: Syndicate
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - SimpleHostile
   - Xeno
   - PetsNT
@@ -64,6 +66,7 @@
   id: Xeno
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - Syndicate
   - Passive
   - PetsNT
@@ -75,6 +78,7 @@
   id: Zombie
   hostile:
   - NanoTrasen
+  - DeathSquad #SS220 dq update
   - SimpleNeutral
   - SimpleHostile
   - Syndicate

Resources/Textures/SS220/Objects/Devices/pinpointer.rsi/meta.json

@@ -0,0 +1,142 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9a7ceec10b463ca05ca29cbc418ea767b2ab2995, and modifed by EstKemran (Github) for SS220, pinpointer-nuclear state sprited by Estkemran (Github) for SS220",
+    "states": [
+        {
+            "name": "pinonalert",
+            "directions": 8,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonalertdirect",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonalertnull",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonclose",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinondirect",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinondirectlarge",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinondirectsmall",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinondirectxtrlarge",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonfar",
+            "delays": [
+                [
+                    0.6,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonmedium",
+            "delays": [
+                [
+                    0.4,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinonnull",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "pinpointer-nuclear"
+        }
+    ]
+}

Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac, modified by Estkemran (Github) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pulseheavylaser"
+    }
+  ]
+}

Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json

@@ -14,16 +14,16 @@
             "name": "base"
         },
         {
-            "name": "mag-unshaded-1"
+            "name": "pulse-mag-unshaded-1"
         },
         {
-            "name": "mag-unshaded-2"
+            "name": "pulse-mag-unshaded-2"
         },
         {
-            "name": "mag-unshaded-3"
+            "name": "pulse-mag-unshaded-3"
         },
         {
-            "name": "mag-unshaded-4"
+            "name": "pulse-mag-unshaded-4"
         },
         {
             "name": "heal-mag-unshaded-1"