phil235
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
phil235
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
phil235
d0e9a5c0c9
Nerfs the kinetic accelerator.
...
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
phil235
09df1080e9
Some adjustments:
...
Fixes with projectile bump() on border objects.
Fixes some projectile on_hit() not calling the parent on_hit.
Move projectile mob hit check code to mob/CanPass().
Simplifies projectile/CanPass()
Fixes runtime in projectile/Bump()
2015-04-02 17:39:02 +02:00
ACCount12
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
pudl
0964979a90
bitch says she wanna keep her throat warm
2015-03-26 21:16:25 -05:00
pudl
4c51941e6e
reverts an accidental change
2015-03-25 21:12:25 -05:00
phil235
1b3eb49a1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
pudl
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
Jordie
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
phil235
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Swag McYolosteinen
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Fayrik
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
Fayrik
a030c9889e
Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check.
2015-03-20 23:03:06 +00:00
Fayrik
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
phil235
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Cheridan
7149f0382d
Adds Pet Collars!
...
Map needs update now
2015-03-18 21:27:21 -05:00
Menshin
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
phil235
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
Thunder12345
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
Thunder12345
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
Thunder12345
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
Cheridan
e2554c55e6
Merge pull request #8147 from Cheridan/master
...
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
Remie Richards
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
phil235
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
Cheridan
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
Iamgoofball
a51ffe8cd4
fixes #7719
...
welp
2015-02-13 20:08:01 -08:00
Cheridan
14c9abaaee
Merge pull request #7539 from Iamgoofball/kinetic
...
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
phil235
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
Swag McYolosteinen
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
Remie Richards
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
Iamgoofball
791381394c
Ports the kinetic accelerator changes from NT
2015-02-03 21:19:30 -08:00
paprka
6108f10b63
removes range from ebow bolts
2015-02-01 03:56:23 -08:00
Incoming
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
Cheridan
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
Swag McYolosteinen
ab0518ef55
Merge pull request #7203 from Delimusca/theyshootback
...
Night of the living deathwands
2015-01-24 13:55:09 +01:00
pudl
08f8bb3ce8
replaces all instances of pacid with facid
2015-01-21 20:17:23 -06:00
Delimusca
07927e759d
added ranged mimic
2015-01-19 11:44:34 -07:00
phil235
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
paprka
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Cheridan
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Nienhaus
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06:00
tkdrg
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
paprka
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
tkdrg
a0bbf25dda
Changes the practice beam name to "practice laser"
...
Fixes #6729
2015-01-01 17:49:12 -03:00
tkdrg
dc6f1895fe
Merge pull request #6608 from paprka/disablerrebuff
...
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
paprka
ad188e2e4d
additional buff
2014-12-26 21:00:13 -08:00
paprka
69c22e99a9
reverts disabler nerf
2014-12-26 20:53:53 -08:00
paprka
19f9da1a99
disabler now makes a sound when it hits
2014-12-26 20:29:52 -08:00
paprka
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
