Commit Graph

970 Commits

Author SHA1 Message Date
raspyosu 9ec828f1f2 lunge & mesmerize tweaks
lunge nerfed (holy FUCK)
- windup reverted to 0.7s
- range reverted to 3
- adjacency check fixed (must've been tired)
mesmerize
- now can be broken via line of sight breaking (checks for LoS every 0.5s there is probably a better way of doing this)
2020-02-27 16:29:15 -05:00
kevinz000 19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
kevinz000 648e304ef8 Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
2020-02-27 00:53:10 -07:00
Ghom 954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Artur f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
Trilbyspaceclone 2aeb1e1b4a Update overmind.dm 2020-02-25 00:32:45 -05:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
raspyosu 28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
raspyosu 4de8391ba4 fix filenames zzzz
does this work even time to fIND OUT
2020-02-21 01:40:35 -05:00
raspyosu 7d769b3984 preemptive lunge buff
range increased by 1
windup length decreased by 0.1s to 0.6s
grabbing system altered to make grabbing more instantaneous depending on range
telegraphing sound now plays to the user as well for feedback
2020-02-21 01:34:22 -05:00
Ghom 8395ee53e7 Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
Ghom 6347dab0a3 Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
2020-02-20 15:31:39 +01:00
Artur 5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
kevinz000 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
raspyosu 00f21ed685 revert mesmerize spammability
used to not begin cooldown upon windup fail, now does
2020-02-19 23:37:11 -05:00
kevinz000 a06fcea985 Merge remote-tracking branch 'citadel/master' into vampire_haste 2020-02-19 19:16:58 -07:00
kevinz000 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
Unknown c920d198e2 Update Viro to /tg/ standards 2020-02-19 12:17:57 -05:00
raspyosu a570a8fea8 this is fine
it's fine
2020-02-18 23:24:01 -05:00
raspyosu 6e013d7f8c zzzzzz
the rest of the changes to be described in new pr
2020-02-18 23:18:52 -05:00
raspyosu 9803a0835c lunge tweaks
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
2020-02-18 19:04:20 -05:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 3785c94a1b more responsive 2020-02-18 03:57:39 -07:00
kevinz000 ef05410b75 k 2020-02-18 03:32:04 -07:00
kevinz000 1e57463d1b k 2020-02-18 03:16:47 -07:00
kevinz000 53d7192c9c k 2020-02-18 03:12:57 -07:00
raspyosu 0fa679771b fix indentation
muh spaces
2020-02-17 17:46:47 -05:00
raspyosu 6e32a466af tweak mesmerize
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
2020-02-17 17:24:09 -05:00
Ghom ffe1c794eb Changes cult stunhand when halos are out (#11053)
* Changes cult stunhand when halos are out

Turns the stunhand into a burn + knockback hand.  So it remains more defensive than offensive.

* Changes the desc a little

Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim"  Thanks Justin!

* Requested changes

Requested changes
2020-02-17 13:29:51 +01:00
Lin 794aeb81c2 Merge pull request #11060 from kevinz000/stuff
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
Ghommie 23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
keronshb 3b9f9d7a16 Requested changes
Requested changes
2020-02-15 18:15:41 -05:00
kevinz000 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000 24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom 8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
kevinz000 863ce5152b Merge remote-tracking branch 'citadel/master' into stuff 2020-02-13 04:14:44 -07:00
Ghom bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
kevinz000 a8a071851a s 2020-02-13 00:32:26 -07:00
keronshb 5d32775170 Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim"  Thanks Justin!
2020-02-12 21:31:48 -05:00
keronshb 7949c4fa01 Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand.  So it remains more defensive than offensive.
2020-02-12 21:24:12 -05:00
Ghom 942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
2020-02-12 16:51:38 +01:00
Artur 21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Artur 8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
kevinz000 01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
DeltaFire 55a5686c01 No more Narsie runes in half the time or less
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
2020-02-10 02:46:54 +01:00
Putnam 611c850639 all you need to understand is everything you know is wrong 2020-02-08 00:31:46 -08:00
Artur 41eebc6e2b Fixes cloak 2020-02-07 13:42:56 +02:00
Artur cf22596477 Reworks solars 2020-02-07 10:59:43 +02:00