rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Objects/Storage/boxes.rsi
History
Rinary 64f1aed90c
Большие изменения (#345) 
* init

* мать масштаба тарабанил

* fix

* upd

* upd

* upd

* upd

* upd

* console spam fix

* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........

* fix

* fix

* upd

* upd

* some fixes

* fix

* upd

* upd translation for steal obj

* teg translate

* upd

* fix locale + add advertisements

* translate configurator

* Fully translate

* upd

* Я манал это переводить, позже переведу

* upd en-US

* fix Linter

* upd

* fix

* upd

* fix

* fix

* fix

* Возврат ПНТ

* remove agent non silent equipment

* add acid to uplink

* carrySystem new popups

* fix

* fix

* fix disease locale

* add Disease Guide

* upd locale

* upd

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml

* fix

* upd

* upd

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.

# Conflicts:
#	Content.Server/Dragon/DragonRiftSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
#	Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
#	Resources/Changelog/Changelog.yml
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Head/helmets.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Roles/Jobs/departments.yml
#	Resources/Prototypes/Store/categories.yml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Security/Defusal.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/migration.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.

# Conflicts:
#	Resources/Changelog/Changelog.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.

# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Hydroponics/randomMutations.yml

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.

* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"

This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.

# Conflicts:
#	Resources/Changelog/Changelog.yml

* fix

* upd

* upd uplink

* upd

* fix linter
2024-09-16 19:05:38 +03:00
..
agrichemkit.png A kit to help new botanists discover chemistry (#31738) 2024-09-05 18:43:00 +02:00
beaker.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
bodybags.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
bottle.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_hug.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_id.png Boxes (and sterile mask) (#1964) 2020-09-03 23:13:45 +02:00
box_medical.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_of_doom.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_of_doom_big.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_olive.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_science.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
box_security.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
boxwide.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
boxwidetoy.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
candle.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
circuit.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
clown.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
darts.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
disk.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
emergencytank.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
encryptokey.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
envelope.png Add envelopes (#30298) 2024-07-29 21:49:05 -04:00
evidence_markers.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
extendedtank.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
flare.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
flashbang.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
forensic.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
france.png Uplink: Combat Bakery Kit (#31179) 2024-08-19 12:57:29 -06:00
glasses.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
handcuff.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
headset.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
heart.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
holo.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
hug-inhand-left.png Adds hugbox. (#2826) 2020-12-27 19:24:08 +11:00
hug-inhand-right.png Adds hugbox. (#2826) 2020-12-27 19:24:08 +11:00
id.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
implant.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
inflatable.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
inhand-left.png Boxes (and sterile mask) (#1964) 2020-09-03 23:13:45 +02:00
inhand-right.png Boxes (and sterile mask) (#1964) 2020-09-03 23:13:45 +02:00
internals.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
latex.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
light.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
lightmixed.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
lighttube.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
magazine.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
meson.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
meta.json Большие изменения (#345) 2024-09-16 19:05:38 +03:00
mousetraps.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
nitrile.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
nitrogentank.png Survival Box Loadouts, Nitrogen Emergency tanks (#29131) 2024-06-21 00:05:01 +10:00
omegacart.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
pda.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
pillbox.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
sechud.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellbeanbag.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellflare.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellflash.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellincendiary.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shelllethal.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellpractice.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shellslug.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shelltoy.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
shelltranquilizer.png New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903) 2024-06-12 22:17:35 -04:00
shelluranium.png Printable Special Mags and Empty Mags and Material Rebalance for Ammo (#26178) 2024-04-27 20:38:59 +10:00
solution_trays.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
sterile.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
swab.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
syringe.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
throwing_knives.png Throwing Knives: Syndicate Kit (#26026) 2024-03-23 15:13:06 +11:00
trashbag.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
vials.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
writing.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
writing_of_doom.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
ziptie.png Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00