silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
silicons
8fe45263c5
whew
2021-04-26 22:58:30 -07:00
silicons
7ccb5bc711
fixes
2021-04-26 14:21:59 -07:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
necromanceranne
75e0e893a2
Merge branch 'master' into baton_change_pr
2021-04-19 10:55:33 +10:00
Blue Wildrose
e29beaf852
I'll use this linter error as an opportunity to fix some grammar
2021-04-03 11:26:35 -07:00
necromanceranne
8091844a1c
Urist McGreyshit regains their grip on the !
2021-03-27 14:06:41 +11:00
necromanceranne
45340ef1ac
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
2021-03-25 09:27:33 +11:00
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
kiwedespars
e145bdafe8
adds domain expansion
...
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
kiwedespars
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
silicons
c6ba7bfe1f
changes
2021-03-06 18:06:53 -07:00
silicons
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
ce0891c2eb
Merge pull request #14021 from DeltaFire15/emp-fuckeroni
...
Fixes combat mode being permanently disabled under specific circumstances
2021-01-13 16:57:42 -07:00
silicons
c66874f732
Merge pull request #14032 from kappa-sama/kaiowhat
...
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
kappa-sama
c751f114aa
finally
2021-01-12 01:42:55 -05:00
DeltaFire
3f6939c1cb
fix
2021-01-10 06:20:27 +01:00
DeltaFire
05f7991981
snap
2021-01-09 20:37:24 +01:00
DeltaFire
48cbe2ce46
snap
2020-12-22 19:15:52 +01:00
DeltaFire
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
Putnam3145
4b700a3ff7
Merge pull request #13490 from Citadel-Station-13/silicons-patch-8
...
kind of easy to tell if you have a fake virus if it's ticking at 20 times the speed of a normal virus right
2020-10-07 15:08:12 -07:00
silicons
05e1f7ca99
Update debuffs.dm
2020-10-01 12:50:41 -07:00
Timothy Teakettle
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
silicons
e110945568
Merge pull request #13289 from kiwedespars/heretics-touchup
...
heretics touchup
2020-09-05 02:15:21 -07:00
kiwedespars
a7d68281a3
new changes
...
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
Lynxless
4caeb310f7
Added blank line to the end of files
2020-08-27 15:59:07 -03:00
Lynxless
828a65a7fd
New branch test
2020-08-27 15:46:40 -03:00
kiwedespars
3bd2f73449
travis
2020-08-10 21:37:50 -07:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
DeltaFire
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
DeltaFire
d1622053d2
kindle tweaks
...
Time to cast back up to 1.5 seconds because yeah no you can't just stand still for a moment and kindle the guy chasing you.
But also: Kindle now mutes for five seconds (instead of 2) after it ends, and causes stuttering for five seconds after it ends (instead of 3)
2020-08-03 18:08:47 +02:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
silicons
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
da4e208f94
ok
2020-07-23 10:40:12 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
3a38344a04
fix
2020-07-23 00:25:06 -07:00
silicons
771a28e685
oh boy
2020-07-18 17:48:51 -07:00
Timothy Teakettle
50b346355c
fixes travis but without dm fucking up
2020-07-18 22:13:15 +01:00
Timothy Teakettle
35b5c019a5
Revert "travis please"
...
This reverts commit b712538e69
2020-07-18 22:12:01 +01:00
Timothy Teakettle
b712538e69
travis please
2020-07-18 22:10:08 +01:00
Timothy Teakettle
c1ac3bae6e
appease travis
2020-07-18 22:06:07 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
Ghommie
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
Ghommie
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
