[BOUNTY] Burgess Folding Shotgun #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

LukaSlade wants to merge 6 commits into ProjectOmu:master from LukaSlade:Burgess

Resources/Locale/en-US/_Omu/store/uplink-catalog.ftl

-Original file line number
+Diff line change
@@ Expand Up @@
     uplink-dislippler-name = Dislippler
     uplink-dislippler-desc = Standard-issue security disabler on Honk! Co. stations. Ultimate proof that God has abandoned us.
+    uplink-folding-shotgun-name = Folding Shotgun
+    uplink-folding-shotgun-desc = A 4 round capacity shotgun that can be folded up to conceal with ease. Stolen from the Quartermaster of a far away station. Chambered in 12 gauge shotgun shells.

Resources/Prototypes/Catalog/Fills/Crates/cargo.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -179,6 +179,9 @@ @@
         - id: WeaponSniperMosin
           prob: 0.01
           orGroup: Weapons
+        - id: WeaponShotgunFoldingBeanbag
+          prob: 0.05
+          orGroup: Weapons
         - id: WeaponMakeshiftLaser
           prob: 0.001
           orGroup: Weapons
@@ Expand Down @@

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -159,6 +159,9 @@ @@
         - id: CargoSaleComputerCircuitboard
         - id: CargoShuttleConsoleCircuitboard
         - id: SalvageMagnetMachineCircuitboard
+        # Commented incase I wanna bring it back
+        #- id: WeaponShotgunFoldingBeanbag # Omu
+        #- id: BoxBeanbag # Omu
         - id: CigPackGreen
           prob: 0.75
         - id: ClothingHeadsetAltCargo
@@ Expand Down @@

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -261,6 +261,8 @@ @@
         - id: ClothingShoesBootsCombatFilled
         - id: ToolboxSyndicateFilled
         - id: BalloonSyn
+        - id: WeaponShotgunFoldingBeanbag
+          weight: 2
         - id: WeaponSniperMosin
           weight: 2
         - id: ClothingHandsKnuckleDustersSyndicate
@@ Expand Down @@

Resources/Prototypes/Catalog/uplink_catalog.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -356,6 +356,15 @@ @@
       categories:
       - UplinkWeaponry
+      - type: listing
+      id: UplinkFoldingShotgun
+      name: uplink-folding-shotgun-name
+      description: uplink-folding-shotgun-desc
+      productEntity: WeaponShotgunFolding
+      cost:
+        Telecrystal: 25
+      categories:
+      - UplinkWeaponry
     - type: listing
       id: UplinkGrenadeLauncherBundle
@@ Expand Down @@

Resources/Prototypes/_Omu/Catalog/uplink_catalog.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,3 +24,12 @@ @@
         whitelist:
         - Clown
+    - type: listing
+      id: UplinkFoldingShotgun
+      name: uplink-folding-shotgun-name
+      description: uplink-folding-shotgun-desc
+      productEntity: WeaponShotgunFolding
+      cost:
+        Telecrystal: 20
+      categories:
+      - UplinkWeaponry

Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,85 @@ @@
       - type: Contraband
         allowedDepartments: [ CentralCommand ]
         severity: Restricted
+    - type: entity
+      name: folding shotgun
+      parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMajorContraband]
+      id: WeaponShotgunFolding
+      description: An abysmally outdated, but otherwise decently effective and compact shotgun. Chambered in 12 gauge shotgun shells.
+      components:
+      - type: Item
+        size: Normal
+        storedRotation: -45
+      - type: Sprite
+        sprite: _Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi
+        layers:
+        - state: bow-folded
+          map: [ "base" ]
+        - state: unwielded-arrow
+          color: "#FFFFFF"
+          visible: false
+          shader: unshaded
+          map: [ "bowstring" ]
+      - type: ToggleableVisuals
+        spriteLayer: bowstring
+        inhandVisuals:
+          left:
+          - state: inhand-left-bowstring
+            shader: unshaded
+            map: [ "left" ]
+          - state: wielded-inhand-left-bowstring
+            shader: unshaded
+            visible: false
+            map: [ "wielded-left" ]
+          right:
+          - state: inhand-right-bowstring
+            shader: unshaded
+            map: [ "right" ]
+          - state: wielded-inhand-right-bowstring
+            shader: unshaded
+            visible: false
+            map: [ "wielded-right" ]
+        clothingVisuals:
+          back:
+          - state: bowstring-equipped-BACKPACK
+            shader: unshaded
+          suitstorage:
+          - state: bowstring-equipped-BACKPACK
+            shader: unshaded
+      - type: GenericVisualizer
+        visuals:
+          enum.ToggleableVisuals.Enabled:
+            base:
+              True: { state: bow }
+              False: { state: bow-folded }
+      - type: Clothing
+        sprite: _Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi
+      - type: ToggleableLightWieldable
+      - type: GunRequiresWield
+      - type: Appearance
+      - type: Gun
+        fireRate: 0.8
+      - type: BallisticAmmoProvider
+        capacity: 4
+      - type: GunSpreadModifier
+        spread: 1.25
+      - type: ItemToggle
+        wieldToggle: false
+        soundActivate:
+          path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
+        soundDeactivate:
+          path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
+      - type: ItemToggleSize
+        activatedSize: Large
+        activatedShape:
+        - 0,0,0,4
+      - type: FoldingWeapon
+    - type: entity
+      parent: WeaponShotgunFolding
+      id: WeaponShotgunFoldingBeanbag
+      suffix: Non-Lethal
+      components:
+      - type: BallisticAmmoProvider
+        proto: ShellShotgunBeanbag

...es/Textures/_Omu/Objects/Weapons/Guns/Shotguns/hardlight_bow.rsi/bow - Copy.png

Sorry, something went wrong. Reload?