git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Arendian <137322659+Arendian@users.noreply.github.com>
	Thu, 14 Dec 2023 03:30:42 +0000 (04:30 +0100)
committer	GitHub <noreply@github.com>
	Thu, 14 Dec 2023 03:30:42 +0000 (22:30 -0500)
commit	3e766402b9d6c17f41f9e7e814b70eef83a95568
tree	02085b5598c6cbbec434b29004b528043e9bc950	tree \| snapshot
parent	286af5dcb1f0d7bdd0804e75de47b7dea0ff253c	commit \| diff

Cluster grenades for uplink and security (#22029)

* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment

36 files changed:

Content.Server/Explosion/Components/ClusterGrenadeComponent.cs		diff \| blob \| history
Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs		diff \| blob \| history
Content.Server/Projectiles/ProjectileSystem.cs		diff \| blob \| history
Content.Shared/Projectiles/ProjectileComponent.cs		diff \| blob \| history
Resources/Locale/en-US/store/uplink-catalog.ftl		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml		diff \| blob \| history
Resources/Prototypes/Catalog/uplink_catalog.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml		diff \| blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-soaplet.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/primed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/base-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/base-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/primed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/equipped-BELT.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/primed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/equipped-BELT.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/primed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom