nik707
|
107bb36253
|
Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104
Fixes neurotoxin stunning non-carbons
|
2019-10-22 16:47:53 -05:00 |
|
deathride58
|
f7cf10853e
|
Merge pull request #8894 from Citadel-Station-13/tgfusion
T G F U S I O N
|
2019-10-21 21:17:16 -04:00 |
|
BlackMajor
|
cebdc1414f
|
Merge pull request #9540 from YakumoChen/laser-minigone
Reverts #9189 (Laser Minigun)
|
2019-10-22 13:36:45 +13:00 |
|
kevinz000
|
69a125d996
|
Update neurotoxin.dm
|
2019-10-21 14:41:40 -07:00 |
|
YakumoChen
|
e39a087dc8
|
remove beam
|
2019-10-20 03:09:32 +00:00 |
|
deathride58
|
50c27df28f
|
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-15 03:48:44 -04:00 |
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
kevinz000
|
6fa6502b75
|
Merge branch 'master' into tgfusion
|
2019-09-28 00:35:50 -07:00 |
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
kevinz000
|
39beca1a0f
|
Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
|
2019-09-13 10:47:15 -07:00 |
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
Sishen
|
d9fff579b1
|
damage and stamina balances
|
2019-08-31 17:39:51 -04:00 |
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|
Sishen
|
47ee3a8a6d
|
fuck
|
2019-08-28 23:56:08 -04:00 |
|
Tupinambis
|
3b2be43bd8
|
Slightly increased rubbershot damage from 12.5 to 15 per pellet.
|
2019-08-27 18:35:08 -05:00 |
|
Tupinambis
|
13638ed5d6
|
Reverts some changes I deemed unneccesary. Undoes a fuckup
|
2019-08-26 15:08:36 -05:00 |
|
Tupinambis
|
a4fd2be7f7
|
Various Shotgun Nerfs.
|
2019-08-26 14:45:12 -05:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
Ghommie
|
7065a86841
|
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
|
2019-07-19 22:02:22 +02:00 |
|
kevinz000
|
835e91d46e
|
compile
|
2019-07-14 05:13:47 -07:00 |
|
Ghommie
|
9081b5b773
|
Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
|
2019-07-08 07:17:49 +02:00 |
|
Ghommie
|
1c6156dd0e
|
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-08 06:56:20 +02:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
Fermi
|
17403bd059
|
Non-functioning EMP code for review (revert before merging.)
|
2019-06-13 00:58:54 +01:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
487461fbda
|
Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
|
2019-06-08 01:09:00 -07:00 |
|
Fermi
|
b6788cdd64
|
Updated projectile sprite.
|
2019-06-08 01:45:32 +01:00 |
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Fermi
|
2888e1b30b
|
Dartgun functions as intended.
|
2019-06-07 00:12:11 +01:00 |
|
Fermi
|
1a42c017ac
|
DEBUG
|
2019-06-06 23:23:53 +01:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Trilbyspaceclone
|
da67bdf63d
|
>_>
|
2019-06-04 12:40:29 -04:00 |
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
Trilbyspaceclone
|
ddfe9812a1
|
Update shotgun.dm
|
2019-05-31 16:06:26 -04:00 |
|
kevinz000
|
6ed955ddde
|
Update beams.dm
|
2019-05-27 14:25:45 -07:00 |
|
deathride58
|
09f77d0438
|
Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink
|
2019-03-18 23:02:07 -04:00 |
|
deathride58
|
2d01ac3604
|
Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4
fixes neurotoxin properly
|
2019-01-03 07:47:34 -05:00 |
|
Trilbyspaceclone
|
21f111b5e0
|
[Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873)
* Fixing updater
* Adds the gunthingy
* makes the bullet
* Update mecha_designs.dm
* Update all_nodes.dm
* Fixes stam harm
|
2019-01-03 04:38:10 -08:00 |
|
kevinz000
|
5c3eb5b00e
|
Update neurotoxin.dm
|
2018-12-30 22:22:45 -08:00 |
|
kevinz000
|
96b4171044
|
Update neurotoxin.dm
|
2018-12-24 01:52:08 -08:00 |
|
kevinz000
|
6ba2d56435
|
Update neurotoxin.dm
|
2018-12-08 04:14:36 -08:00 |
|
nik707
|
dbe0d00cc0
|
Merge pull request #7728 from deathride58/drowsyebows
Buffs ebows by making them deal 50 drowsiness
|
2018-11-19 18:05:40 -06:00 |
|
deathride58
|
f385751c4a
|
Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723)
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes
* Im drunk ignore me
|
2018-11-16 14:46:54 -08:00 |
|
deathride58
|
7801829908
|
Makes ebows induce drowsiness
|
2018-11-16 07:05:46 -05:00 |
|