diff --git a/Content.Server/_NF/StationEvents/Events/Actions/GetRandomDeadDropAction.cs b/Content.Server/_NF/StationEvents/Events/Actions/GetRandomDeadDropAction.cs index 01ccaf3a882..98573f35f64 100644 --- a/Content.Server/_NF/StationEvents/Events/Actions/GetRandomDeadDropAction.cs +++ b/Content.Server/_NF/StationEvents/Events/Actions/GetRandomDeadDropAction.cs @@ -12,8 +12,6 @@ public sealed partial class GetRandomDeadDropAction : IPreFaxAction private IEntityManager _entityManager = default!; private DeadDropSystem _deadDrop = default!; - const int MaxHintTimeErrorSeconds = 300; - public void Initialize() { _entityManager = IoCManager.Resolve(); diff --git a/Content.Server/_NF/StationEvents/Events/RandomFaxRule.cs b/Content.Server/_NF/StationEvents/Events/RandomFaxRule.cs index c3ebff3aa6a..4593e98ed92 100644 --- a/Content.Server/_NF/StationEvents/Events/RandomFaxRule.cs +++ b/Content.Server/_NF/StationEvents/Events/RandomFaxRule.cs @@ -41,7 +41,7 @@ protected override void Started(EntityUid uid, RandomFaxRuleComponent component, { base.Started(uid, component, gameRule, args); - var numFaxes = _random.Next(component.MinFaxes, component.MaxFaxes); + var numFaxes = _random.Next(component.MinFaxes, component.MaxFaxes + 1); List stations = new(); int retries = 0; @@ -118,6 +118,7 @@ protected override void Started(EntityUid uid, RandomFaxRuleComponent component, _faxSystem.Receive(faxUid, printout, recipientAddress, faxComp); break; } + stations.Add(chosenStation.Value); faxesSent++; } } diff --git a/Content.Shared/_NF/CCVar/NFCCVars.cs b/Content.Shared/_NF/CCVar/NFCCVars.cs index f8e4a397e67..64006ca81e4 100644 --- a/Content.Shared/_NF/CCVar/NFCCVars.cs +++ b/Content.Shared/_NF/CCVar/NFCCVars.cs @@ -113,22 +113,50 @@ public sealed class NFCCVars /* * Smuggling */ + /// + /// The maximum number of smuggling drop pods to be out at once. + /// Taking another dead drop note will cause the oldest one to be destroyed. + /// public static readonly CVarDef SmugglingMaxSimultaneousPods = CVarDef.Create("nf14.smuggling.max_simultaneous_pods", 5, CVar.REPLICATED); + /// + /// The maximum number of dead drops (places to get smuggling notes) to place at once. + /// public static readonly CVarDef SmugglingMaxDeadDrops = CVarDef.Create("nf14.smuggling.max_sector_dead_drops", 10, CVar.REPLICATED); + /// + /// The minimum number of FUCs to spawn for anti-smuggling work. + /// public static readonly CVarDef SmugglingMinFucPayout = - CVarDef.Create("nf14.smuggling.min_fuc_payout", 2, CVar.REPLICATED); + CVarDef.Create("nf14.smuggling.min_fuc_payout", 1, CVar.REPLICATED); + /// + /// The shortest time to wait before a dead drop spawns a new smuggling note. + /// public static readonly CVarDef DeadDropMinTimeout = CVarDef.Create("nf14.smuggling.min_timeout", 900, CVar.REPLICATED); + /// + /// The longest time to wait before a dead drop spawns a new smuggling note. + /// public static readonly CVarDef DeadDropMaxTimeout = CVarDef.Create("nf14.smuggling.max_timeout", 5400, CVar.REPLICATED); + /// + /// The shortest distance that a smuggling pod will spawn away from Frontier Outpost. + /// public static readonly CVarDef DeadDropMinDistance = CVarDef.Create("nf14.smuggling.min_distance", 6500, CVar.REPLICATED); + /// + /// The longest distance that a smuggling pod will spawn away from Frontier Outpost. + /// public static readonly CVarDef DeadDropMaxDistance = CVarDef.Create("nf14.smuggling.max_distance", 8000, CVar.REPLICATED); + /// + /// The smallest number of dead drop hints (paper clues to dead drop locations) at round start. + /// public static readonly CVarDef DeadDropMinHints = - CVarDef.Create("nf14.smuggling.min_hints", 3, CVar.REPLICATED); + CVarDef.Create("nf14.smuggling.min_hints", 0, CVar.REPLICATED); // Used with BasicDeadDropHintVariationPass + /// + /// The largest number of dead drop hints (paper clues to dead drop locations) at round start. + /// public static readonly CVarDef DeadDropMaxHints = - CVarDef.Create("nf14.smuggling.max_hints", 4, CVar.REPLICATED); + CVarDef.Create("nf14.smuggling.max_hints", 0, CVar.REPLICATED); // Used with BasicDeadDropHintVariationPass } diff --git a/Resources/Locale/en-US/_NF/smuggling/deaddrop.ftl b/Resources/Locale/en-US/_NF/smuggling/deaddrop.ftl index 684cb75b822..30a71e99065 100644 --- a/Resources/Locale/en-US/_NF/smuggling/deaddrop.ftl +++ b/Resources/Locale/en-US/_NF/smuggling/deaddrop.ftl @@ -15,3 +15,4 @@ deaddrop-faxed-hint-name = suspicious fax deaddrop-faxed-hint-content = Not much time. Spinward Syndicate needs help. +deaddrop-faxed-hint-signature = Syndicate Logistics \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 0a2d948d4a5..a2d18f290f1 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -7,7 +7,7 @@ - type: SurplusBundle totalPrice: 50 - type: StaticPrice # Frontier - vendPrice: 200000 # Frontier + vendPrice: 300000 # Frontier - type: entity id: CrateCybersunJuggernautBundle diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml index a5a420a95ff..66dcba33f40 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml @@ -6,3 +6,5 @@ components: - type: SurplusBundle totalPrice: 20 + - type: StaticPrice + vendPrice: 120000 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/trade.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/trade.yml index e020b1c9b1b..5976e5983f9 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/trade.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/trade.yml @@ -9,41 +9,3 @@ parent: CrateTradeBaseSecureHigh name: high value cargo trading crate description: Contains high value goods made in the Frontier sector, ready to be sold on a cargo depot for higher value. MAKE SURE THE CRATE IS INTACT. - -- type: entity - id: CrateTradeContrabandSecureNormalFilled - parent: CrateTradeContrabandSecureNormal - -- type: entity - id: CrateTradeContrabandSecureDonkFilled - parent: CrateTradeContrabandSecureDonk - -- type: entity - id: CrateTradeContrabandSecureCyberSunFilled - parent: CrateTradeContrabandSecureCyberSun - -- type: entity - id: CrateTradeSecureNormalFilledContraband - parent: [CrateTradeSecureNormalFilled, BaseC3SyndicateContrabandNoValue] - description: Contains goods made in the Spinward sector, ready to be smuggled to a cargo depot for profit. MAKE SURE THE CRATE IS INTACT. - components: - - type: StaticPrice - price: 3000 - - type: DisableShipyardSale - reason: shipyard-console-contraband-onboard - allowedShipyardTypes: - - Syndicate - - BlackMarket - -- type: entity - id: CrateTradeSecureHighFilledContraband - parent: [CrateTradeSecureHighFilled, BaseC3SyndicateContrabandNoValue] - description: Contains exotic goods made in the Spinward sector, ready to be smuggled to a cargo depot for profit. MAKE SURE THE CRATE IS INTACT. - components: - - type: StaticPrice - price: 5000 - - type: DisableShipyardSale - reason: shipyard-console-contraband-onboard - allowedShipyardTypes: - - Syndicate - - BlackMarket diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml index 032b40d95a8..b53c590878f 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml @@ -3,4 +3,4 @@ startingInventory: CrateSyndicateSurplusBundle: 1 emaggedInventory: - CrateSyndicateSurplusBundle: 1 \ No newline at end of file + CrateSyndicateLightSurplusBundle: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/syndicate.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/syndicate.yml index bc81fbd51c4..7890e5b8c63 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/syndicate.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/syndicate.yml @@ -11,18 +11,14 @@ state: icon - type: RandomSpawner prototypes: - - CrateTradeContrabandSecureCyberSunFilled - - CrateTradeContrabandSecureDonkFilled - - CrateTradeContrabandSecureNormalFilled - - CrateTradeSecureHighFilledContraband - - CrateTradeSecureNormalFilledContraband #its in here twice for balance. TODO: find a better crate to put here instead like an animal one or something. - - CrateTradeSecureNormalFilledContraband + - CrateTradeContrabandSecure5 + - CrateTradeContrabandSecure4 + - CrateTradeContrabandSecure3 + - CrateTradeContrabandSecure2 + - CrateTradeContrabandSecure1 + - CrateTradeContrabandSecure1 - LandMineExplosive - BannerSyndicate - rarePrototypes: - - CrateSyndicateSurplusBundle - - CrateSyndicateLightSurplusBundle - rareChance: 0.01 - type: entity name: Contraband Crate Spawner @@ -37,9 +33,9 @@ state: icon - type: RandomSpawner prototypes: - - CrateTradeContrabandSecureCyberSunFilled - - CrateTradeContrabandSecureDonkFilled - - CrateTradeContrabandSecureNormalFilled + - CrateTradeContrabandSecure5 + - CrateTradeContrabandSecure4 + - CrateTradeContrabandSecure3 rarePrototypes: - CrateSyndicateSurplusBundle - CrateSyndicateSurplusBundle @@ -60,15 +56,11 @@ state: pinpointer-syndicate - type: RandomSpawner prototypes: - - ToolboxSyndicateFilled - - ToolboxSyndicate - - ClothingEyesGlassesHiddenSecurity - ClothingBackpackDuffelSyndicateEVABundle - ClothingBackpackSyndicate - ClothingMaskGasSyndicate - SyndieHandyFlag - SyndicatePersonalAI - - RubberStampSyndicate - ClothingBeltSyndieHolster - ClothingEyesHudSyndicate - ClothingBackpackDuffelSyndicatePyjamaBundle @@ -79,7 +71,6 @@ - ToyFigurineNukieElite - ToyNuke - PlushieNuke - chance: 0.9 rarePrototypes: - PinpointerSyndicatePOI rareChance: 0.1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml index e33e34f4a9f..a8eb91fa11b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml @@ -100,10 +100,17 @@ components: - type: DeadDropHint - type: Paper - content: deaddrop-faxed-hint-content + content: deaddrop-faxed-hint-content # Default contents, will be edited. + stampedBy: + - stampedName: deaddrop-faxed-hint-signature + stampedColor: "#850000" + stampState: null - type: entity id: PaperDeadDropFax parent: PaperDeadDropHint name: suspicious fax description: A sheet with blurry, crooked text on it. Seems to have been copied in a hurry. + components: + - type: Paper + stampState: paper_stamp-syndicate diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 82e1b5f693d..9b237e86f7e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -128,7 +128,7 @@ ejectDelay: 3 ejectRandomMax: 0 ejectRandomCounter: 0 - initialStockQuality: 0.5 +# initialStockQuality: 0.5 - type: Advertise pack: SyndieDrobeAds - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index a8b2ef23a2e..f02a722370c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -82,14 +82,11 @@ parent: - CrateTradeBaseSecure - BaseC3SyndicateContraband - id: CrateTradeContrabandSecureNormal + id: CrateTradeBaseSecureContraband name: Syndicate contraband crate - categories: [ HideSpawnMenu ] + description: Contains goods made in the Spinward sector, ready to be smuggled to a cargo depot for profit. MAKE SURE THE CRATE IS INTACT. + abstract: true components: - - type: Icon - sprite: _NF/Structures/Storage/Crates/contraband_crate.rsi - - type: Sprite - sprite: _NF/Structures/Storage/Crates/contraband_crate.rsi - type: EntityStorage deleteContentsOnDestruction: true - type: Fixtures @@ -98,13 +95,11 @@ shape: !type:PhysShapeAabb bounds: "-0.4,-0.4,0.4,0.29" - density: 150 # Heavy + density: 400 # Very heavy mask: - SmallMobMask layer: - MachineLayer - - type: StaticPrice - price: 7500 - type: Contraband turnInValues: FrontierUplinkCoin: 3 @@ -116,10 +111,44 @@ - BlackMarket - type: entity - parent: - - CrateTradeBaseSecure - - BaseC3SyndicateContraband - id: CrateTradeContrabandSecureDonk + parent: CrateTradeBaseSecureContraband + id: CrateTradeContrabandSecure1 + categories: [ HideSpawnMenu ] + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/contraband1_crate.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/contraband1_crate.rsi + - type: StaticPrice + price: 3000 + +- type: entity + parent: CrateTradeBaseSecureContraband + id: CrateTradeContrabandSecure2 + categories: [ HideSpawnMenu ] + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/contraband2_crate.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/contraband2_crate.rsi + - type: StaticPrice + price: 5000 + +- type: entity + parent: CrateTradeBaseSecureContraband + id: CrateTradeContrabandSecure3 + categories: [ HideSpawnMenu ] + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/contraband3_crate.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/contraband3_crate.rsi + - type: StaticPrice + price: 7500 + +- type: entity + parent: CrateTradeBaseSecureContraband + id: CrateTradeContrabandSecure4 name: Donk Co. contraband crate categories: [ HideSpawnMenu ] components: @@ -127,36 +156,12 @@ sprite: _NF/Structures/Storage/Crates/donkco_crate.rsi - type: Sprite sprite: _NF/Structures/Storage/Crates/donkco_crate.rsi - - type: EntityStorage - deleteContentsOnDestruction: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.4,0.4,0.29" - density: 400 # Very heavy - mask: - - SmallMobMask - layer: - - MachineLayer - type: StaticPrice price: 15000 - - type: Contraband - turnInValues: - FrontierUplinkCoin: 3 - Doubloon: 2 - - type: DisableShipyardSale - reason: shipyard-console-contraband-onboard - allowedShipyardTypes: - - Syndicate - - BlackMarket - type: entity - parent: - - CrateTradeBaseSecure - - BaseC3SyndicateContraband - id: CrateTradeContrabandSecureCyberSun + parent: CrateTradeBaseSecureContraband + id: CrateTradeContrabandSecure5 name: Cybersun Industries contraband crate categories: [ HideSpawnMenu ] components: @@ -164,30 +169,8 @@ sprite: _NF/Structures/Storage/Crates/cybersun_crate.rsi - type: Sprite sprite: _NF/Structures/Storage/Crates/cybersun_crate.rsi - - type: EntityStorage - deleteContentsOnDestruction: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.4,0.4,0.29" - density: 400 # Very heavy - mask: - - SmallMobMask - layer: - - MachineLayer - type: StaticPrice price: 15000 - - type: Contraband - turnInValues: - FrontierUplinkCoin: 3 - Doubloon: 2 - - type: DisableShipyardSale - reason: shipyard-console-contraband-onboard - allowedShipyardTypes: - - Syndicate - - BlackMarket - type: entity parent: CrateSecgear diff --git a/Resources/Prototypes/_NF/Events/nf_events.yml b/Resources/Prototypes/_NF/Events/nf_events.yml index 55f556b8a56..6ff9ae3c35c 100644 --- a/Resources/Prototypes/_NF/Events/nf_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_events.yml @@ -63,7 +63,7 @@ - type: StationEvent weight: 8 # Fairly common. duration: 35 - earliestStart: 30 + earliestStart: 50 minimumPlayers: 20 reoccurrenceDelay: 50 - type: RandomFaxRule @@ -72,5 +72,30 @@ name: deaddrop-faxed-hint-name prototypeId: PaperDeadDropFax content: deaddrop-faxed-hint-content # Default contents, will be edited. + stampedBy: + - stampedName: deaddrop-faxed-hint-signature + stampedColor: "#850000" + stampState: paper_stamp-syndicate preFaxActions: - !type:GetRandomDeadDropAction + +- type: entity + id: SmugglingFaxBig + parent: BaseStationEventShortDelay + components: + - type: StationEvent + weight: 100 # Fairly common. + minimumPlayers: 10 + duration: 35 + - type: RandomFaxRule + minFaxes: 3 + maxFaxes: 4 + name: deaddrop-faxed-hint-name + prototypeId: PaperDeadDropFax + content: deaddrop-faxed-hint-content # Default contents, will be edited. + stampedBy: + - stampedName: deaddrop-faxed-hint-signature + stampedColor: "#850000" + stampState: paper_stamp-syndicate + preFaxActions: + - !type:GetRandomDeadDropAction \ No newline at end of file diff --git a/Resources/Prototypes/_NF/GameRules/roundstart.yml b/Resources/Prototypes/_NF/GameRules/roundstart.yml index efdd77ccbe8..38e0bcae853 100644 --- a/Resources/Prototypes/_NF/GameRules/roundstart.yml +++ b/Resources/Prototypes/_NF/GameRules/roundstart.yml @@ -35,14 +35,28 @@ - id: BluespaceCacheError - id: BluespaceVaultError - id: BluespaceVaultSmallError - # - id: BluespaceAsteroid - # - id: BluespaceAsteroidBunker - # - id: BluespaceCargoniaShip - # - id: BluespaceDataCarrier - id: BluespaceSyndicateFTLInterception - id: BluespaceWizardFederationScout - id: BluespaceBloodMoon +- type: entity + id: SmugglingEventScheduler + parent: BaseGameRule + components: + - type: BasicStationEventScheduler + scheduledGameRules: !type:NestedSelector + tableId: MajorSmugglingEventsTable + minimumTimeUntilFirstEvent: 1800 # 30 minutes + minMaxEventTiming: + min: 28800 # 8 hours between events + max: 43200 # 12 hours between events + +- type: entityTable + id: MajorSmugglingEventsTable + table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp + children: + - id: SmugglingFaxBig + # variation passes - type: entity id: FrontierRoundstartVariation @@ -53,4 +67,4 @@ - id: BasicPoweredLightVariationPass - id: BasicTrashVariationPass - id: BasicPuddleMessVariationPass - - id: BasicDeadDropHintVariationPass + # - id: BasicDeadDropHintVariationPass # ccvar for it found at smuggling.min_hints/smuggling.max_hints diff --git a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml index 06940a5f869..f94186b2e0f 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml @@ -11,8 +11,8 @@ - type: pointOfInterest id: LPBravo name: 'Listening Point Bravo' - rangeMin: 2150 - rangeMax: 4850 + rangeMin: 4000 + rangeMax: 6000 IFFColor: "#C83737" #red the color of ebil IFFFlags: [HideLabel, Hide] # Invisible allowIFFChanges: true diff --git a/Resources/Prototypes/_NF/game_presets.yml b/Resources/Prototypes/_NF/game_presets.yml index fecaca5380c..2c881c76ddb 100644 --- a/Resources/Prototypes/_NF/game_presets.yml +++ b/Resources/Prototypes/_NF/game_presets.yml @@ -9,4 +9,5 @@ - Adventure - BasicStationEventScheduler - BluespaceEventScheduler + - SmugglingEventScheduler - FrontierRoundstartVariation diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/base.png new file mode 100644 index 00000000000..d91b7983526 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/closed.png new file mode 100644 index 00000000000..078d097819f Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/icon.png new file mode 100644 index 00000000000..21044e7f6e2 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/locked.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/locked.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/locked.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/meta.json new file mode 100644 index 00000000000..1bc05ec6467 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14, edited by dvir001 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/open.png new file mode 100644 index 00000000000..937245adf8b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/sparking.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/sparking.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/sparking.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/unlocked.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/unlocked.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/unlocked.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/welded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/welded.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband1_crate.rsi/welded.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/base.png new file mode 100644 index 00000000000..4c4bd96ec35 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/closed.png new file mode 100644 index 00000000000..092afe49d4a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/icon.png new file mode 100644 index 00000000000..fa77480c74b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/locked.png new file mode 100644 index 00000000000..aceacfce597 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/meta.json new file mode 100644 index 00000000000..1bc05ec6467 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14, edited by dvir001 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/open.png new file mode 100644 index 00000000000..89fd9755723 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/sparking.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/unlocked.png new file mode 100644 index 00000000000..94b89fa655d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband2_crate.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/base.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/base.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/closed.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/closed.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/closed.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/icon.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/icon.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/locked.png new file mode 100644 index 00000000000..aceacfce597 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/meta.json rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/open.png similarity index 100% rename from Resources/Textures/_NF/Structures/Storage/Crates/contraband_crate.rsi/open.png rename to Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/open.png diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/sparking.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/unlocked.png new file mode 100644 index 00000000000..94b89fa655d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/contraband3_crate.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/tradedark.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/tradedark.rsi/meta.json index 6a4a45c0121..1bc05ec6467 100644 --- a/Resources/Textures/_NF/Structures/Storage/Crates/tradedark.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/Crates/tradedark.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14.", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14, edited by dvir001 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/tradelight.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/tradelight.rsi/meta.json index 6a4a45c0121..1bc05ec6467 100644 --- a/Resources/Textures/_NF/Structures/Storage/Crates/tradelight.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/Crates/tradelight.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14.", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14, edited by dvir001 (github)", "size": { "x": 32, "y": 32