Commit Graph

905 Commits

Author SHA1 Message Date
Cadyn
5e9735fbac Touching up everything. 2021-02-04 23:31:13 -08:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Cadyn
5364a0b965 Final touches 2021-01-19 18:56:14 -08:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
Razgriz
c861148393 Fix X01 stun projectil
It starts out as a taser beam. When you cycle through the modes and come back to the stun setting, it starts shooting an electrode instead. This fixes that and sets it back to the taser beam.
2021-01-12 00:59:19 -07:00
Razgriz
e7726e9d4f Remove micro recoil for OG Phaser 2021-01-04 17:54:31 -07:00
Razgriz
26e70c41fd Remove micro recoil for particle guns 2021-01-04 17:53:46 -07:00
Razgriz
279d93de3d Remove micro recoil from phasers 2021-01-04 17:52:56 -07:00
Shadowfire
7efe6f2cad Auto stash before rebase of "CHOMPStation2/master" 2020-12-18 17:02:15 +01:00
Shadowfire
6b70b133ba Christmas time is once a year..
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
2020-12-17 17:20:24 +01:00
cadyn
26d1977857 Merge pull request #941 from cadyn/fixbullets
Ballistics v3.1 Balancing and fixes
2020-11-30 10:50:19 -08:00
Cadyn
670017d41b Ballistics v3.1 2020-11-29 04:51:18 -08:00
Novacat
95525fa8e4 Merge pull request #9372 from VOREStation/upstream-merge-7761
[MIRROR] Arm-Laser rebranding.
2020-11-27 23:11:28 +00:00
Razgriz
5c3991ef47 Change phaser beam-type
Because FUN FACT: Phasers were actually using regular beams.

After looking through the code during my gun and spear size PR, I made the realization that there are two types of phasers, but we were all under the impression that they only did 5 damage to people and full damage to mobs. This is true of phasers. However the Frontier Phasers are a Virgo weapon and apparently are not phasers at all, they are lasers, and do indeed use lasers, NOT phasers. So I am fixing that.

Pros of change:
-I created a new beam type for the phaser beam. The OG Phaser uses a short-ranged, slow-moving projectile. So I made that, but made it look like the default laser beam. I also copied the damage numbers, so you do lots more damage to animals now.
-You won't friendly fire people as badly because people were under the impression that these only did 5 damage to people.

Cons:
It won't do its full damage potential vs. non-animal MOB_CLASS, i.e. mercs and mechs.
2020-11-24 03:11:29 -07:00
Razgriz
f0ace37d4f Spear and Gun sizes
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
2020-11-23 19:29:48 -07:00
cadyn
148ce00235 borkfixes 2020-11-21 08:09:11 -08:00
Cadyn
7f1579061b Ballistics v3 2020-11-19 17:02:22 -08:00
Razgriz
e4e0b08da6 Merge pull request #788 from cadyn/ballistics-v2
Ballistics v2
2020-11-11 19:32:40 -07:00
Razgriz
2e94257252 Merge pull request #777 from cadyn/gunoverhaul
Cadyn's ballistics overhauls part 1
2020-11-11 19:32:20 -07:00
cadyn
d5d50d90bf charging_handle to charging handle reee 2020-11-08 13:49:33 -08:00
Cadyn
6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Cadyn
b3ba48084f Ballistics v2 draft 2020-10-31 12:21:21 -07:00
cadyn
109f8c9b13 Merge branch 'master' into tweakfixes 2020-10-28 21:33:40 -07:00
Razgriz
d88ccdabf6 Merge pull request #759 from CHOMPStationBot/upstream-merge-9207
[MIRROR] [MIRROR] Phoron bore utility improvements
2020-10-28 20:21:26 -07:00
Cadyn
241e386284 Cadyn's ballistics overhaul part 1 2020-10-28 19:39:50 -07:00
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
Verkister
57adb0bfca Merge pull request #9207 from VOREStation/upstream-merge-7680
[MIRROR] Phoron bore utility improvements
2020-10-27 08:16:22 +00:00
Nadyr
4835643840 Merge pull request #586 from cadyn/blitzrods
Blitz rods
2020-10-24 01:07:02 -04:00
Darlantan
207a60216c Confetti cannon tweak
Fixes a grammatical error in the confetti cannon.
2020-10-22 08:08:44 -04:00
Cadyn
e14dd48263 Blitz rods 2020-10-14 16:14:40 -07:00
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