ca9f31a0e3
* Unified the firing proc for energy and ballistics mech guns
...
* Fixes incendiaries bullets runtiming on qdel
2015-03-17 23:58:03 +01:00
8a780e89bf
Overloading improvised shells
...
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
2015-03-11 11:41:26 +00:00
56ab83d4e7
Ion shell updates
...
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
2015-03-10 14:42:08 +00:00
a1a5edd314
FRAG-12, ion, improvised shotgun shells
...
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
2015-03-10 13:57:54 +00:00
e2554c55e6
Merge pull request #8147 from Cheridan/master
...
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
736ffafa55
Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll
...
Conflicts:
code/game/gamemodes/blob/blobs/blob_mobs.dm
code/game/gamemodes/blob/blobs/core.dm
2015-03-01 00:18:19 +00:00
d4711bbc72
Fixes taser stun duration to be back to normal, also jitter animation now only starts after the mob falls to the ground.
2015-02-25 15:24:06 +01:00
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
a51ffe8cd4
fixes #7719
...
welp
2015-02-13 20:08:01 -08:00
14c9abaaee
Merge pull request #7539 from Iamgoofball/kinetic
...
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
5b7a0b0358
Fixed the jitter effect of the taser (it was broken). Hulks now don't jitter when stunned but scream. Humans and monkeys jitter immediately after getting tazed and only fall after 2 seconds.
2015-02-13 22:53:47 +01:00
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
5b2d3ceada
Allows overminds to reroll their chemical at a cost, fixes blob cores being invisible, repaths blob mobs to /hostile/blob
2015-02-08 01:22:51 +00:00
791381394c
Ports the kinetic accelerator changes from NT
2015-02-03 21:19:30 -08:00
6108f10b63
removes range from ebow bolts
2015-02-01 03:56:23 -08:00
31b84ca71f
changes how the bolt of door creation works so it behaves expectedly on shuttles
...
adds butterflies to the staff/wand of change/polymorph since I'm here.
Removes two colons
2015-01-29 16:30:31 -05:00
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
ab0518ef55
Merge pull request #7203 from Delimusca/theyshootback
...
Night of the living deathwands
2015-01-24 13:55:09 +01:00
08f8bb3ce8
replaces all instances of pacid with facid
2015-01-21 20:17:23 -06:00
07927e759d
added ranged mimic
2015-01-19 11:44:34 -07:00
9e8531448a
Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name.
...
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.
The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
2015-01-15 00:56:50 +01:00
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06:00
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
a0bbf25dda
Changes the practice beam name to "practice laser"
...
Fixes #6729
2015-01-01 17:49:12 -03:00
dc6f1895fe
Merge pull request #6608 from paprka/disablerrebuff
...
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
ad188e2e4d
additional buff
2014-12-26 21:00:13 -08:00
69c22e99a9
reverts disabler nerf
2014-12-26 20:53:53 -08:00
19f9da1a99
disabler now makes a sound when it hits
2014-12-26 20:29:52 -08:00
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
615f3f3488
Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd
...
Conflicts:
code/modules/mob/living/damage_procs.dm
code/modules/projectiles/projectile.dm
2014-12-26 16:14:19 -08:00
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
10695c16b0
fixes everything, updates jitter amount
2014-12-15 01:00:53 -08:00
1fd9e6bfda
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
ddfac78cf2
initial commit for adding jitteriness for electrodes
2014-12-14 21:47:29 -08:00
ea69908122
Buff mech smg bullets a little, added changelog
2014-12-13 23:31:46 -08:00
a0476d975e
Movin' house
...
Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
2014-12-11 21:23:15 +00:00
8e2dc381ed
FRAG-12 + admins.txt
...
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
2014-12-11 21:16:45 +00:00
2315660b9f
added range to the 40mm grenade
2014-12-10 23:57:12 -08:00
dc01a092af
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
6b474784e5
Reverts ebow stun nerf, buffs the range
2014-12-10 01:49:46 -08:00
e53f8294d7
initial commit for nerfing ranged stuns
2014-12-10 00:16:53 -08:00
b01e6ba882
Generic names and buffs
2014-12-08 16:49:48 -08:00
bcf6fe2a69
adds c90 and bulldog to summon guns, fixes 40mm flames
2014-12-08 02:04:32 -08:00
94c5ea931d
functional grenade launcher shooting
2014-12-08 01:22:27 -08:00
d082cdd383
commit for grenade launcher moving
2014-12-08 00:30:10 -08:00
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
1a591f06e7
c90gl improvements for code, added grenade launcher as a stand-in for now
2014-12-05 20:20:45 -08:00
Menshin