diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index e34929bd2e..97b27821fd 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -361,14 +361,11 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem if (hasLinking && HasComp(target) || hasLinking == configurator.LinkModeActive) return; - if (hasLinking) - { - SetMode(configuratorUid, configurator, userUid, true); - return; - } - - if (HasComp(target)) + var hasNetworking = HasComp(target); + if (hasNetworking) SetMode(configuratorUid, configurator, userUid, false); + else if (hasLinking) + SetMode(configuratorUid, configurator, userUid, true); } #endregion diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs index 56aa0550cf..801bfd4b1d 100644 --- a/Content.Shared/Access/Systems/AccessReaderSystem.cs +++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs @@ -70,9 +70,10 @@ public sealed class AccessReaderSystem : EntitySystem } } + var examiner = args.Examiner; var canSeeAccessModification = accessHasBeenModified && - (HasComp(ent) || - _inventorySystem.TryGetInventoryEntity(args.Examiner, out _)); + (HasComp(examiner) || + _inventorySystem.TryGetInventoryEntity(examiner, out _)); if (canSeeAccessModification) { diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index 105206fece..2138d04149 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -15,7 +15,7 @@ namespace Content.Shared.Fluids.Components public SoundSpecifier SpillSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg"); [DataField] - public FixedPoint2 OverflowVolume = FixedPoint2.New(20); + public FixedPoint2 OverflowVolume = FixedPoint2.New(50); [DataField("solution")] public string SolutionName = "puddle"; diff --git a/Resources/ConfigPresets/WizardsDen/leviathan.toml b/Resources/ConfigPresets/WizardsDen/leviathan.toml index e09ad092b0..f96d04589b 100644 --- a/Resources/ConfigPresets/WizardsDen/leviathan.toml +++ b/Resources/ConfigPresets/WizardsDen/leviathan.toml @@ -4,6 +4,10 @@ [game] hostname = "[EN] Wizard's Den Leviathan [US East 1]" +panic_bunker.enabled = false +panic_bunker.disable_with_admins = false +panic_bunker.enable_without_admins = false +panic_bunker.custom_reason = "" [hub] tags = "lang:en,region:am_n_e,rp:low" diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml index bf34b51808..6d2259e350 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml @@ -11,7 +11,7 @@ panic_bunker.min_overall_minutes = 120 panic_bunker.disable_with_admins = true panic_bunker.enable_without_admins = true panic_bunker.show_reason = true -panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard until you have more playtime." +panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard or Wizard's Den Leviathan until you have more playtime." # IPIntel stuff ipintel_enabled = true diff --git a/Resources/Locale/en-US/construction/recipes/crates.ftl b/Resources/Locale/en-US/construction/recipes/crates.ftl index 393b7784a1..c5b2b47c32 100644 --- a/Resources/Locale/en-US/construction/recipes/crates.ftl +++ b/Resources/Locale/en-US/construction/recipes/crates.ftl @@ -1,3 +1,4 @@ construction-recipe-crate-freezer = crate freezer construction-recipe-big-box = large cardboard box construction-recipe-box-cardboard = small cardboard box +construction-recipe-box-tote = circuit tote diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml new file mode 100644 index 0000000000..122aecd27b --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml @@ -0,0 +1,143 @@ +- type: entity + name: circuit tote [QM] + parent: ToteBase + id: BoxQMCircuitboards + description: A Tote filled with QM's Circuit boards. + components: + - type: StorageFill + contents: + - id: CargoBountyComputerCircuitboard + - id: CargoRequestComputerCircuitboard + - id: CargoSaleComputerCircuitboard + - id: CargoShuttleConsoleCircuitboard + - id: SalvageMagnetMachineCircuitboard + - id: SalvageJobBoardComputerCircuitboard + - id: MailTeleporterMachineCircuitboard + +- type: entity + name: stamp box [QM] + parent: BoxCardboard + id: BoxQMStamps + description: A box filled with QM's Stamps. Stamped of course. + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampQm + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Stamp + - type: Sprite + layers: + - state: box + - state: stamp + +- type: entity + name: circuit tote [HoP] + parent: ToteBase + id: BoxHoPCircuitboards + description: A Tote filled with HoP's Circuit boards. + components: + - type: StorageFill + contents: + - id: IDComputerCircuitboard + - id: FundingAllocationComputerCircuitboard + - id: CargoRequestServiceComputerCircuitboard + +- type: entity + name: stamp box [HoP] + parent: BoxCardboard + id: BoxHoPStamps + description: A box filled with HoP's Stamps. Stamped of course. + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampHop + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Stamp + - type: Sprite + layers: + - state: box + - state: stamp + +- type: entity + name: circuit tote [CE] + parent: ToteBase + id: BoxCECircuitboards + description: A Tote filled with CE's Circuit boards. + components: + - type: StorageFill + contents: + - id: CargoRequestEngineeringComputerCircuitboard + - id: AlertsComputerCircuitboard + - id: AtmosMonitoringComputerCircuitboard + - id: PowerComputerCircuitboard + - id: SolarControlComputerCircuitboard + +- type: entity + name: circuit tote [Captain] + parent: ToteBase + id: BoxCaptainCircuitboards + description: A Tote filled with Captain's Circuit boards. + components: + - type: StorageFill + contents: + - id: CommsComputerCircuitboard + - id: StationRecordsComputerCircuitboard + +- type: entity + name: circuit tote [CMO] + parent: ToteBase + id: BoxCMOCircuitboards + description: A Tote filled with CMO's Circuit boards. + components: + - type: StorageFill + contents: + - id: MedicalTechFabCircuitboard + - id: CargoRequestMedicalComputerCircuitboard + +- type: entity + name: circuit tote [RD] + parent: ToteBase + id: BoxRDCircuitboards + description: A Tote filled with RD's Circuit boards. + components: + - type: StorageFill + contents: + - id: CircuitImprinterMachineCircuitboard + - id: ProtolatheMachineCircuitboard + - id: ResearchComputerCircuitboard + - id: CargoRequestScienceComputerCircuitboard + - id: RoboticsConsoleCircuitboard + - id: AnalysisComputerCircuitboard #Because sometimes round start artis just fucking explode on the pad. + - id: ArtifactAnalyzerMachineCircuitboard + - id: StationAiFixerCircuitboard + +- type: entity + name: circuit tote [HoS] + parent: ToteBase + id: BoxHoSCircuitboards + description: A Tote filled with HoS's Circuit boards. + components: + - type: StorageFill + contents: + - id: SecurityTechFabCircuitboard + - id: CargoRequestSecurityComputerCircuitboard diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 7acb9cf8b1..51e6440a34 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -235,13 +235,13 @@ - type: entity id: CrateTechBoardRandom - parent: CrateEngineering + parent: ToteBase name: surplus boards description: Surplus boards from somewhere. components: - type: EntityTableContainerFill containers: - entity_storage: !type:NestedSelector + storagebase: !type:NestedSelector tableId: RandomTechBoardTable rolls: !type:RangeNumberSelector range: 6, 8 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 37dd68e63a..cf5297220c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -4,22 +4,14 @@ children: - id: BoxEncryptionKeyCargo - id: BoxFolderQmClipboard - - id: CargoBountyComputerCircuitboard - - id: CargoRequestComputerCircuitboard - - id: CargoSaleComputerCircuitboard - - id: CargoShuttleConsoleCircuitboard - - id: SalvageMagnetMachineCircuitboard - - id: SalvageJobBoardComputerCircuitboard + - id: BoxQMCircuitboards + - id: BoxQMStamps - id: CigPackGreen prob: 0.50 - id: ClothingHeadsetAltCargo - id: DoorRemoteCargo - - id: RubberStampApproved - - id: RubberStampDenied - - id: RubberStampQm - id: AstroNavCartridge - id: ClothingHandsKnuckleDustersQM - - id: MailTeleporterMachineCircuitboard - type: entity id: LockerQuarterMasterFilled @@ -42,7 +34,7 @@ - id: ClothingBeltSheathFilled - id: ClothingHeadsetAltCommand - id: ClothingOuterArmorCaptainCarapace - - id: CommsComputerCircuitboard + - id: BoxCaptainCircuitboards - id: DoorRemoteCustom - id: MedalCase - id: NukeDisk @@ -122,6 +114,8 @@ - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - id: BoxHeadset + - id: BoxHoPCircuitboards + - id: BoxHoPStamps - id: BoxID - id: BoxPDA - id: CigarGoldCase @@ -134,12 +128,6 @@ - id: ClothingNeckGoldmedal - id: DoorRemoteService - id: HoPIDCard - - id: IDComputerCircuitboard - - id: FundingAllocationComputerCircuitboard - - id: CargoRequestServiceComputerCircuitboard - - id: RubberStampApproved - - id: RubberStampDenied - - id: RubberStampHop - id: WeaponDisabler - id: ClothingEyesHudCommand @@ -167,7 +155,7 @@ - id: ClothingHandsGlovesColorYellow - id: ClothingHeadsetAltEngineering - id: DoorRemoteEngineering - - id: CargoRequestEngineeringComputerCircuitboard + - id: BoxCECircuitboards - id: RCD - id: RCDAmmo - id: RubberStampCE @@ -226,8 +214,7 @@ - id: DoorRemoteMedical - id: HandheldCrewMonitor - id: Hypospray - - id: MedicalTechFabCircuitboard - - id: CargoRequestMedicalComputerCircuitboard + - id: BoxCMOCircuitboards - id: MedkitFilled - id: RubberStampCMO - id: MedTekCartridge @@ -274,15 +261,11 @@ children: - id: Intellicard - id: BoxEncryptionKeyScience - - id: CircuitImprinterMachineCircuitboard + - id: BoxRDCircuitboards - id: ClothingBeltUtilityFilled - id: ClothingHeadsetAltScience - id: DoorRemoteResearch - id: HandTeleporter - - id: ProtolatheMachineCircuitboard - - id: ResearchComputerCircuitboard - - id: CargoRequestScienceComputerCircuitboard - - id: StationAiFixerCircuitboard - id: RubberStampRd # Hardsuit table, used for suit storage as well @@ -339,8 +322,7 @@ - id: DoorRemoteSecurity - id: HoloprojectorSecurity - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: CargoRequestSecurityComputerCircuitboard + - id: BoxHoSCircuitboards - id: WeaponDisabler - id: WeaponTaser - id: WantedListCartridge diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index 302679c4d9..5eb059b191 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -20,6 +20,7 @@ id: Status name: signal-port-name-status-transmitter description: signal-port-description-status-transmitter + defaultLinks: [ Toggle ] - type: sourcePort id: Left diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index d5612210c6..7bf6ed1f0a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -71,12 +71,19 @@ parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitEVAPrisoner name: prisoner EVA suit - description: A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies. + description: An emergency EVA suit meant for prisoners. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vacuum of space. components: - type: Sprite sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: HeldSpeedModifier + - type: TemperatureProtection + heatingCoefficient: 0.75 + coolingCoefficient: 0.5 - type: Tag tags: - SuitEVA diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 563a7810d0..b0eaa06895 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1675,7 +1675,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 24 + maxVol: 14 reagents: - ReagentId: Bicaridine Quantity: 5 @@ -1683,8 +1683,6 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 2 - - ReagentId: Desoxyephedrine - Quantity: 10 - ReagentId: Vitamin Quantity: 2 - type: Sprite @@ -1720,7 +1718,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 10 reagents: - ReagentId: Omnizine Quantity: 3 @@ -1728,8 +1726,6 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 2 - - ReagentId: Desoxyephedrine - Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi - type: Item @@ -1799,10 +1795,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 25 reagents: - ReagentId: Razorium Quantity: 15 + - ReagentId: Desoxyephedrine + Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/glasstle.rsi - type: Produce diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index edb1a81239..73d72e4fb0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -21,9 +21,45 @@ graph: BoxCardboard node: boxcardboard containers: - - entity_storage + - storagebase - type: PhysicalComposition materialComposition: Cardboard: 100 - type: StaticPrice price: 10 + +- type: entity + name: circuit tote + id: ToteBase + parent: BoxBase + description: A large tote for carrying circuit boards. + components: + - type: Sprite + layers: + - state: tote-0 + map: ["enum.StorageFillLayers.Fill"] + - state: circuit + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 3 + fillBaseName: tote + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,2 + whitelist: + components: + - MachineBoard + - Circuitboard + - type: Construction + graph: ToteBase + node: totebase + - type: PhysicalComposition + materialComposition: + Cardboard: 75 + Cloth: 25 + - type: StaticPrice + price: 15 + - type: Tag + tags: + - ToteBase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index fcbffc6be6..de9cea7e52 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -64,7 +64,7 @@ parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] id: WeaponLauncherHydra name: hydra - description: PLOOP... FSSSSSS + description: PLOOP... FSSSSSS... components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 37e8a1beb3..9a2b4eafae 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1294,10 +1294,6 @@ Min: 1 Max: 5 PotencyDivisor: 20 - Desoxyephedrine: - Min: 1 - Max: 10 - PotencyDivisor: 10 Vitamin: Min: 1 Max: 2 @@ -1332,10 +1328,6 @@ Min: 1 Max: 5 PotencyDivisor: 20 - Desoxyephedrine: - Min: 1 - Max: 10 - PotencyDivisor: 10 - type: seed id: galaxythistle @@ -1382,6 +1374,10 @@ Min: 1 Max: 25 PotencyDivisor: 4 + Desoxyephedrine: # meff!! + Min: 1 + Max: 10 + PotencyDivisor: 10 - type: seed id: flyAmanita diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index e08e6aa0fc..f0a782361c 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -189,6 +189,7 @@ - type: roleLoadout id: JobMusician + canCustomizeName: true groups: - GroupTankHarness - MusicianJumpsuit diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml index 527f6b5247..9cabb7e441 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml @@ -2,14 +2,28 @@ id: BoxCardboard start: start graph: - - node: start - edges: - - to: boxcardboard - steps: - - material: Cardboard - amount: 1 - doAfter: 4 + - node: start + edges: + - to: boxcardboard + steps: + - material: Cardboard + amount: 1 + doAfter: 4 + - node: boxcardboard + entity: BoxCardboard - - - node: boxcardboard - entity: BoxCardboard \ No newline at end of file +- type: constructionGraph + id: ToteBase + start: start + graph: + - node: start + edges: + - to: totebase + steps: + - material: Cardboard + amount: 1 + - material: Cloth + amount: 1 + doAfter: 4 + - node: totebase + entity: ToteBase diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml index ebd0261b3a..0ba076b36b 100644 --- a/Resources/Prototypes/Recipes/Crafting/crates.yml +++ b/Resources/Prototypes/Recipes/Crafting/crates.yml @@ -57,6 +57,15 @@ category: construction-category-storage objectType: Item +- type: construction + id: ToteBase + name: construction-recipe-box-tote + graph: ToteBase + startNode: start + targetNode: totebase + category: construction-category-storage + objectType: Item + - type: construction id: FoodBoxPizza graph: FoodBoxPizza diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index fde9057d64..184daa337a 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1424,6 +1424,9 @@ - type: Tag id: Torch +- type: Tag + id: ToteBase + - type: Tag id: ToyRubberDuck diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 64c3fc85c1..000059bf90 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github), trigger by IProduceWidgets, utensils by gentleman-bird (github).", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github), trigger by IProduceWidgets, utensils by gentleman-bird (github). stamp, totes modified from box by Mixelz.", "size": { "x": 32, "y": 32 @@ -136,6 +136,9 @@ { "name": "solution_trays" }, + { + "name": "stamp" + }, { "name": "sterile" }, @@ -182,6 +185,15 @@ "name": "hug-inhand-right", "directions": 4 }, + { + "name": "tote-0" + }, + { + "name": "tote-1" + }, + { + "name": "tote-2" + }, { "name": "shelltoy" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png b/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png new file mode 100644 index 0000000000..812c721f20 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png new file mode 100644 index 0000000000..fbdcd51802 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png new file mode 100644 index 0000000000..02a49d9dbb Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png new file mode 100644 index 0000000000..3066ce7254 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png differ