kevinz000
|
3d116f5e7e
|
Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
|
2020-04-29 12:01:33 -07:00 |
|
Ghom
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02:00 |
|
ZeroMan
|
883b932a48
|
i will eliminate security
|
2020-04-23 22:28:50 -04:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
kevinz000
|
1bcca265ac
|
buff neurotox
|
2020-04-22 08:35:08 -07:00 |
|
kevinz000
|
d259519bff
|
changes
|
2020-04-22 08:31:09 -07:00 |
|
kevinz000
|
0eac988f52
|
okay!
|
2020-04-22 08:22:52 -07:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
TrilbySpaceClone
|
2cd59a6fb0
|
that was easy
|
2020-04-06 08:40:34 -04:00 |
|
Artur
|
a903752ff9
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-31 19:42:35 +03:00 |
|
necromanceranne
|
a4313ee101
|
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675)
|
2020-03-29 17:45:01 +02:00 |
|
necromanceranne
|
02a8104c3b
|
Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671)
|
2020-03-29 17:19:27 +02:00 |
|
Artur
|
c6a8515297
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-24 12:36:21 +02:00 |
|
kevinz000
|
225d5a3c40
|
Nerfs HoS taser and warden stun pump action blaster (#11352)
* Update stun.dm
* Update pumpenergy.dm
|
2020-03-20 16:09:10 +01:00 |
|
kevinz000
|
6e84781670
|
tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage (#11351)
* Update stun.dm
* Update stun.dm
* Update stun.dm
* Update debuffs.dm
|
2020-03-20 03:15:03 +01:00 |
|
Hatterhat
|
1e10a042be
|
arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)
* subtypes (tm)
* ok fine jeez
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2020-03-18 19:34:14 +01:00 |
|
necromanceranne
|
6f0fc2bdea
|
I LOVE YOU KITCHEN GUN!
|
2020-03-17 03:20:53 +11:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
necromanceranne
|
e0df350579
|
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
|
2020-03-10 23:21:59 +11:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Artur
|
5d3f3fc06a
|
WIP
|
2020-02-28 14:11:38 +02:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
Seris02
|
84d08fe122
|
firebreath change + update to tg genetics + calc patch
|
2020-02-22 19:42:33 +08:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
1c2dca4a00
|
Merge pull request #11132 from Ghommie/Ghommie-cit585
Something about tesla revolvers and tk.
|
2020-02-19 18:59:44 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghommie
|
5dc271124a
|
Something about tesla revolvers and tk.
|
2020-02-17 14:29:14 +01:00 |
|
necromanceranne
|
5c2e244ee0
|
Ports /tg/ pr #44529, reverts #9092
|
2020-02-16 22:20:50 +11:00 |
|
Trilbyspaceclone
|
168a715462
|
well it takes a lot to make after all...
|
2020-02-15 01:15:46 -05:00 |
|
TrilbySpaceClone
|
bbe1ddc0cf
|
silk, bows, and graytide!
|
2020-02-14 23:04:02 -05:00 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
Ghom
|
78ace8e855
|
Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
|
2020-02-14 19:20:32 +01:00 |
|
Ghom
|
64882b8a90
|
Merge pull request #10993 from Linzolle/bows
adds the bow
|
2020-02-14 08:01:12 +01:00 |
|
Ghom
|
500ed0dd57
|
Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
|
2020-02-13 09:39:26 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
f1e0c62141
|
Update gravity.dm
|
2020-02-12 23:59:03 -07:00 |
|
Ghom
|
af477aa28b
|
Merge pull request #10992 from Hatterhat/buckbuff
buckshot buff - 60 to 75 on all pellet pointblank
|
2020-02-12 10:34:25 +01:00 |
|
Hatterhat
|
1d071ff127
|
one off
|
2020-02-10 21:40:51 -06:00 |
|
kevinz000
|
d406086258
|
Update gravity.dm
|
2020-02-10 04:26:26 -07:00 |
|
kevinz000
|
0b28e17860
|
Update gravity.dm
|
2020-02-10 04:13:59 -07:00 |
|
Linzolle
|
4622f66162
|
for real this time
|
2020-02-09 19:45:22 -06:00 |
|
Hatterhat
|
d24afcde1b
|
pb burst from 60 to 81
|
2020-02-09 19:07:24 -06:00 |
|
kevinz000
|
c6c1cc484c
|
slight buff
|
2020-02-07 23:40:02 -07:00 |
|
kevinz000
|
826ed7d4f2
|
o k.
|
2020-02-07 23:39:09 -07:00 |
|
kevinz000
|
f8d5eae0c3
|
Update gravity.dm
|
2020-02-07 16:24:12 -07:00 |
|
kevinz000
|
673079f995
|
Update gravity.dm
|
2020-02-07 03:31:15 -07:00 |
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|