Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
(cherry picked from commit 11bbf2b0204781e28ce42262413350ac5ad9c05c)
* Bullet Class indicators
* New Practice Sprite
* Removed re-specified values
* fixes up whitespace to get this merged
---------
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
(cherry picked from commit b85a9d76883aa7df022eccda76da9152ff5b8da0)
* allow plungers to be fired by bows and embedded into entities
* fixed bow being able to shoot every object
(cherry picked from commit 0f85e10747e3ab3c99b6e300802658cbe343c5f9)
* working on depleted uranium shotgun ammo
* added depleted uranium to more ammo
* Last changes and additions
* Forgot something, theoretically resolved the merge conflict too
* Nerfed the DU munitions, renamed em to uranium because it's not really DU
* made the ammo more expensive, also fixing the crash at the same time
* Fixed the last error, theoretically at least
* Revert "Fixed the last error, theoretically at least"
This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.
* copyright changes, small sprite changes, last references of depleted uranium removed
* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"
This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.
* Update meta.json
* Update meta.json
* Update lathe.yml
* Update arsenal.yml
* Removes old inhand visuals from e_sword.rsi and its meta.json
* Adds new visuals with a longer blade for the e sword
* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands
* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)
* Removes old desword sprites and modifies meta.json
* Temporarily removes esword blade sprites
* Adds back esword sprites after modifying them to flash instead of shimmer
* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them
* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict
* Removes blade inhands
* Adds back blade inhands
* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
* 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
* DB texture on back changed
* cheese
* test
* CR20 Syndie Sling
* NT slings implemented
* finished SMGS, starting on Laser Weapons
* added more laser slings
* laser weapons done
* small changes to laser weapons and pie cannon slings
* added chinalake and l6 slings
* finished launcher catagory, almost finished rifle catagory
* almost done, just missing the heavy sniper
* Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af
* all slings done
* added copyright to the .meta files
* Revert "cheese"
This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a.
* fixed sln file, in theory at least
* bones, gladiators, milk, spear and tears
* :trollface: my copy/paste python script did the funny
* forgor
* fixed
* mat.yml fixed
* bones
* bone armor
* gladiator uniform now in clothesmate like ss13
* bone armor craft
* pieces
* i was dumb in the past, now im dumb too
* that was dumb...
* fixing stuff
* i hate git
* Revert "i hate git"
This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.
* Revert "fixing stuff"
This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.
* this will work?
* i fucking merged it
* Solutions on thrown spears/shot arrows
Spears inject their solution on thrown hit.
Arrows now have 5u solution storage that is injected when it hits target.
* Whoops, wrong arrow.
Instead of base arrow, I accidentally modified the 'regular arrow'
* spear and arrow solution graphics
Spears and arrows now show what they are doped with when they are on ground. (just like beakers)
* Added basic alternative fire mode system for the CHIMP
* Redesign of the CHIMP handcannon
- the CHIMP now has an internal rechargable battery (10 shots at 100% charge)
- it has three alternative fire modes, one for each particle type, that its user can easily switch between
- syndicate scientists have access to an experimental version which can also fire omega particles (4 TC)
- each particle type now has a distinct color and damage type: delta (red): heat, epsilon (green): radiation, zeta (yellow): shock, omega (purple): heat + radiation. This affects A.P.E.s as well
- CHIMP particles now do 10 damage (up from 5)
- all CHIMP particle cartridges have been removed from the game (including the syndicate omega particle ammo pack)
* Code revisions
* Code revisions
- Removed changes to particle damage and damage types
- The experimental CHIMP was removed from the syndicate uplink and replaced with an upgrade kit, which when used on a standard CHIMP will convert it to an experimental one
* Code revisions
- Added a 2 second DoAfter for applying the upgrade kit
* Fixed spelling mistake
* Update projectiles.yml
Removed commented code
* Update Content.Server/Weapons/Ranged/Systems/AlternativeFireModesSystem.cs
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Code revisions
- Implemented changes requested by EmoGarbage
- Removed UpgradeKitComponent in favor of using a construction graph
- Renamed AlternativeFireModesComponent.cs to BatteryWeaponFireModesComponent.cs
Textures
- Reverted omega particle to being a green color
- Epsilon particles are now a cyan color
* Added comments
* Revisions
- Moved BatteryWeaponFireModesComponent from Shared to Server
- Restricted access to this component to BatteryWeaponFireModesSystem
- Changed the CHIMP upgrade kit to a chip
- Updated the localization files to reflect this change
* Delete interaction-upgrade-kit-component.ftl
This file is no longer needed
* Update battery_guns.yml
Added new description for the experimental CHIMP
* Update battery_guns.yml
Updated experimental CHIMP description again...
* Fixed issue with ItemComponent
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Changed all PKA sprites, added wield sprites, modified meta.json
* Added animation assets for future yaml'ing. Made changes to existing textures.
* meta.json changes
* Corrected arsenal.yml missing sprite
* Removed unused animation assets.
* Put back the one animation asset I was suppose to keep.
* Added Combat Baton
* Add to secfab
* reduce damage to 15
* Renamed to Truncheon, set damage to 17 again.
* Added T2 research, up dmg to 18 cause it'll be rarer.
* Make recipe dynamic
Ed
IProduceWidgets
Boaz1111
Emisse
MaloTV
zzylex
Alekshhh
Nemanja
Stanislav4ix
PoorMansDreams
Debug
KittenColony
RiceMar1244
Flareguy
deltanedas
Arendian
PixelTK
Psychpsyo
Jackal298
Tunguso4ka
drteaspoon420
Kara
Nim
chromiumboy
TaralGit
AlexMorgan3817
kxv
metalgearsloth
Errant
Vordenburg
Jessetriesagain
HerCoyote23