diff --git a/Content.Server/Objectives/Components/StoreUnlockerComponent.cs b/Content.Server/Objectives/Components/StoreUnlockerComponent.cs deleted file mode 100644 index b53aae945a..0000000000 --- a/Content.Server/Objectives/Components/StoreUnlockerComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Content.Shared.Store; -using Robust.Shared.Prototypes; - -namespace Content.Server.Objectives.Components; - -/// -/// Unlocks store listings that use . -/// -[RegisterComponent] -public sealed partial class StoreUnlockerComponent : Component -{ - [DataField(required: true)] - public List> Listings = new(); -} diff --git a/Content.Server/Objectives/Systems/StoreUnlockerSystem.cs b/Content.Server/Objectives/Systems/StoreUnlockerSystem.cs deleted file mode 100644 index 28cf768d33..0000000000 --- a/Content.Server/Objectives/Systems/StoreUnlockerSystem.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Content.Server.Objectives.Components; -using Content.Shared.Mind; - -namespace Content.Server.Objectives.Systems; - -/// -/// Provides api for listings with ObjectiveUnlockRequirement to use. -/// -public sealed class StoreUnlockerSystem : EntitySystem -{ - private EntityQuery _query; - - public override void Initialize() - { - _query = GetEntityQuery(); - } - - /// - /// Returns true if a listing id is unlocked by any objectives on a mind. - /// - public bool IsUnlocked(MindComponent mind, string id) - { - foreach (var obj in mind.Objectives) - { - if (!_query.TryComp(obj, out var comp)) - continue; - - if (comp.Listings.Contains(id)) - return true; - } - - return false; - } -} diff --git a/Content.Server/Store/Conditions/ObjectiveUnlockCondition.cs b/Content.Server/Store/Conditions/ObjectiveUnlockCondition.cs deleted file mode 100644 index a9dafc28ff..0000000000 --- a/Content.Server/Store/Conditions/ObjectiveUnlockCondition.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Content.Shared.Mind; -using Content.Shared.Store; -using Content.Server.Objectives.Systems; - -namespace Content.Server.Store.Conditions; - -/// -/// Requires that the buyer have an objective that unlocks this listing. -/// -public sealed partial class ObjectiveUnlockCondition : ListingCondition -{ - public override bool Condition(ListingConditionArgs args) - { - var minds = args.EntityManager.System(); - if (!minds.TryGetMind(args.Buyer, out _, out var mind)) - return false; - - var unlocker = args.EntityManager.System(); - return unlocker.IsUnlocked(mind, args.Listing.ID); - } -} diff --git a/Content.Shared/Cabinet/ItemCabinetSystem.cs b/Content.Shared/Cabinet/ItemCabinetSystem.cs index e14e269d4f..749065ac47 100644 --- a/Content.Shared/Cabinet/ItemCabinetSystem.cs +++ b/Content.Shared/Cabinet/ItemCabinetSystem.cs @@ -16,17 +16,11 @@ public sealed class ItemCabinetSystem : EntitySystem [Dependency] private readonly OpenableSystem _openable = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - private EntityQuery _cabinetQuery = default!; - private EntityQuery _slotsQuery = default!; - /// public override void Initialize() { base.Initialize(); - _cabinetQuery = GetEntityQuery(); - _slotsQuery = GetEntityQuery(); - SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnContainerModified); @@ -43,12 +37,12 @@ public sealed class ItemCabinetSystem : EntitySystem private void OnMapInit(Entity ent, ref MapInitEvent args) { // update at mapinit to avoid copy pasting locked: true and locked: false for each closed/open prototype - SetSlotLock((ent, ent.Comp), !_openable.IsOpen(ent)); + SetSlotLock(ent, !_openable.IsOpen(ent)); } private void UpdateAppearance(Entity ent) { - _appearance.SetData(ent, ItemCabinetVisuals.ContainsItem, HasItem((ent, ent.Comp))); + _appearance.SetData(ent, ItemCabinetVisuals.ContainsItem, HasItem(ent)); } private void OnContainerModified(EntityUid uid, ItemCabinetComponent component, ContainerModifiedMessage args) @@ -59,24 +53,21 @@ public sealed class ItemCabinetSystem : EntitySystem private void OnOpened(Entity ent, ref OpenableOpenedEvent args) { - SetSlotLock((ent, ent.Comp), false); + SetSlotLock(ent, false); } private void OnClosed(Entity ent, ref OpenableClosedEvent args) { - SetSlotLock((ent, ent.Comp), true); + SetSlotLock(ent, true); } /// /// Tries to get the cabinet's item slot. /// - public bool TryGetSlot(Entity ent, [NotNullWhen(true)] out ItemSlot? slot) + public bool TryGetSlot(Entity ent, [NotNullWhen(true)] out ItemSlot? slot) { slot = null; - if (!_cabinetQuery.Resolve(ent, ref ent.Comp)) - return false; - - if (!_slotsQuery.TryComp(ent, out var slots)) + if (!TryComp(ent, out var slots)) return false; return _slots.TryGetSlot(ent, ent.Comp.Slot, out slot, slots); @@ -85,7 +76,7 @@ public sealed class ItemCabinetSystem : EntitySystem /// /// Returns true if the cabinet contains an item. /// - public bool HasItem(Entity ent) + public bool HasItem(Entity ent) { return TryGetSlot(ent, out var slot) && slot.HasItem; } @@ -95,7 +86,7 @@ public sealed class ItemCabinetSystem : EntitySystem /// public void SetSlotLock(Entity ent, bool closed) { - if (!_slotsQuery.TryComp(ent, out var slots)) + if (!TryComp(ent, out var slots)) return; if (_slots.TryGetSlot(ent, ent.Comp.Slot, out var slot, slots)) diff --git a/Content.Shared/Cabinet/SealingCabinetComponent.cs b/Content.Shared/Cabinet/SealingCabinetComponent.cs deleted file mode 100644 index 53a4f7f3ff..0000000000 --- a/Content.Shared/Cabinet/SealingCabinetComponent.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Robust.Shared.GameStates; - -namespace Content.Shared.Cabinet; - -/// -/// Item cabinet that cannot be opened if it has an item inside. -/// The only way to open it after that is to emag it. -/// -[RegisterComponent, NetworkedComponent] -public sealed partial class SealingCabinetComponent : Component -{ - /// - /// Popup shown when trying to open the cabinet once sealed. - /// - [DataField(required: true)] - public LocId SealedPopup = string.Empty; - - /// - /// Set to false to disable emag unsealing. - /// - [DataField] - public bool Emaggable = true; -} diff --git a/Content.Shared/Cabinet/SealingCabinetSystem.cs b/Content.Shared/Cabinet/SealingCabinetSystem.cs deleted file mode 100644 index be07b8a61f..0000000000 --- a/Content.Shared/Cabinet/SealingCabinetSystem.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Content.Shared.Emag.Systems; -using Content.Shared.Nutrition.Components; -using Content.Shared.Nutrition.EntitySystems; -using Content.Shared.Popups; - -namespace Content.Shared.Cabinet; - -public sealed class SealingCabinetSystem : EntitySystem -{ - [Dependency] private readonly ItemCabinetSystem _cabinet = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnOpenAttempt); - SubscribeLocalEvent(OnEmagged); - } - - private void OnOpenAttempt(Entity ent, ref OpenableOpenAttemptEvent args) - { - if (!_cabinet.HasItem(ent.Owner)) - return; - - args.Cancelled = true; - if (args.User is {} user) - _popup.PopupClient(Loc.GetString(ent.Comp.SealedPopup, ("container", ent.Owner)), ent, user); - } - - private void OnEmagged(Entity ent, ref GotEmaggedEvent args) - { - if (!ent.Comp.Emaggable) - return; - - if (!_cabinet.HasItem(ent.Owner) || _openable.IsOpen(ent)) - return; - - _openable.SetOpen(ent, true); - - args.Handled = true; - args.Repeatable = true; - } -} diff --git a/Resources/Locale/en-US/nuke/nuke-core-container.ftl b/Resources/Locale/en-US/nuke/nuke-core-container.ftl deleted file mode 100644 index 47ea15a831..0000000000 --- a/Resources/Locale/en-US/nuke/nuke-core-container.ftl +++ /dev/null @@ -1,2 +0,0 @@ -nuke-core-container-whitelist-fail-popup = That doesn't fit into the container. -nuke-core-container-sealed-popup = The {$container} is sealed shut! diff --git a/Resources/Locale/en-US/objectives/conditions/steal.ftl b/Resources/Locale/en-US/objectives/conditions/steal.ftl index 1bca71ce90..00c8e0fdaf 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal.ftl @@ -4,7 +4,6 @@ objective-condition-steal-title = Steal the {$owner}'s {$itemName}. objective-condition-steal-description = We need you to steal {$itemName}. Don't get caught. objective-condition-steal-station = station -objective-condition-steal-nuclear-bomb = nuclear bomb objective-condition-steal-Ian = head of personnel's corgi objective-condition-thief-description = The {$itemName} would be a great addition to my collection! diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl index e2804158c6..4ebeff3b23 100644 --- a/Resources/Locale/en-US/store/categories.ftl +++ b/Resources/Locale/en-US/store/categories.ftl @@ -12,7 +12,6 @@ store-category-allies = Allies store-category-job = Job store-category-wearables = Wearables store-category-pointless = Pointless -store-category-objectives = Objectives # Revenant store-category-abilities = Abilities diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 8a7b0800c0..2598970cef 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -433,7 +433,3 @@ uplink-barber-scissors-desc = A good tool to give your fellow agent a nice hairc uplink-backpack-syndicate-name = Syndicate backpack uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods - -# Objectives -uplink-core-extraction-toolbox-name = Core Extraction Toolbox -uplink-core-extraction-toolbox-desc = A toolbox containing everything you need to remove a nuclear bomb's plutonium core. Instructions not included. diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl index a398d45850..14e42390a7 100644 --- a/Resources/Locale/en-US/tools/tool-qualities.ftl +++ b/Resources/Locale/en-US/tools/tool-qualities.ftl @@ -32,7 +32,4 @@ tool-quality-rolling-name = Rolling tool-quality-rolling-tool-name = Rolling Pin tool-quality-digging-name = Digging -tool-quality-digging-tool-name = Shovel - -tool-quality-fine-screwing-name = Fine Screwing -tool-quality-fine-screwing-tool-name = Thin-Tipped Screwdriver +tool-quality-digging-tool-name = Shovel \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 1b47a4f46d..1091207bba 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -121,19 +121,6 @@ - id: ClothingHandsGlovesCombat - id: ClothingMaskGasSyndicate -- type: entity - parent: ToolboxSyndicate - id: ToolboxSyndicateFilledCoreExtraction - suffix: Filled, Core Extraction - components: - - type: StorageFill - contents: - - id: Crowbar - - id: Welder - - id: Wrench - - id: ThinTippedScrewdriver - - id: NukeCoreContainer - - type: entity id: ToolboxGoldFilled name: golden toolbox diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index a921b7fbd3..0ba83dfe73 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1727,23 +1727,3 @@ blacklist: components: - SurplusBundle - -# Objective-specific -- type: listing - id: UplinkCoreExtractionToolbox - name: uplink-core-extraction-toolbox-name - description: uplink-core-extraction-toolbox-desc - icon: - sprite: Objects/Misc/nuke_core_container.rsi - state: closed - productEntity: ToolboxSyndicateFilledCoreExtraction - categories: - - UplinkObjectives - conditions: - - !type:ObjectiveUnlockCondition - - !type:ListingLimitedStockCondition - stock: 1 - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle diff --git a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml b/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml deleted file mode 100644 index 6791088887..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - parent: BaseItem - id: PlutoniumCore - name: plutonium core - description: Extremely radioactive, even looking at this with the naked eye is dangerous. - components: - - type: Sprite - sprite: Objects/Misc/plutonium_core.rsi - state: icon - - type: StealTarget - stealGroup: PlutoniumCore - - type: RadiationSource - intensity: 4 - slope: 1 - - type: StaticPrice - price: 49000 - - type: Tag - tags: - - PlutoniumCore - -- type: entity - parent: [BaseItem, BaseItemCabinet] - id: NukeCoreContainer - name: nuke core container - description: Solid container for radioactive objects. - components: - - type: Sprite - sprite: Objects/Misc/nuke_core_container.rsi - layers: - - state: closed - map: [ "enum.OpenableVisuals.Layer" ] - - state: core_closed - map: [ "enum.ItemCabinetVisuals.Layer" ] - visible: false - shader: unshaded - - type: Item - size: Normal - shape: - - 0,0,1,1 - - type: RadiationBlockingContainer - resistance: 4 - - type: SealingCabinet - sealedPopup: nuke-core-container-sealed-popup - - type: ItemSlots - slots: - ItemCabinet: - whitelist: - tags: - - PlutoniumCore - whitelistFailPopup: nuke-core-container-whitelist-fail-popup - - type: GenericVisualizer - visuals: - enum.OpenableVisuals.Opened: - enum.OpenableVisuals.Layer: - True: { state: open } - False: { state: closed } - enum.ItemCabinetVisuals.Layer: - True: { state: core_open } - False: { state: core_closed } - enum.ItemCabinetVisuals.ContainsItem: - enum.ItemCabinetVisuals.Layer: - True: { visible: true } - False: { visible: false } diff --git a/Resources/Prototypes/Entities/Objects/Tools/syndicate.yml b/Resources/Prototypes/Entities/Objects/Tools/syndicate.yml deleted file mode 100644 index 3d42a17761..0000000000 --- a/Resources/Prototypes/Entities/Objects/Tools/syndicate.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: Screwdriver - id: ThinTippedScrewdriver - description: A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed. - suffix: DO NOT MAP - components: - - type: Tool - qualities: - - Screwing - - FineScrewing diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index c2b6ccdbc0..1cf9ceaeab 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -1,8 +1,8 @@ - type: entity - abstract: true parent: [BaseStructure, StructureWheeled] - id: BaseNuclearBomb + id: NuclearBomb name: nuclear fission explosive + description: You probably shouldn't stick around to see if this is armed. components: - type: Transform anchored: true @@ -61,23 +61,6 @@ - MachineMask layer: - HalfWallLayer - - type: InteractionOutline - - type: CargoSellBlacklist - - type: ArrivalsBlacklist - - type: WarpPoint - follow: true - location: nuclear bomb - - type: StealTarget - stealGroup: NuclearBomb - - type: Construction - graph: NuclearBomb - deconstructionTarget: disarmed - -- type: entity - parent: BaseNuclearBomb - id: NuclearBomb - description: You probably shouldn't stick around to see if this is armed. - components: - type: PointLight enabled: false radius: 4 @@ -107,6 +90,7 @@ - NukeDisk alertLevelOnActivate: delta alertLevelOnDeactivate: green + - type: InteractionOutline - type: ActivatableUI key: enum.NukeUiKey.Key - type: UserInterface @@ -115,12 +99,17 @@ type: NukeBoundUserInterface - type: StaticPrice price: 50000 # YOU STOLE A NUCLEAR FISSION EXPLOSIVE?! + - type: CargoSellBlacklist + - type: ArrivalsBlacklist - type: ItemSlots - type: ContainerContainer containers: Nuke: !type:ContainerSlot - - type: Construction - node: nuke + - type: StealTarget + stealGroup: NuclearBomb + - type: WarpPoint + follow: true + location: nuclear bomb - type: entity parent: NuclearBomb @@ -132,17 +121,6 @@ - type: Physics bodyType: Dynamic -- type: entity - parent: BaseNuclearBomb - id: NuclearBombDisarmed - suffix: Disarmed - description: "You can clearly see that this can't be armed, given its lack of nuclear material." - components: - - type: StaticPrice - price: 1000 # fancy paperweight - - type: Construction - node: disarmed - - type: entity parent: StorageTank id: NuclearBombKeg diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 9e73f5a55b..bb74c92da3 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -14,6 +14,7 @@ CMOHyposprayStealObjective: 1 CMOCrewMonitorStealObjective: 1 RDHardsuitStealObjective: 1 + NukeDiskStealObjective: 1 MagbootsStealObjective: 1 CorgiMeatStealObjective: 1 ClipboardStealObjective: 1 @@ -21,8 +22,6 @@ CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 - PlutoniumCoreStealObjective: 0.5 - NukeDiskStealObjective: 0.25 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index aa9722cfbd..52117b9ce9 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -84,13 +84,6 @@ sprite: Objects/Misc/nukedisk.rsi state: icon -- type: stealTargetGroup - id: PlutoniumCore - name: plutonium core - sprite: - sprite: Objects/Misc/plutonium_core.rsi - state: icon - # Thief Collection - type: stealTargetGroup diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 1e6795d4d4..ad5f56a443 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -293,21 +293,3 @@ - type: StealCondition stealGroup: NukeDisk owner: objective-condition-steal-station - -# Station - -- type: entity - noSpawn: true - parent: BaseTraitorStealObjective - id: PlutoniumCoreStealObjective - components: - - type: Objective - # its hard to steal and leaves evidence, but you can get away with it. - difficulty: 3.5 - - type: NotCommandRequirement - - type: StealCondition - stealGroup: PlutoniumCore - owner: objective-condition-steal-nuclear-bomb - - type: StoreUnlocker - listings: - - UplinkCoreExtractionToolbox diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/nuke.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/nuke.yml deleted file mode 100644 index 0c63e82f40..0000000000 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/nuke.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: constructionGraph - id: NuclearBomb - start: disarmed - graph: - - node: disarmed - entity: NuclearBombDisarmed - edges: - - to: core_exposed - steps: - - tag: PlutoniumCore - name: "a plutonium core" - icon: - sprite: Objects/Misc/plutonium_core.rsi - state: icon - doAfter: 1 - - - node: core_exposed - edges: - - to: disarmed - completed: - - !type:GivePrototype - prototype: PlutoniumCore - steps: - - tool: Prying - doAfter: 2 - - to: panel_removed - steps: - - material: Plasteel - amount: 8 - doAfter: 2 - - tool: Welding - doAfter: 4 - - - node: panel_removed - edges: - - to: core_exposed - completed: - - !type:GivePrototype - prototype: SheetPlasteel1 - amount: 8 - steps: - - tool: Welding - doAfter: 6 - - tool: Anchoring - doAfter: 2 - - tool: Welding - doAfter: 8 - - to: panel_exposed - steps: - - material: Plasteel - amount: 4 - doAfter: 2 - - tool: Welding - doAfter: 2 - - - node: panel_exposed - edges: - - to: panel_removed - completed: - - !type:GivePrototype - prototype: SheetPlasteel1 - amount: 4 - steps: - - tool: Welding - doAfter: 2 - - tool: Prying - doAfter: 2 - - to: nuke - steps: - - tool: FineScrewing - doAfter: 2 - - - node: nuke - entity: NuclearBomb - edges: - - to: panel_exposed - steps: - - tool: FineScrewing - doAfter: 2 diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml index b4aea0bea4..6bd9756c3e 100644 --- a/Resources/Prototypes/Store/categories.yml +++ b/Resources/Prototypes/Store/categories.yml @@ -89,11 +89,6 @@ name: store-category-pointless priority: 10 -- type: storeCategory - id: UplinkObjectives - name: store-category-objectives - priority: 11 - #revenant - type: storeCategory id: RevenantAbilities diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index 5905cb80ba..762ed68921 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -16,7 +16,6 @@ - UplinkWearables - UplinkJob - UplinkPointless - - UplinkObjectives currencyWhitelist: - Telecrystal balance: diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ede344eeab..dee16b7414 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1020,9 +1020,6 @@ - type: Tag id: PlushieSharkPink -- type: Tag - id: PlutoniumCore - - type: Tag id: Potato diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml index a6c712c684..ff55d9fcf1 100644 --- a/Resources/Prototypes/tool_qualities.yml +++ b/Resources/Prototypes/tool_qualities.yml @@ -67,11 +67,3 @@ toolName: tool-quality-rolling-tool-name spawn: RollingPin icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon } - -# do not give this to normal tools, its for nuke deconstruction -- type: tool - id: FineScrewing - name: tool-quality-fine-screwing - toolName: tool-quality-fine-screwing-tool-name - spawn: ThinTippedScrewdriver - icon: { sprite: Objects/Tools/screwdriver.rsi, state: screwdriver-map } diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/closed.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/closed.png deleted file mode 100644 index ba6632404d..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_closed.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_closed.png deleted file mode 100644 index fb5dbec62e..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_open.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_open.png deleted file mode 100644 index 1bda771a78..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/core_open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-left.png deleted file mode 100644 index f2c97f4374..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-right.png deleted file mode 100644 index 074c157c51..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/meta.json b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/meta.json deleted file mode 100644 index c72162e2fd..0000000000 --- a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/meta.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/c34d56a45b0461f5e0fad3cc75e81580c3357119/icons/obj/antags/syndicate_tools.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "open" - }, - { - "name": "closed" - }, - { - "name": "core_open", - "delays": [ - [ - 2.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "core_closed", - "delays": [ - [ - 2.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/open.png b/Resources/Textures/Objects/Misc/nuke_core_container.rsi/open.png deleted file mode 100644 index 3d4b830bf4..0000000000 Binary files a/Resources/Textures/Objects/Misc/nuke_core_container.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/plutonium_core.rsi/icon.png b/Resources/Textures/Objects/Misc/plutonium_core.rsi/icon.png deleted file mode 100644 index 92782ce223..0000000000 Binary files a/Resources/Textures/Objects/Misc/plutonium_core.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/plutonium_core.rsi/meta.json b/Resources/Textures/Objects/Misc/plutonium_core.rsi/meta.json deleted file mode 100644 index 1f0320c048..0000000000 --- a/Resources/Textures/Objects/Misc/plutonium_core.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/c34d56a45b0461f5e0fad3cc75e81580c3357119/icons/obj/antags/syndicate_tools.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon", - "delays": [ - [ - 2, - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - } - ] -}