Commit Graph

1020 Commits

Author SHA1 Message Date
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
Ghom
284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Ghom
20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
raspyosu
d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
kevinz000
93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000
8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
raspyosu
5b6da0b350 ok
changes that artur suggested guess it makes no sense to add too much flavor
2020-02-28 13:29:36 -05:00
kevinz000
e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000
d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
Artur
c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur
d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
raspyosu
8953877a69 makes mesmerize not shitcode
woooooooo
2020-02-28 01:01:45 -05:00
raspyosu
43e4877a34 rearrange mesmerize end code
linzolle pointed out it doesn't work which is correct and this seems to work just fine now
2020-02-28 00:07:14 -05:00
kevinz000
f01a58a795 fix 2020-02-27 20:15:28 -07:00
kevinz000
ce8153e7fd aa 2020-02-27 20:12:52 -07:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
raspyosu
bc882b2126 nerf mesmerize range
lunge should have more range than mesmerize imo so let's just yoink
2020-02-27 19:10:31 -05:00
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
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom
954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Artur
b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02: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
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000
24ba8b4d04 Update haste.dm 2020-02-21 18:17:54 -07: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
kevinz000
e85699df50 compile fix 2020-02-21 14:18:45 -07:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07: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
Artur
35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +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
c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -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
kevinz000
4a537d770d let's make this work 2020-02-19 07:20:16 -07:00
Artur
d635af0caa Conflict Fix 2020-02-19 13:11:33 +02:00