diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f453b087c65..ec8e49b0fb3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4067,3 +4067,15 @@ Entries: message: Added a full suite of clothing for the station representative. id: 4916 time: '2024-04-17T22:04:59.0000000+00:00' +- author: Kesiath + changes: + - type: Tweak + message: Nerfed bluespace bags to only 4 additional bag columns. + id: 4917 + time: '2024-04-18T20:49:44.0000000+00:00' +- author: Leander + changes: + - type: Add + message: NFSD now has access to breaching charges. + id: 4918 + time: '2024-04-18T21:59:45.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 8286f52cb3f..76d1cdae2c2 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -114,7 +114,7 @@ uplink-security-shotslug-name = Lethal Shotgun Slug Shells uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells. uplink-security-cash1000-name = 1000 Spesos uplink-security-cash1000-desc = Cold, hard cash. -uplink-security-empgrenade-box-name = EMP Grenades +uplink-security-empgrenade-box-name = EMP Grenade Box uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades. uplink-security-explosivegrenade-box-name = Explosive Grenade Box uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades. @@ -130,3 +130,5 @@ uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades. uplink-security-stingergrenade-box-name = Stinger Grenade Box uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades. +uplink-security-breachingcharge-box-name = Breaching Charge Box +uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml new file mode 100644 index 00000000000..7eb8e8d9a2a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml @@ -0,0 +1,28 @@ +- type: entity + name: breaching charge + description: A breaching explosive for security officers to break through walls. + parent: SeismicCharge + id: BreachingCharge + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Bombs/breaching.rsi + state: icon + layers: + - state: icon + map: ["base"] + - type: OnUseTimerTrigger + delay: 10 + delayOptions: [10, 15, 20, 25] + initialBeepDelay: 0 + beepSound: + path: /Audio/Effects/Cargo/buzz_two.ogg + params: + volume: -6 + startOnStick: true + canToggleStartOnStick: true + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 10 + intensitySlope: 10 + maxIntensity: 10 + canCreateVacuum: false diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 3c64db1d59b..678e6d7f7fb 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -270,7 +270,7 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 - type: entity parent: ClothingBackpackClown diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 9ea33646cd8..8e0e7ec203e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -236,7 +236,7 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 - type: ClothingSpeedModifier sprintModifier: 1 # makes its stats identical to other variants of bag of holding - type: HeldSpeedModifier diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index f598759056a..d1ae6d13a0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -177,4 +177,4 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml index 20805719d05..8a426cbe462 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml @@ -2,7 +2,7 @@ - type: entity name: box of nfsd items parent: BoxCardboard - id: BoxBundleNFSD + id: BoxBundleNfsd description: A box full of nfsd items. components: - type: Sprite @@ -11,7 +11,7 @@ - type: entity name: box of explosive grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxExplosiveGrenades description: A box full of explosive grenades. components: @@ -22,7 +22,7 @@ - type: entity name: box of incendiary grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxIncendiaryGrenades description: A box full of incendiary grenades. components: @@ -33,7 +33,7 @@ - type: entity name: box of shrapnel grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxShrapnelGrenades description: A box full of shrapnel grenades. components: @@ -44,7 +44,7 @@ - type: entity name: box of smoke grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxSmokeGrenades description: A box full of smoke grenades. components: @@ -55,7 +55,7 @@ - type: entity name: box of tear gas grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxTeargasGrenades description: A box full of tear gas grenades. components: @@ -65,8 +65,7 @@ amount: 4 - type: entity - name: box of EMP grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxEMPGrenades description: A box full of EMP grenades. components: @@ -77,7 +76,7 @@ - type: entity name: box of flashbang grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxFlashBangGrenades description: A box full of flashbang grenades. components: @@ -88,7 +87,7 @@ - type: entity name: box of stinger grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxStingerGrenades description: A box full of stinger grenades. components: @@ -96,3 +95,15 @@ contents: - id: GrenadeStinger amount: 4 + +## plastic explosives +- type: entity + name: box of breaching charges grenades + parent: BoxBundleNfsd + id: BoxBreachingCharges + description: A box full of breaching charges. + components: + - type: StorageFill + contents: + - id: BreachingCharge + amount: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 8eafc183a1a..8f04e43cb69 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -79,9 +79,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHardsuitSyndieReverseEngineered @@ -100,9 +100,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHardsuitSheriff @@ -121,7 +121,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityMK58 @@ -236,9 +236,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnforcer @@ -257,9 +257,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityLecter @@ -278,9 +278,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityLaserCarbine @@ -299,9 +299,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityDisablerSMG @@ -320,9 +320,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnergySword @@ -341,7 +341,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityWT550 @@ -360,7 +360,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnergyGun @@ -379,7 +379,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEmpRpg @@ -398,7 +398,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing @@ -466,7 +466,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityKey @@ -485,7 +485,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEmpRocket @@ -504,7 +504,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityThrusterKit @@ -523,9 +523,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPistolMagazine @@ -560,9 +560,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityWT550Magazine @@ -581,7 +581,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHypo @@ -601,7 +601,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityAmbuzol @@ -621,7 +621,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityMedkit @@ -641,7 +641,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityInspector @@ -724,9 +724,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPulsePistol @@ -745,9 +745,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPulseCarbine @@ -766,7 +766,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHammer @@ -785,9 +785,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityTeleShield @@ -822,9 +822,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySwat @@ -843,9 +843,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySpeedloader @@ -976,9 +976,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityExplosiveGrenadeBox @@ -997,9 +997,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityIncendiaryGrenadeBox @@ -1018,9 +1018,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityShrapnelGrenadeBox @@ -1039,9 +1039,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySmokeGrenadeBox @@ -1106,3 +1106,24 @@ whitelist: tags: - SecurityUplink + +- type: listing + id: UplinkSecurityBreachingChargesBox + name: uplink-security-breachingcharge-box-name + description: uplink-security-breachingcharge-box-desc + productEntity: BoxBreachingCharges + icon: { sprite: DeltaV/Objects/Weapons/Bombs/breaching.rsi, state: icon} + cost: + FrontierUplinkCoin: 3 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Bailiff + - SeniorOfficer + - Sheriff \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/canister.yml b/Resources/Prototypes/_NF/Shipyard/canister.yml index 54834af7380..73c404e8fc6 100644 --- a/Resources/Prototypes/_NF/Shipyard/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/canister.yml @@ -27,4 +27,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: {} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png new file mode 100644 index 00000000000..5bd58663b6e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-left.png new file mode 100644 index 00000000000..4ea978c6992 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-right.png new file mode 100644 index 00000000000..2b675ecabf5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json new file mode 100644 index 00000000000..678ffd9abd5 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json @@ -0,0 +1,31 @@ + { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by rosieposieeee (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png new file mode 100644 index 00000000000..135cc2d3492 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png differ