Commit Graph

1602 Commits

Author SHA1 Message Date
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
e3953467d8 make buckshot not destroy walls instantly 2020-11-06 20:56:21 -08:00
Cadyn
6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Cadyn
67499d28c5 Ballistics v2 draft v2
Introducing debugging messages and actually working ballistics
2020-11-02 18:03: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
13e5149a84 Actually turn that back 2020-10-22 00:10:31 -07:00
cadyn
4e362a2742 Getting rid of qdel
Got rid of qdel and made dusting conditional on maxHealth
2020-10-22 00:05:55 -07:00
Cadyn
e14dd48263 Blitz rods 2020-10-14 16:14:40 -07:00
Sym
18bc6fb6e3 Xenomorph Balancing Act 1.1
Simple balances and fixes due to a recent event.

- Changed plasma cost for laying eggs, from 75 to 200.

- Changed Agony damage of neurotoxin, from 80 to 60.

- Finally fixed the fact that xenomorphs cannot see in the dark. Xenomorphs can now see turfs and mobs, but lose some range when in the dark.

- Changed ability name Gut to Slaughter, to more accurately describe what it does.
2020-10-10 21:27:48 -04: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
cadyn
caaebe4f36 Fixes broken guns (#7635)
Broken guns now reveal names of parts needed instead of paths
2020-09-11 03:13:38 -04: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
Kates
7177686b57 Bring shotgun slugs AP potential to 20% (#7621) 2020-09-05 11:11:34 -04: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
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