Properly removes the vibro khopesh, reenables felinids and fog born (renamed to fit lore) and a new crusier for DSM

.gitignore

@@ -310,3 +310,4 @@ Resources/MapImages
 # Changelog package lock
 package-lock.json
 Resources/.vscode/settings.json
+

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/fullsize.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 45 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -169,7 +169,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 45 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -282,7 +282,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -396,7 +396,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -481,7 +481,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/intermediary.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -175,7 +175,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -292,7 +292,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -379,7 +379,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/large.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 50 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -114,7 +114,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 50 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/magnum.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -114,7 +114,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -260,7 +260,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/misc.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 25 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/pistol.yml

@@ -27,7 +27,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 18 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -143,7 +143,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 15 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -288,7 +288,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 20 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -404,7 +404,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 18 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -520,7 +520,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 15 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Ammunition/New_Ammo/shotgun.yml

@@ -12,7 +12,7 @@
     - Cartridge
     - CrescentCartridge_185Ga
   - type: CartridgeAmmo
-    proto: CrescentBullet_185Ga
+    proto: Crescent185gaPelletShotgunSpread
   - type: Sprite
     sprite: _Crescent/Objects/Weapons/Ammunition/New_Ammo/Casings/18.5Ga.rsi
     layers:
@@ -28,7 +28,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 10 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 
@@ -95,7 +95,7 @@
     zeroVisible: false
 
 - type: entity
-  id: CrescentBoxMagazine185Ga
+  id: CrescentBoxMagazine_185Ga
   name: "20-round magazine (18.5Ga)"
   parent: CrescentBaseMagazine
   abstract: False
@@ -183,7 +183,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 1000 # i just hit the juckport
+        Piercing: 12 # i just hit the juckport
     harmorPenetration: 30
     stoppingPower: 4
 

Resources/Prototypes/_Crescent/Entities/Objects/Weapons/NEW GUNS/CDT/lmgs.yml

@@ -0,0 +1,58 @@
+- type: entity
+  name: CDT L60 7.62x51mm
+  parent: [BaseWeaponRifle, StreeCredRedeemable]
+  id: CrescentWeaponLMGL60
+  description: l60 alcor top 10 tuff names
+  components:
+  - type: Item
+    shape:
+    - 0,0,4,1
+  - type: Sprite
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/LMG/L60.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/LMG/L60.rsi
+  - type: Gun
+    fireRate: 6
+    soundGunshot:
+      collection: Lmg_1_Gunshots
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: CrescentBoxMagazine_762x51
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - CrescentBoxMagazine_762x51
+      gun_chamber:
+        name: Chamber
+        startingItem: CrescentCartridge_762x51
+        priority: 1
+        whitelist:
+          tags:
+            - CrescentCartridge_762x51
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 3000
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/_Crescent/Weapons/Guns/conscript/rack.ogg
+    soundBoltOpened:
+      path: /Audio/_Crescent/Weapons/Guns/conscript/bolt_open.ogg
+    soundBoltClosed:
+      path: /Audio/_Crescent/Weapons/Guns/conscript/bolt_close.ogg

Resources/Prototypes/_Crescent/Entities/Objects/Weapons/NEW GUNS/CDT/rifles.yml

@@ -0,0 +1,57 @@
+- type: entity
+  name: CDT C-2001 5.56x45mm
+  parent: [BaseWeaponRifle, StreeCredRedeemable]
+  id: CrescentWeaponRifleTypeC2001
+  description: The C-2001 is Cyberdawn Technology's anwser to the Type-518, and is one of their best sellers as of yet. A simple core, with an enormously overengineered polymer frame wrapped around it, the C-2001 was designed with ergonomics above all else, and it shows. Sporting a slightly lower firerate to stop the polymer from melting, the C-2001 is a solid rifle, if you can afford the steep cost.
+  components:
+  - type: Item
+    shape:
+    - 0,0,4,1
+  - type: Sprite
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/RIFLE/C-2001.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/RIFLE/C-2001.rsi
+  - type: Gun
+    fireRate: 6
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    shotsPerBurst: 2
+    burstFireRate: 10
+    burstCooldown: 0.5
+    soundGunshot:
+      collection: M16_Gunshots
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: CrescentMagazine_556x45
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - CrescentMagazine_556x45
+      gun_chamber:
+        name: Chamber
+        startingItem: CrescentCartridge_556x45
+        priority: 1
+        whitelist:
+          tags:
+            - CrescentCartridge_556x45
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 3000

Resources/Prototypes/_Crescent/Entities/Objects/Weapons/NEW GUNS/CDT/shotguns.yml

@@ -0,0 +1,30 @@
+- type: entity
+  name: CDT CBGG-L 12ga
+  parent: [BaseWeaponShotgun, BaseGunWieldable, StreeCredRedeemable]
+  id: CrescentWeaponShotgunCBGG-L
+  description: what a silly gun
+  components:
+  - type: Sprite
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/SHOTGUN/CBGG-L.rsi
+  - type: Clothing
+    sprite: _Crescent/Objects/Weapons/Guns/New_Guns/SHOTGUN/CBGG-L.rsi
+  - type: GunRequiresWield
+  - type: Item
+    shape:
+    - 0,0,3,1
+  - type: Gun
+    shotgunSpreadMultiplier: 1.25
+    fireRate: 3
+    soundGunshot:
+      collection: Shotgun_2_Gunshots
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CrescentCartridge_12Ga
+    capacity: 8
+    autoCycle: false
+    proto: CrescentCartridge_12Ga
+  - type: ItemSlots