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
Aronai Sieyes
874baa1d2d
Merge examine refactor for vorestation
2020-04-29 17:49:54 -04:00
Atermonera
f1cabd6742
Removes limits on eating, centralizes nutrition changing.
2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
Unknown
47e2e1a2e4
Removes duplicate var
2020-04-27 17:12:41 -04:00
Unknown
356fe4fced
Fixes Kisuke's gunsword
2020-04-27 17:10:59 -04:00
Natje0
85b1d7fb2b
Removes Healrod due to MISTAKES MADE
...
I managed to push the wrong sprite sets. This one's nearly impossible to see the charge meter of, and is just... Obnoxious.
Additionally, I've got new plans of how to make this darn thing, and thus I'm scrapping this project in favor of a new one! Thiiink I got all of them.
2020-04-27 00:37:05 +02:00
Natje0
c488039c32
Adds the Healrod, atm just a resprite ( #7359 )
...
* On-back healrod
* Left hand
* Right hand
* Gun icon
* Adds the Healrod (unfinished code)
All credits to zapzapper
* Fixes wrong directional sprite
* Makes healrod just a retextured ML3M... for now.
* Update code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm
Co-Authored-By: Aronai Sieyes <arokha@arokha.com >
Co-authored-by: Natje0 <Natje0@users.noreply.github.com >
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2020-04-24 21:06:39 -04:00
