Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/TheDenSS14/TheDen
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepyyapril committed Jan 22, 2025
2 parents fcbdb2e + 2b84b81 commit 750a62f
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Resources/Changelog/Den.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1424,3 +1424,13 @@ Entries:
id: 119
time: '2025-01-22T08:12:05.0000000+00:00'
url: https://github.com/TheDenSS14/TheDen/pull/185
- author: Rosycup
changes:
- type: Add
message: >-
Added the Soul-Shatter, a unique double barrel shotgun issued to
Mantises intended for use in Code White scenarios against hostile
psionics.
id: 120
time: '2025-01-22T23:19:43.0000000+00:00'
url: https://github.com/TheDenSS14/TheDen/pull/187
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
staminaCost: 6

- type: entity
name: sawn-off shogun
name: sawn-off shotgun
parent: WeaponShotgunSawn
id: WeaponShotgunSawnEmpty
description: Groovy! Uses .50 shotgun shells.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- id: FlashlightLantern # DeltaV - To replace their lost flashlight
- id: BoxZiptie # DeltaV - Give the mantis some zipties
- id: WeaponPistolPsiBreaker # DeltaV - Mantis mindbreaker pistol, see Resources/Prototypes/DeltaV/Entities?Objects/Weapons/Guns/Pistols/pistols.yml
- id: WeaponShotgunSoulshatter # TheDen - Mantis emergency soulbreaker shotgun
# Spare change of clothes
# - id: ClothingUniformJumpsuitMantis
# - id: ClothingUniformSkirtMantis
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: entity
name: soul-shatter
parent: BaseWeaponShotgun
id: WeaponShotgunSoulshatter
description: A flashy, pocket-sized shotgun with a marble style grip. Provides no tactical advantage. Uses .50 shotgun shells.
components:
- type: Sprite
sprite: _DEN/Objects/Weapons/Guns/Shotguns/soulshatter.rsi
- type: Clothing
sprite: _DEN/Objects/Weapons/Guns/Shotguns/soulshatter.rsi
slots:
- Back
- suitStorage
- type: Item
size: Small
- type: Gun
fireRate: 4
fireOnDropChance: 0.5
- type: BallisticAmmoProvider
capacity: 2
proto: null
- type: MeleeWeapon
attackRate: 1.2
damage:
types:
Blunt: 7.5
- type: DamageOtherOnHit
staminaCost: 6
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi backpack sprite by Peptide, sprite modification by Jaсkal 298, Modified by Rosycup for The Den",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}

0 comments on commit 750a62f

Please sign in to comment.