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
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
drakewill-CRL
511d759a70
A kit to help new botanists discover chemistry ( #31738 )
...
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.
* remove exclamation marks from names
* naming fix
* Rejected trademark application for 'Farmers Helper'.
---------
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
2024-09-05 18:43:00 +02:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
themias
6ba7d268b0
Uplink: Combat Bakery Kit ( #31179 )
...
* save
* sprites
* mime survival kit has baguette
* add weapon/uplink
* cherry-pick croissant changes
* uplink
* Switch baguette to slashing damage
* fixes
* update attribution
* fix typos
* review comments
* reduce TC cost
* switch to regular box
* fix regular baguette rotation
2024-08-19 12:57:29 -06:00
VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +03:00
themias
85e36266fa
Add envelopes ( #30298 )
...
* Add envelopes
* oops
* Remove unused loc string
* comments and fixes
2024-07-29 21:49:05 -04:00
VigersRay
5245c5ddcb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
# Resources/migration.yml
2024-06-21 05:04:06 +03:00
Errant
d15eafe133
Survival Box Loadouts, Nitrogen Emergency tanks ( #29131 )
...
* Nitrogen survival boxes
* Zero-setup workaround
* clown box
* cleanup and universal tanks
* cleanup
* more cleanup
* hide loadoutgroups
* remaining survival boxes
* space ninja
* Revert "space ninja"
This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.
* weh
* weh
* undo appearance change of syndicate survival boxes
* indentation fix and missing label
2024-06-21 00:05:01 +10:00
VigersRay
b07e5eb660
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-13 09:47:00 +03:00
Cojoke
865810c6e1
New Sprites for Tranq Shells + Add consistancy to printing Tranqs ( #28903 )
...
* New Sprites for Tranq
* Add consistancy to secfab print
2024-06-12 22:17:35 -04:00
Vigers Ray
47bc851ead
Фикс всех ошибок в validate_rsis.py
2024-06-12 14:15:29 +03:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
Plykiya
cafb41c161
Printable Special Mags and Empty Mags and Material Rebalance for Ammo ( #26178 )
...
* Printable Empty Magazines
* Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes
* Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab
* Adds fully loaded rifle mags at secfab, removes respective cartridges
* Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab
* Adds fully loaded speedloader to secfab, removes respective cartridges from secfab
* small id mismatch fix
* another wrong ID fix
* capitalize Ls in speedloader
* Add missing SpeedLoader recipe
* Adds fully loaded shotgun drums to secfab, removes respective shells from secfab
* add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well
* Moves tranquilizer shells to the non-lethal ammunition research
* Account for the removal of rubbers, adds in craftable disablers
* rubber rounds don't exist, remove empty non-lethal mags to just have empty mags
* Add in WT550 mags
* Convert latheRecipes to use LayeredTextureRect instead of TextureRect
* Fix for issue, texture layering now works
* Add in missing shell uranium box art
* add shelluranium to meta.json
* Fix yml issue
* Get rid of unused single ammo printing unlocks
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-27 20:38:59 +10:00
Ubaser
393bcbfc13
Throwing Knives: Syndicate Kit ( #26026 )
...
* add
* rename
* change damage type and lower price
* 6 tc
* fix?
* missed listing
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-23 15:13:06 +11:00
Moomoobeef
07b796d6d2
Added Evidence Markers for the Detective! ( #25255 )
...
* added evidence markers
* box tweak
* fixed a spelling mistake
* new sprites, tweaked yml too
2024-02-17 15:49:16 -05:00
Emisse
f33307e766
medal case sprite ( #24147 )
...
medal case no longer cigar case lmao
2024-01-16 00:53:10 -07:00
ERROR404
abbb724849
Observation Kit ( #23384 )
...
Observation Kit
2024-01-04 05:36:44 -07:00
Ubaser
432a8f5768
Increase contrast in the medal case sprite ( #23228 )
...
Update icon.png
2023-12-30 11:54:32 -05:00
Ubaser
db74ca0e2c
Add vials ( #22587 )
...
* vial
* yea
* s
* fix something
* yaml
* fixer
* aaaaaaaaaaa
* update
* sprite changes
* a
* fix'd
2023-12-16 09:29:53 -05:00
Ed
786bb79ebc
Pet Carrier (Zookeeper gameplay?) ( #21545 )
...
* add visual
* fix item + entityStorage problem, add generation in maints
* make pet carrier two-handed
* added to cargo
* add resistlocker component
2023-11-13 16:55:47 -07:00
KingFroozy
3f4d9983e3
nitrile gloves ( #21509 )
2023-11-08 13:31:24 -07:00
Ed
aa713ea7e6
Candles ( #21087 )
...
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-11-03 22:53:51 -07:00
Ed
9bb62181de
Added fun: Darts ( #20582 )
...
* add textures
* fix cargo/cargo-fun.ftl
* fix cargo/cargo-fun.ftl again
* update icons and resize hitbox
* really fixed cargo.ftl
* fix soundSpecifier
* balance changes: solution transfer has been reduced from 2 to 1. Now the transfer does not work on targets wearing anything in the outerclothing slot
* add hypodart to uplink
* return of darts solution capacity to 2u
* Update uplink-catalog.ftl
* Update uplink_catalog.yml
* Update darts.yml
* remove hypodart sprite
* Update darts.yml
* Update fun.yml
* add random popups component, resprite dartboard
* localize darts
* fix
* Update darts.yml
2023-10-18 23:55:30 -04:00
brainfood1183
d598ada16f
Omega Cartridges Uplink rounds for CHIMP. ( #15755 )
...
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-02 16:11:04 +10:00
brainfood1183
5f9c6e6ee3
[entity] jonk bot
...
* jonkbot
* copyright
* fix
* fix
2023-04-23 20:32:32 -06:00
AsikKEsel
dce680065d
[Entity] Add new medals ( #15577 )
...
* Add 6 new medals
* Update medalcase.yml
* Update medals.yml
* Update medalcase.yml
2023-04-20 17:54:31 -06:00
deltanedas
2b14e9a99b
[Tweak] Syndi pens are bought in boxes now ( #15190 )
...
* pens are bought in wrappers now
* pro
* maybe
* pro
* pro
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-12 12:44:52 -06:00
potato1234_x
6bfd1d8f11
Missing box icons ( #14891 )
...
* boxes
* holo box
2023-03-30 22:46:06 -06:00
brainfood1183
ad31749b55
Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. ( #14973 )
...
* deskbell, poster rise fix, happyhonk mime inhand fix.
* cancollide: false
2023-03-30 22:32:57 -06:00
lapatison
2257bd3862
Encryption key boxes to the heads lockers. ( #14110 )
2023-03-05 22:32:08 -04:00
brainfood1183
6654558046
happy honk meal box dispenser ( #13490 )
2023-01-22 21:08:16 -04:00
Pieter-Jan Briers
14f8b4e6d5
Use new validate-rsis for workflow ( #12997 )
...
* Use new validate-rsis for workflow
* A
* Add python deps
* --ignore-installed
* Make it only work on RSI changes again.
* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Nairod
50d8ed6c89
Spare headsets for the HoP ( #11954 )
...
* textures and fill yml
* texture meta edit
* box id fix, locker fill, vendor fill
* whitelist fix
2022-10-16 13:21:02 -05:00
Illiux
3722106cd4
Add 2 bottle boxes to chemistry lockers ( #11298 )
2022-09-15 08:17:32 -05:00
Peptide90
79c265efb3
Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box ( #8607 )
...
* fixes box ID/names for mask and gloves. Adds nitrile box
* map update for ID change
* crate fills fix
2022-06-03 22:05:18 -07:00
EmoGarbage404
d953f88530
MRE boxes ( #7726 )
2022-04-30 14:24:37 -07:00
ZeroDayDaemon
4926bc7cda
Gas Masks, Oxygen Tank Correction, and Correct Fills for lockers and survival boxes ( #7589 )
...
* gas mask and oxy and fills and stuff
* Update masks.yml
* Update masks.yml
* i think this is right
* bag variants fill fix
* syndicate gas mask
* Update emergency.yml
2022-04-21 22:11:26 +10:00
Peptide90
bcfb72519c
Adds boxes of all magazine types + box of trashbags and flares ( #6891 )
2022-02-27 12:56:27 -07:00
Lamrr
27c16edb54
Adds shotgun shell boxes ( #6195 )
2022-01-22 13:47:54 -07:00
Zymem
5e1477c91a
Adds briefcase ( #6196 )
...
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-01-17 12:21:28 -07:00
Mith-randalf
050516c17e
Zipties ( #5727 )
2021-12-13 22:17:26 -07:00
Swept
6376e60b78
Massive Food PR ( #3436 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Swept
ece403ca57
Copyright Pass/Pruning | Part 2 - Objects ( #3905 )
2021-04-29 18:09:14 +00:00
Elijahrane
590453a57f
Removed most redundant delays in meta.json ( #3549 )
2021-03-07 20:26:25 +01:00
Swept
a57db85208
Swept commits JSON genocide. ( #2991 )
...
* Clothing Folder Complete
* All Textures 1st Pass
* All Textures 2nd Pass
* All Textures 3rd Pass PLUS Manual Tweaking
* 5th Pass MORE MANUAL
* Fixes flares
* 4th Pass (I skipped over)
* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Swept
7790f8f6f6
Adds hugbox. ( #2826 )
...
* Box and sprites
* Added to clowns fills
2020-12-27 19:24:08 +11:00
Swept
e3ace03cad
Boxes (and sterile mask) ( #1964 )
...
* Added sprites and lights, handcuffs and PDA box.
* Syringe and Beaker
* Adds flashbang latex and a sterile mask
* Adds a box to store those sterile masks
* Adds donkpocket box WHY WASN'T THIS IN ALREADY I'LL KILL YOU ALL AHHHHH
* Makes inhand boxes grey
* Security boxes now have proper layer
* Adds meson, sechud, and better inhands
* Adds survival box (no o2 can or injector because they're not included yet
* Adds survival box sprites
* Blank commit
* Adds filled backpacks for starting-gear
* Moves filled backpacks to a sensible place
* Builds now
* Fixes rsi
2020-09-03 23:13:45 +02:00
