diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 111bc041d23..639c993800c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -330,6 +330,7 @@ - id: RifleStock - id: ModularReceiver - id: HydroponicsToolScythe + - id: BoxSmallFancyDerringer #DEN # Rare Group - !type:GroupSelector weight: 5 @@ -358,6 +359,7 @@ - id: ClothingHandsKnuckleDusters - !type:NestedSelector tableId: AllToyWeaponsTable + - id: BoxSmallFancyDerringer #DEN - type: entity name: Maint Loot Spawner diff --git a/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 00000000000..dd542abb460 --- /dev/null +++ b/Resources/Prototypes/_DEN/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: 2026 GWDYMT +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: ArmoryDerringer + icon: + sprite: _DEN/Objects/Weapons/Guns/Pistols/derringer.rsi + state: icon + product: CrateArmoryDerringer + cost: 1400 + category: cargoproduct-category-name-armory + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_DEN/Catalog/Fills/Crates/weapons.yml b/Resources/Prototypes/_DEN/Catalog/Fills/Crates/weapons.yml new file mode 100644 index 00000000000..9cd130dc92f --- /dev/null +++ b/Resources/Prototypes/_DEN/Catalog/Fills/Crates/weapons.yml @@ -0,0 +1,16 @@ +# SPDX-FileCopyrightText: 2026 GWDYMT +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateArmoryDerringer + parent: [ CrateWeaponSecure, BaseSecurityContraband ] + name: steel derringer giftbox crate + description: Contains two steel derringer giftboxes. Requires Armory access to open. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: BoxSmallFancyDerringer + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Storage/fancy_box.yml b/Resources/Prototypes/_DEN/Entities/Objects/Storage/fancy_box.yml new file mode 100644 index 00000000000..75f14c55fbf --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Objects/Storage/fancy_box.yml @@ -0,0 +1,49 @@ +# SPDX-FileCopyrightText: 2026 GWDYMT +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: BoxSmallFancy + parent: BaseStorageItem + abstract: true + components: + - type: Sprite + sprite: _DEN/Objects/Storage/fancy_box.rsi + noRot: true + state: icon + - type: Item + sprite: _DEN/Objects/Storage/fancy_box.rsi + size: Normal + shape: + - 0,0,1,1 + - type: Storage + maxItemSize: Small + grid: + - 0,0,1,1 + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: PhysicalComposition + materialComposition: + Wood: 100 + - type: StaticPrice + price: 100 + +- type: entity + id: BoxSmallFancyDerringer + parent: BoxSmallFancy + name: steel derringer giftbox + description: More than two hundred years ago, a now-defunct weapon manufacturing upstart attempted to flood the civilian market with cheap pistols and almost succeeded. It has since become tradition for gun enthusiasts to gift one of them to newcomers as a lesson on why cheap doesn't mean good. + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: FillBoxDerringer + +- type: entityTable + id: FillBoxDerringer + table: !type:AllSelector + children: + - id: WeaponPistolDerringer + - id: CartridgePistol + - id: CartridgePistol \ No newline at end of file diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Pistols/pistols.yml new file mode 100644 index 00000000000..b787bc7550c --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -0,0 +1,48 @@ +#DEN + +- type: entity + name: steel derringer + parent: [ BaseItem, BaseSecurityContraband ] + id: WeaponPistolDerringer + description: A tiny two-barrelled handgun that was the favorite of aristocrats and pickpockets for about a century. Uses .35 auto ammo. + components: + - type: Sprite + sprite: _DEN/Objects/Weapons/Guns/Pistols/derringer.rsi + layers: + - state: icon + - type: Item + size: Small + - type: Tag + tags: + - Sidearm + - type: Clothing + quickEquip: false + slots: + - Belt + - type: Gun + minAngle: 10 + maxAngle: 15 + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgePistol + capacity: 2 + proto: null + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + fillDelay: 2 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + - type: Appearance + - type: StaticPrice + price: 250 + - type: Execution + - type: AmmoCounter diff --git a/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/icon.png b/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/icon.png new file mode 100644 index 00000000000..3eb8d883444 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/icon.png differ diff --git a/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/meta.json b/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/meta.json new file mode 100644 index 00000000000..7de12b44ecf --- /dev/null +++ b/Resources/Textures/_DEN/Objects/Storage/fancy_box.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by Gawdayumeet", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/icon.png b/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/icon.png new file mode 100644 index 00000000000..9c93afb8380 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/icon.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/meta.json b/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/meta.json new file mode 100644 index 00000000000..7de12b44ecf --- /dev/null +++ b/Resources/Textures/_DEN/Objects/Weapons/Guns/Pistols/derringer.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Sprites by Gawdayumeet", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +}