Commit Graph

1555 Commits

Author SHA1 Message Date
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
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 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
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
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
Izac Joof Forsgren ec13c2c57d Merge branch 'master' into izac-voreupdate 2020-05-16 09:02:59 +02: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
Razgriz 95439574ae Recoil knockdown for micros 2020-05-08 21:36:21 -07:00
Razgriz 9a493e4ceb Recoil knockdown for micros 2020-05-08 21:33:10 -07:00
Razgriz 1b2695fde6 Recoil knockdown code for micros
From old chomp: https://github.com/CHOMPstation/CHOMPstation/pull/619

Code to make anyone under 50% take recoil damage (5 brute - your size * 2; so at 50% thats 5-1)
Also makes tinies fall down from firing guns.

First step in giving being a micro combat downsides for being so hard to hit.
2020-05-07 02:10:04 -07:00
Aronai Sieyes d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -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
Atermonera 76177da0f9 Merge pull request #7072 from Mechoid/BrokenGunExamine
Fix Broken Gun Examining
2020-05-05 17:09:57 -04: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
Killian 24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01: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