DONE

Simple-Station · Sep 22, 2024 · 97f8a90 · 97f8a90
1 parent f88a6e4
commit 97f8a90
Show file tree

Hide file tree

Showing 21 changed files with 74 additions and 282 deletions.
diff --git a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
@@ -49,7 +49,7 @@ public override void Initialize()
         SubscribeLocalEvent<AtmosAlertsDeviceComponent, AnchorStateChangedEvent>(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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,28 +14,20 @@
       "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
     },
     {
       "name": "on-equipped-HELMET-vox",
       "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",