From 97f8a90e1800912f9c9f27574a129d274e3a7b56 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 22 Sep 2024 15:44:32 -0400 Subject: [PATCH] DONE --- .../Consoles/AtmosAlertsComputerSystem.cs | 4 +- .../Prototypes/Catalog/uplink_catalog.yml | 108 ++---------------- .../Weapons/Guns/Shotguns/shotguns.yml | 4 - .../Machines/Computers/computers.yml | 6 +- .../Head/Hardsuits/atmospherics.rsi/meta.json | 16 --- .../Head/Hardsuits/cybersun.rsi/meta.json | 8 -- .../Head/Hardsuits/deathsquad.rsi/meta.json | 8 -- .../Hardsuits/engineering-white.rsi/meta.json | 28 ++--- .../Head/Hardsuits/engineering.rsi/meta.json | 10 +- .../Head/Hardsuits/medical.rsi/meta.json | 20 +--- .../Clothing/Head/Hardsuits/rd.rsi/meta.json | 18 +-- .../Head/Hardsuits/salvage.rsi/meta.json | 18 +-- .../Head/Hardsuits/security-red.rsi/meta.json | 18 +-- .../Head/Hardsuits/security.rsi/meta.json | 18 +-- .../Head/Hardsuits/spatiohelm.rsi/meta.json | 16 --- .../Head/Hardsuits/wizard.rsi/meta.json | 18 +-- .../Clothing/Mask/gassecurity.rsi/meta.json | 4 - .../Clothing/Mask/sterile.rsi/meta.json | 4 - .../Textures/Clothing/Mask/swat.rsi/meta.json | 4 - .../Objects/Devices/jammer.rsi/jammer-on.png | Bin 537 -> 0 bytes .../Objects/Devices/jammer.rsi/meta.json | 26 +++-- 21 files changed, 74 insertions(+), 282 deletions(-) delete mode 100644 Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png diff --git a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs index 758fde88f13..5d040cd7b37 100644 --- a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs +++ b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs @@ -49,7 +49,7 @@ public override void Initialize() SubscribeLocalEvent(OnDeviceAnchorChanged); } - #region Event handling + #region Event handling private void OnConsoleInit(EntityUid uid, AtmosAlertsComputerComponent component, ComponentInit args) { @@ -197,7 +197,7 @@ public void UpdateUIState var focusAlarmData = GetFocusAlarmData(uid, GetEntity(component.FocusDevice), gridUid); // Set the UI state - _uiSystem.TrySetUiState(uid, AtmosAlertsComputerUiKey.Key, + _uiSystem.SetUiState(uid, AtmosAlertsComputerUiKey.Key, new AtmosAlertsComputerBoundInterfaceState(airAlarmStateData, fireAlarmStateData, focusAlarmData)); } diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ff087949109..2a99a1daa06 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -412,6 +412,7 @@ blacklist: components: - SurplusBundle + saleLimit: 1 - type: listing id: UplinkNocturineChemistryBottle @@ -422,6 +423,7 @@ Telecrystal: 6 categories: - UplinkChemicals + saleLimit: 1 - type: listing id: UplinkCombatMedkit @@ -432,6 +434,7 @@ Telecrystal: 5 categories: - UplinkChemicals + saleLimit: 1 - type: listing id: UplinkCombatMedipen @@ -442,6 +445,7 @@ Telecrystal: 4 categories: - UplinkChemicals + saleLimit: 1 - type: listing id: UplinkStimpack @@ -452,6 +456,7 @@ Telecrystal: 4 categories: - UplinkChemicals + saleLimit: 1 - type: listing id: UplinkStimkit @@ -462,6 +467,7 @@ Telecrystal: 12 categories: - UplinkChemicals + saleLimit: 1 - type: listing id: UplinkCigarettes @@ -491,6 +497,7 @@ blacklist: components: - SurplusBundle + saleLimit: 1 # Deception @@ -1013,25 +1020,6 @@ categories: - UplinkBundles -- type: listing - id: UplinkMedsBundle - name: uplink-meds-bundle-name - description: uplink-meds-bundle-desc - productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled - cost: - Telecrystal: 20 - categories: - - UplinkBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - saleLimit: 1 - type: listing id: UplinkSniperBundle @@ -1093,27 +1081,6 @@ - UplinkBundles saleLimit: 1 -- type: listing - id: UplinkZombieBundle - name: uplink-zombie-bundle-name - description: uplink-zombie-bundle-desc - icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio } - productEntity: ClothingBackpackDuffelZombieBundle - cost: - Telecrystal: 40 - categories: - - UplinkBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - saleLimit: 1 - - type: listing id: UplinkSurplusBundle name: uplink-surplus-bundle-name @@ -1629,67 +1596,6 @@ # categories: # - UplinkMisc -- type: listing - id: UplinkNocturineChemistryBottle - name: uplink-nocturine-chemistry-bottle-name - description: uplink-nocturine-chemistry-bottle-desc - productEntity: NocturineChemistryBottle - cost: - Telecrystal: 6 - categories: - - UplinkMisc - -- type: listing - id: UplinkCombatMedkit - name: uplink-combat-medkit-name - description: uplink-combat-medkit-desc - productEntity: MedkitCombatFilled - cost: - Telecrystal: 5 - categories: - - UplinkMisc - -- type: listing - id: UplinkCombatMedipen - name: uplink-combat-medipen-name - description: uplink-combat-medipen-desc - productEntity: CombatMedipen - cost: - Telecrystal: 4 - categories: - - UplinkMisc - -- type: listing - id: UplinkStimpack - name: uplink-stimpack-name - description: uplink-stimpack-desc - productEntity: Stimpack - cost: - Telecrystal: 4 - categories: - - UplinkMisc - -- type: listing - id: UplinkStimkit - name: uplink-stimkit-name - description: uplink-stimkit-desc - productEntity: StimkitFilled - cost: - Telecrystal: 12 - categories: - - UplinkMisc - saleLimit: 1 - -- type: listing - id: UplinkBribe - name: uplink-bribe-name - description: uplink-bribe-desc - productEntity: BriefcaseSyndieLobbyingBundleFilled - cost: - Telecrystal: 4 - categories: - - UplinkMisc - - type: listing id: UplinkMobCatMicrobomb name: uplink-mobcat-microbomb-name diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 2de5b3384c3..43b038b372c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -79,7 +79,6 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg fireOnDropChance: 0.3 - type: Wieldable - - type: GunRequiresWield - type: ItemSlots slots: gun_magazine: @@ -122,7 +121,6 @@ fireRate: 2 fireOnDropChance: 0.5 - type: Wieldable - - type: GunRequiresWield - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -186,7 +184,6 @@ tags: - WeaponShotgunKammerer - type: Wieldable - - type: GunRequiresWield - type: entity name: sawn-off shotgun @@ -272,7 +269,6 @@ - type: StaticPrice price: 0 - type: Wieldable - - type: GunRequiresWield - type: entity name: improvised shotgun diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index f41961b846f..0021b053214 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -24,7 +24,7 @@ False: { visible: false } computerLayerKeys: True: { visible: true, shader: unshaded } - False: { visible: true, shader: shaded } + False: { visible: true, shader: shaded } enum.AtmosAlertsComputerVisuals.ComputerLayerScreen: computerLayerScreen: 0: { state: alert-0 } @@ -38,8 +38,8 @@ key: enum.AtmosAlertsComputerUiKey.Key - type: UserInterface interfaces: - - key: enum.AtmosAlertsComputerUiKey.Key - type: AtmosAlertsComputerBoundUserInterface + enum.AtmosAlertsComputerUiKey.Key: + type: AtmosAlertsComputerBoundUserInterface - type: entity parent: BaseComputer diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 2ecbc29fc43..8236090f7a1 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -39,22 +39,6 @@ "name": "equipped-head-light-vox", "directions": 4 }, - { - "name": "inhand-left-light", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-right-unshaded", - "directions": 4 - }, - { - "name": "inhand-right-light", - "directions": 4 - }, { "name": "equipped-head-vulpkanin", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json index dc098b43a15..0c1323d3f01 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -14,14 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-HELMET-harpy", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index ccd1a53f49a..782ce631af8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -14,14 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-HELMET-vulpkanin", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 36143b57819..7dbf66ad67c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -18,34 +18,26 @@ "directions": 4 }, { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-vox", "directions": 4 - }, - { + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { "name": "on-equipped-HELMET-harpy", "directions": 4 }, diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 11c9d99353a..f20b167c368 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -22,15 +22,11 @@ "directions": 4 }, { - "name": "on-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET-vox", + "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index 5f0c7122b9f..7954c0611e6 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 - }, + "name": "on-equipped-HELMET", + "directions": 4 + }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index 489c77d0bd8..db7f740811d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index 5f0c7122b9f..051b7e25eaf 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index b325a87ab07..f7be4bb5d47 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index a29d8edca5e..24f2a06e376 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index a8fefc25ac5..29335fd904e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -40,22 +40,6 @@ "name": "equipped-head-light-vox", "directions": 4 }, - { - "name": "inhand-left-light", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-right-unshaded", - "directions": 4 - }, - { - "name": "inhand-right-light", - "directions": 4 - }, { "name": "equipped-head-vulpkanin", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index 72b8ad53dcb..b72a96092e7 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json @@ -14,15 +14,11 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 + "name": "on-equipped-HELMET", + "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET", "directions": 4 }, { @@ -30,12 +26,8 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 + "name": "off-equipped-HELMET-vox", + "directions": 4 }, { "name": "on-equipped-HELMET-vulpkanin", diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index caed1cc774c..a92fcef8bf8 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -41,10 +41,6 @@ { "name": "equipped-MASK-vulpkanin", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index cb56eff07f9..4115a8de19f 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json @@ -45,10 +45,6 @@ { "name": "up-equipped-MASK-vulpkanin", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json index 2ff6f1df1b9..9b8c7ad0809 100644 --- a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json @@ -33,10 +33,6 @@ { "name": "equipped-MASK-vulpkanin", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png deleted file mode 100644 index 987e571b263f8b1a1c863755865ddbb5f496cfbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)5+Iv#X1vlY<|@&)`S! zGYHPzoE%+>n}Z;fT1C;N2el0}Q3@%fXY$I0APU|k*E4W`NZ;KBdcT*;y(IqvD3%7$ z09*j=_8uLNr{FkGh7tf7(g67axH=ue-OUh=FBAd%B(^h{cy~x@fKquqZYM#c034n* z!`~*@_LQ=*muC{67pV_i0Lg5>E6RS~-bS#l^YCYo)Jw2y)}gm}$9BUqfcO-6lp26d zE~-rHK!^0@-UBj}Ux4JEuhlAe0JNyoLUiOf81H8Rbi#?)wrhBwI8I;JEOWTu=I|@du*GPpnNi_usHzD~4BO&i5aw0HVyJ$)hMLVSqVZIw3v{;<1(c z0}KK|7GhT+UzLz4$~^gX)U0nnsag(OTU2Tx`qdwBKX9B-6A17rpG%+&K>GvQACMsp bpd8=}cvi=k6xZ2A00000NkvXXu0mjfjHTr1 diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json index c5cc9f56d24..d837374a87f 100644 --- a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json @@ -1,23 +1,33 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/93d9c70530c7299ef0af96fe2178096b2a62e036/icons/obj/device.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/c65da5a49477413310c81c460ea4b243a9f864dd with minor edits.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "jammer" + "name": "jammer", + "directions": 1 }, { - "name": "jammer-on", - "delays": [ - [ - 0.8, - 0.2 - ] + "name": "jammer_high_charge", + "directions": 1 + }, + { + "name": "jammer_medium_charge", + "directions": 1 + }, + { + "name": "jammer_low_charge", + "directions": 1, + "delays": [ + [ + 0.3, + 0.3 ] + ] } ] }