f6da17d7d9
highlights ( #9332 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 19:57:23 +10:00
40eecdd78a
Stamina damage ( #9230 )
2022-07-06 18:06:12 +10:00
d65601f024
Blocking and Shields ( #8584 )
...
* Blocking
* Fixes Bodytype bug
* Blocking Damage Modifier
* Storing bodytype
* Consolidates Stop Blocking code
* Consolidates more methods
* Some cleanup, hitbox fix
* Shield Textures
* Passive blocking modifier check
* Localization, popups, and more cleanup
* Small cleanup
* Relay event
* Fixes a shutdown bug, adds specific containers and sets
* Popups and sounds
* Fixes typo
* Removes whitespace, adds comment
* Some requested changes
* Remove Shared
* Audio fix
* More changes
* More requested changes
* Properly remove on shutdown
* Adds riot shields to seclathes
* SecTech Riot shield
* Constant variable
* Relay transfer to user blocking system
* More destruction behavior
* Adds a shape field
* Riot shield cleanup
* More requested changes.
* Prevents blocking attempt where a user cannot be anchored
* Listen for anchor change
* Unused using cleanup
* More shields.
* Buckler
* Construction
* Linter fix
2022-07-04 16:31:12 +10:00
8b0e8915a8
Hand made pistol replacement and inhands for ak and china lake ( #9198 )
...
* hand made pistol replacement and inhands for ak and china lake
* china lake inhands correction
* change
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-27 19:18:01 -05:00
aaad270146
ak and china lake sprites replacements ( #9110 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-25 12:59:10 +10:00
1c7a09b736
Fire Axe [New syndie item] ( #9088 )
2022-06-23 18:27:28 -07:00
cc755a2051
Projectile spells + fireball spell ( #9058 )
...
* Projectile spells + fireball spell
* say it with some gumption
2022-06-23 03:24:50 -07:00
0b7d22c168
quickfix ( #8942 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-18 13:20:16 +10:00
dfad885e82
Fix large_casing sprite and cobra mag ( #8809 )
2022-06-13 19:30:15 +10:00
63fd01f3bb
Zombie Rework & Polymorph Expansion ( #8413 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-12 15:53:13 +10:00
43dc0be57c
Revamp guns: Revival ( #8675 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 12:39:52 +10:00
fb943a61dc
Gun refactor ( #8301 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
ea498da45d
Captain's Antique Laser Gun and Traitor Objective ( #7940 )
2022-05-09 17:43:36 -07:00
db56d5ef60
Zombies!!! ( #7509 )
...
* wip
* heal on bite
* more fixes and additions
* don't crash
* Update medicine.yml
* zombie claw item and damage resist
* ignoredcomponents.cs
* Add zombie claw, fix infection, add immunities
* fix
* razzle dazzle
* yaml fix
* Update Content.Server/Disease/DiseaseZombieSystem.cs
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
* Update Content.Server/Disease/DiseaseZombieSystem.cs
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
* Update Content.Server/Disease/DiseaseZombieSystem.cs
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
* Update Content.Server/Disease/DiseaseZombieSystem.cs
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
* sdasadsadsadasd
* Generalize DiseaseProgression.cs
* final final final final final final cope seethe
* Update medicine.yml
* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
* Update BloodstreamSystem.cs
* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
* Update Content.Server/Disease/DiseaseZombieSystem.cs
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
* fixing until i die
* folder + zombietransfer fix
* smol fixe
* the smallest of fixes
* aaaa
* Infection timer buff
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-18 17:30:22 -05:00
a231429cb4
Make energy swords use RgbLightController ( #7344 )
2022-04-16 15:11:48 +10:00
52ec5036d5
Another gun PR ( #7450 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-04-15 15:39:16 -07:00
fe4dbfd2f6
C4 ( #7486 )
2022-04-14 15:00:50 -07:00
04792a47de
Mantles, Medals, Changeling Prep ( #7233 )
...
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-27 21:15:39 -07:00
1b0e7ae0f5
Add Modular grenades (chemnades). ( #7138 )
2022-03-25 15:17:29 +11:00
f88fe48a6a
Adds Onestar mech ghost-role enemy ( #6943 )
...
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-12 16:14:17 -07:00
a816bd809c
New battery guns and some resprites ( #6295 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-03-12 15:29:16 -07:00
bcfb72519c
Adds boxes of all magazine types + box of trashbags and flares ( #6891 )
2022-02-27 12:56:27 -07:00
5a03f6fa26
Add Energy dagger ( #6669 )
2022-02-12 21:42:10 +11:00
4d3c085eb7
Adds dedicated salvage specialist role ( #6451 )
2022-02-08 21:01:16 +11:00
3c9328ff99
Adds portable flasher ( #4523 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-07 02:59:41 +11:00
004c678853
Incediary Shells ( #6208 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-31 00:44:45 +11:00
e6f2239afe
Pirate guns ( #6200 )
...
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-01-27 00:01:18 +11:00
6d5eee0d4c
Add ESwords (now Inventory refactor compliant!) ( #6000 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-24 23:55:48 +11:00
5dbe7be294
Fix on-collide explosive collisions ( #6186 )
2022-01-18 19:26:21 +11:00
2a70ba88f7
Adds bola and a crafting recipe for them. ( #6185 )
2022-01-17 12:21:57 -07:00
44d849d3f6
(Re)adds captain's sabre ( #6101 )
2022-01-11 17:50:10 +11:00
72dcef4203
Reduce locker/crate hp and resistances, add spear wielding ( #6001 )
2022-01-03 10:53:09 +01:00
887f667376
Deleting the old laser gun and replacing it with the COG ( #5664 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-12-24 23:32:03 +11:00
e5bf2192cf
New Guns (hopefully no conflicts this time) ( #5105 )
...
* New Guns (hopefully conflict free)
* solving conflicts
* forgot to delete old laser gun png
* Revert "forgot to delete old laser gun png"
This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873.
* small corrections
* carbine
* uplink correction
* cog meta.json correction
* replace laser pistol
* svalinn inhands
* getting rid of my old lasergun
* forgot to delete the old lasergun from yml
* Revert "getting rid of my old lasergun"
This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2.
* Revert "forgot to delete the old lasergun from yml"
This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e.
* base.png and taser fire cost corrections
* last changes for this PR. the c20 and predator sprites. and corrected meta.json
* lowercased
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-11-25 15:37:21 -07:00
3f51ffbd3c
Pneumatic cannons ( #4560 )
...
* basics & visuals
* pneumatic cannon works perf
* loc + popups
* gas tank does stuff + queue changes
* updates
* b
* forcefeeding
* inhand
* crafting!
* pie cannon now is a pneumatic cannon
* oopy
* fix for entman + verbs
* pie
* change for tools
* actual
* combat mode + better sounds
* reviews
2021-11-03 14:33:36 -07:00
62f6c8dd8e
Wieldable/two-handed weapons ( #4554 )
...
* wielding kinda works
* rough out all the edges, wielding works nicely
* popups + loc
* increase damage & extra damage against whitelist
* small fixes
* forgot to actually do that
* reviews
* reviews + thing
* use resistances and not extradamageagainstwhitelist
* slashy
* make increasedamageonwield and melee hit events work with modifiersets
* Silly individual
2021-09-17 07:16:11 -07:00
19551047c8
Spear shows on all sides when on back
2021-09-12 13:16:29 -07:00
8fa7f902a1
Add basic meteor swarm ( #4420 )
...
* Add basic meteor swarm
* Map fixes
* Dependency cache
* Fix projectile crash
* Last of the reviews
2021-08-23 13:28:47 +10:00
030c4a07ce
Can now equip fireaxe, claymore, spear and baseball back on your back ( #4484 )
...
* Can equip spears and claymores on your back now
* Adds fireaxe and baseball bat back equip
2021-08-17 19:42:50 -07:00
c55f3fd478
Adds mapped storage for lots of entities + a botanical belt ( #4342 )
...
* Cleans up belt stuff and some sprites
* Tag cleanup and sheathed sword
* Adds plant belt for botany chads and maps it's items
* CE belt, will most likely child it to utility instead
* Merges belt_icon and belt_mob into the same RSI
* Cut out alpha layers for wirecutters
* Added lots of equipped-BELT sprites for various items
* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
1188d3bafb
Added claymore as a weapon ( #4124 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-06-09 05:21:08 +00:00
ece403ca57
Copyright Pass/Pruning | Part 2 - Objects ( #3905 )
2021-04-29 18:09:14 +00:00
84d83d1902
Slight fixes for sabre and machete inhands
2021-04-28 16:31:47 -07:00
ebec1b7dcf
Inhands for pistols, beakers, reworked melee weapons and laser gun ( #3887 )
...
* new pull
* beakers
* melee
* ffs
* hope this works
* ffffff
* Update meta.json
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-28 21:14:27 +00:00
0cccde9126
Ammunition boxes code quality ( #3790 )
...
* Boxes
* Reorganizes the YAML
* Reverts to previous commit and fixes the icons.
* Readds the new CLRifle.rsi as it'll be used soon.
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-04-15 21:15:12 +00:00
478dab4b88
Reworked sprites, inhands and new melee weapons ( #3691 )
...
* reworks
* added the rest
* reworked the machete handle
* reworked the icon for the machete
* ok. last one
* .
* .
* replaced machete and knife sprites (again)
* the meta.json
* license
* ffs
* final
* bs
* .
* .
* got rid of the machete and bat
* fuck
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-04-10 16:34:45 +00:00
b5f6f43aaa
Fixes pie cannon ( #3797 )
2021-04-04 13:13:19 +02:00
587d3fa7b9
Debug SWEPs ( #3755 )
2021-04-02 10:54:08 +02:00
d505ce1409
Adds creampie launcher
2021-03-21 18:08:42 +01:00
08f44050fe
Laser gun for security ( #3632 )
...
* laser gun
* filled up the energy depletion overlay
* small sprite correction
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-03-15 10:53:16 +01:00
TaralGit
metalgearsloth
keronshb
EmoGarbage404
Kara
Emisse
Leon Friedrich
Alex Evgrashin
T-Stalker
Peptide90
Fishfish458
Lamrr
ScalyChimp
Júlio César Ueti
Swept
Vera Aguilera Puerto