izac112
8638f08f92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-12-06 13:31:12 +01:00
Atermonera and VirgoBot
b3067ab629
Merge pull request #7761 from Mechoid/ArmLaserUniquify
...
Arm-Laser rebranding.
2020-11-26 14:27:58 -05:00
izac112
5d64303087
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-11-17 16:26:30 +01:00
Cyantime and VirgoBot
f5a1bdbea2
Phoron bore utility improvements
2020-10-12 00:01:21 -04:00
izac112
03f0165bd3
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-29 05:56:00 +02:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Kates and VirgoBot
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
cadyn and VirgoBot
caaebe4f36
Fixes broken guns ( #7635 )
...
Broken guns now reveal names of parts needed instead of paths
2020-09-11 03:13:38 -04:00
Kates and VirgoBot
7177686b57
Bring shotgun slugs AP potential to 20% ( #7621 )
2020-09-05 11:11:34 -04:00
Atermonera and VirgoBot
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 and VirgoBot
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 and VirgoBot
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
Razgriz and GitHub
2eaa4935f1
Fix micro recoil AGAIN
...
Greater than is hard.
2020-08-23 18:13:48 -07:00
Razgriz and GitHub
afe34a1aff
Recoil mode check
...
Actually it just occurred to me that if you do have recoil_mode = 0 on any gun, it would go through with displaying the message that you dropped it anyway, even though you wouldn't because of the math.
2020-08-10 19:18:49 -07:00
Razgriz and GitHub
6f1e27474a
Fix for energy guns not having recoil for micros
...
Accidentally left a bit of code in there that would cause the recoil to ignore energy guns entirely. It should now cause the micro to drop the gun and finally reach the 'else' part of the code.
2020-08-10 18:54:47 -07:00
Izac Joof Forsgren and GitHub
c024fef379
Merge branch 'master' into master
2020-08-10 23:15:30 +02:00
izac112
81871a960e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-10 21:50:42 +02:00
SplinterGP
d36e38d5c7
fixes a space bar that was put in there somehow *sigh*
2020-08-10 16:32:06 -03:00
SplinterGP and GitHub
d97988037b
fixes oopsie xD
2020-08-10 14:23:04 -03:00
SplinterGP and GitHub
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
ForFoxSake and VirgoBot
ed1d9a8a04
Adds tg-style fast(ish) magazine restocking. ( #7391 )
...
* Allows magazines to be reloaded automatically from piles of bullets.
* Fixes usr, adds changelog.
2020-08-06 14:24:03 -04:00
Mechoid and VirgoBot
c20bab52d4
Exosuit Modular Internals, The Squeakening
2020-08-05 19:22:23 -04: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 and GitHub
cd357dafd4
Update crossbow.dm
2020-07-14 01:18:35 -04:00
Cerebulon and VirgoBot
f1f2196077
Flavour Enhancement: Guns
2020-07-13 23:06:11 -04:00
izac112
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
Atermonera and VirgoBot
3c16520a60
Merge pull request #7325 from Mechoid/FixTheStunShotsAgain
...
Fix runtime in projectile.dm, 664.
2020-07-09 18:27:21 -04:00
izac112
22880f526d
Voreupdate
2020-07-02 15:39:00 +02:00
Atermonera and VirgoBot
15157be321
Merge pull request #7311 from Mechoid/FixTimingError
...
Fix timing error that allowed processing to reference a nulled list.
2020-06-29 01:26:26 -04:00
Atermonera and VirgoBot
69ac9d894f
Merge pull request #7281 from Mechoid/BulletPenFix
...
Fix Penetrating Bullet Double-Jeopardy
2020-06-16 03:25:47 -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
be538243c1
various fixes
2020-05-27 22:43:33 +02: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
2461737756
No idea why its called boxes
2020-05-25 15:31:11 +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
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
izac112