Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
Nadyr
595562e044
Merge pull request #560 from MisterGrimm/master
...
Changing Sickshot desc and info_desc
2020-10-01 00:01:47 -04:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
Sym
3df5413300
Changing Sickshot desc and info_desc
...
The Sickshot states in its description that it can stun, and because of that implies that it is a self defense weapon. It is not a self defense weapon, as it only does 5 burn damage and causes some very minor confusion, not stuns. Its true use is to forcibly expel the contents of stomachs, so the description has been changed to make that a bit more obvious.
Also for some silly reason the sickshot doesn't live in a normal weapon file, so I have to edit the sickshot_vr to make this work. Not much I can do about that.
2020-09-25 14:50:43 -04:00
Kates
19aa0200db
Improve gun animations to be more modular. ( #7645 )
...
* Improve gun animations to be more modular.
- This is a port of TGCM pull/4807. Credit to SplinterGP for helping me set things up.
- It essentially allows people to not need a '-pump' for their animation, but instead to just use whatever they please. They just need to write it down at the relevant intervals.
* Improve further.
* Update shotgun.dm
2020-09-20 06:51:14 -04:00
izac112
9d8f2623de
More thingus
2020-09-14 14:09:52 +02:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Darlantan
09768ea90c
Confetti cannon
...
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
2020-09-05 07:15:49 -04:00
Darlantan
1b220d1cd4
Revert "Check-out commit"
...
This reverts commit dc957fe40b
2020-09-02 03:16:25 -04:00
Darlantan
dc957fe40b
Check-out commit
...
Committing now so I can work on other things
2020-09-02 03:10:18 -04:00
Atermonera
fb4d02df3d
Merge pull request #7561 from Mechoid/ProjectileUpkeep
...
Projectile Upkeep
2020-08-31 18:23:39 -04:00
Unknown
10ca73bc6e
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576
2020-08-28 13:30:54 -04:00
Atermonera
57bc515c04
Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
2020-08-27 22:28:46 -04:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Atermonera
b2250d9b47
Improvements to mech missiles.
2020-08-25 19:16:57 -04:00
ShadowLarkens
097d4fa283
TGUI Research
2020-08-25 13:30:47 -07:00
LunarFleet
0389cc8d0f
Forgot the charging change; made sure cells cannot be used on corpses unless it is corpsemend.
2020-08-14 09:19:05 -04:00
LunarFleet
5e22710209
Take two
2020-08-13 09:54:11 -04:00
SplinterGP
d36e38d5c7
fixes a space bar that was put in there somehow *sigh*
2020-08-10 16:32:06 -03:00
SplinterGP
d97988037b
fixes oopsie xD
2020-08-10 14:23:04 -03:00
SplinterGP
e2dca93f48
Merge branch 'master' into master
2020-08-10 14:20:36 -03:00
RadiantFlash7
3a7213a95d
fixes Gauss sprites+maintlattice next to elevator
...
Fixes lattice placement next to elevator to allow climbing up and down, instead of being over a wall.
Hopefully fixes gauss rifle sprites being missing.
2020-08-09 21:40:14 -04:00
SplinterGP
3a5595e366
guuns!
2020-08-09 04:24:50 -03:00
izac112
38288b15c6
Voreupdate (small)
2020-07-27 06:34:28 +02:00
SplinterGP
7a2de0520d
Weapons changes
2020-07-20 22:12:01 -03:00
izac112
0f05106e95
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-15 12:27:54 +02:00
Novacat
cd357dafd4
Update crossbow.dm
2020-07-14 01:18:35 -04:00
Cerebulon
f1f2196077
Flavour Enhancement: Guns
2020-07-13 23:06:11 -04:00
izac112
0d1fe7d706
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-30 16:01:43 +02:00
Aronai Sieyes
39935255e4
VS: KHI rail pistol
2020-05-28 16:47:50 -04:00
Aronai Sieyes
cff9440d2e
Tweak railguns, add flechette pistol
2020-05-28 16:47:07 -04:00
izac112
9bbc812fdf
more touch ups
2020-05-25 15:53:16 +02:00
izac112
7339c768ea
mag and round cleanup
2020-05-25 15:47:44 +02:00
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
SplinterGP
fcd2844540
nerfs charge cost and fire delay at taser mode
2020-05-21 15:49:12 -03:00
SplinterGP
c270fd23a4
Removes unneeded code
...
Co-authored-by: Izac Joof Forsgren <izac10@live.com >
2020-05-21 12:41:46 -03:00
SplinterGP
c2b89869f7
Adds olds style net gun back as a new one
2020-05-20 19:58:25 -03:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
izac112
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
Teletubby2
dc64755e52
ok
2020-05-09 19:49:02 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
Aronai Sieyes
7560ff2c5a
Merge pull request #7644 from TeleTubby2/bazingabeamnatje
...
Adds Natje's Curabitur Cannon
2020-05-05 13:11:38 -04:00
Teletubby2
709619fc9a
Back sprite. fixes.
...
rusty boooys
2020-05-05 11:26:10 -04:00
Aronai Sieyes
1fb36dbcaf
Bluespace Harpoon Tweaks
...
Random failure is lame, but so is removing gameplay.
2020-05-05 09:56:49 -04:00
Teletubby2
feb2f7da36
adds Natje's bazinga beam
...
I forgot how much gun code sucked.
2020-05-05 06:37:18 -04:00
Mechoid
7066d04df5
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
Unknown
9c22a1847e
More Gunbuster Fixes
2020-04-30 20:32:39 -04:00
Unknown
4dde4e4021
More Kisuke gun fixes
2020-04-30 20:12:11 -04:00
Aronai Sieyes
b3c1cfd29d
Merge pull request #7516 from VOREStation/upstream-merge-7045
...
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
