Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07: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
b05e94f4b3
Fixes broken guns
...
Exam now reveals the name of the parts needed instead of the path
2020-09-07 15:23:43 -07: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
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
Razgriz
2eaa4935f1
Fix micro recoil AGAIN
...
Greater than is hard.
2020-08-23 18:13:48 -07:00
Razgriz
90267f9bce
Fix recoil again
...
Greater than/less than. UGH.
2020-08-23 17:44:19 -07:00
Nadyr
af1e935ae7
Merge pull request #500 from LunarFleet/Lun-Merc
...
Flechette merc nerfs
2020-08-19 05:29:53 -04:00
LunarFleet
843e2f36d4
Fixes my own stupidity
2020-08-18 08:19:33 -04:00
LunarFleet
1617ac4627
Flechette merc nerfs
...
Praise
2020-08-17 10:58:14 -04: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
Razgriz
f4bcee3d93
Another micro recoil fix
...
Added a new line for checking if the gun even has recoil or to skip if it's 0.
2020-08-10 19:43:27 -07:00
Razgriz
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
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
Razgriz
1e4d47de77
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:43 -07:00
Izac Joof Forsgren
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
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
ForFoxSake
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
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
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
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
Atermonera
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
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
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
