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 |
|
kevinz000
|
838575da50
|
Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-21 00:59:58 -07:00 |
|
YakumoChen
|
e39a087dc8
|
remove beam
|
2019-10-20 03:09:32 +00:00 |
|
YakumoChen
|
6a5d1c20bd
|
delete minigun
|
2019-10-20 03:08:20 +00:00 |
|
YakumoChen
|
61bc735ee7
|
remove gatling laser
|
2019-10-20 03:07:23 +00:00 |
|
Thalpy
|
597160ca15
|
Fixed werid stuff.
|
2019-10-15 14:17:36 +01:00 |
|
Thalpy
|
e115c456f3
|
Ohh I'm fixing
|
2019-10-15 13:41:49 +01:00 |
|
Thalpy
|
acc0ff8a17
|
Adds craftable extended mags
|
2019-10-15 12:37:35 +01: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 |
|
kevinz000
|
b0b274762c
|
Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
|
2019-10-11 12:10:31 -07:00 |
|
Ghommie
|
689136fe94
|
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
|
2019-10-09 23:07:39 +02:00 |
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11: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 |
|
YakumoChen
|
e297dbd0a3
|
Update energy_gun.dm
|
2019-09-21 02:39:47 +00: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 |
|
kevinz000
|
87cf0b971a
|
Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
|
2019-09-06 16:47:46 -07:00 |
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -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
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04:00 |
|
nik707
|
01f732c57a
|
Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
|
2019-08-29 19:29:14 -05:00 |
|
nik707
|
121c2c2f53
|
Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75
You rack the riot shotgun
|
2019-08-29 19:11:19 -05:00 |
|
Sishen
|
47ee3a8a6d
|
fuck
|
2019-08-28 23:56:08 -04:00 |
|
Ghommie
|
18b023b127
|
arg
|
2019-08-28 04:47:53 +02:00 |
|
Ghommie
|
e25697dc14
|
rocket fix.
|
2019-08-28 03:37:35 +02:00 |
|
Tupinambis
|
3b2be43bd8
|
Slightly increased rubbershot damage from 12.5 to 15 per pellet.
|
2019-08-27 18:35:08 -05:00 |
|
Tupinambis
|
d43b4599ef
|
I was bullied to reduce click delay.
|
2019-08-26 15:53:44 -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
|
24fe7126c4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-08-24 19:05:51 +02:00 |
|
Sishen
|
20f4e260e1
|
minigun ooga
|
2019-08-23 19:39:20 -04:00 |
|
kevinz000
|
3c59b43ff7
|
Update shotgun.dm
|
2019-08-21 06:39:18 -07:00 |
|
kevinz000
|
27b3cb6656
|
Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-08-04 19:04:59 -07:00 |
|
kevinz000
|
f59abbf073
|
Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
|
2019-08-03 00:48:59 -07:00 |
|
kevinz000
|
b52462de0d
|
Merge pull request #8958 from Trilbyspaceclone/emitter_gun
Makes a new traitor Emitter gun for Engi memes
|
2019-08-01 23:29:10 -07:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
Chayse Ramsay
|
085251f5f7
|
update_icon
|
2019-07-30 04:35:54 +01:00 |
|
Trilbyspaceclone
|
969b928642
|
Update special.dm
|
2019-07-29 07:53:41 -04:00 |
|
Trilbyspaceclone
|
f9dfe5ae97
|
Update special.dm
|
2019-07-29 07:53:11 -04:00 |
|
TrilbySpaceClone
|
13936e97de
|
emiting happyness
|
2019-07-24 14:40:59 -04:00 |
|
Chayse Ramsay
|
1c8768afe4
|
Redundant Redundancies made Redundant
|
2019-07-22 19:31:42 +01:00 |
|
Chayse Ramsay
|
ede61d8cb2
|
Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded.
|
2019-07-22 00:55:41 +01:00 |
|