Vigers Ray
|
3355febe9b
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
|
2025-02-09 22:17:22 +03:00 |
|
slarticodefast
|
11e5d59171
|
HOTFIX: fix minibomb implant and syndicats not exploding (#34923)
fix minibomb implant not exploding
|
2025-02-06 16:17:58 +01:00 |
|
Vigers Ray
|
28ba3e857b
|
Фикс выпадение предметов с импланта хранилища в апстриме
|
2025-01-20 06:07:01 +03:00 |
|
Winkarst
|
b09cd1ca8c
|
Make storage implant drop items on gibbing (#33493)
* Make storage implant drop items on gib/removal
* Better way
* Fix error
* Forgotten trash
* Cleanup
* Unused var
* Update Content.Server/Implants/ImplantedSystem.cs
Co-authored-by: 0x6273 <0x40@keemail.me>
---------
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>
|
2025-01-19 11:48:58 -08:00 |
|
keronshb
|
671324bef8
|
Implanters and Subdermal Implants (#11840)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-11-20 17:49:37 +11:00 |
|